head	1.9;
access;
symbols
	netbsd-11-0-RC4:1.9
	netbsd-11-0-RC3:1.9
	netbsd-11-0-RC2:1.9
	netbsd-11-0-RC1:1.9
	perseant-exfatfs-base-20250801:1.9
	netbsd-11:1.9.0.6
	netbsd-11-base:1.9
	netbsd-10-1-RELEASE:1.9
	perseant-exfatfs-base-20240630:1.9
	perseant-exfatfs:1.9.0.4
	perseant-exfatfs-base:1.9
	netbsd-8-3-RELEASE:1.7.6.1
	netbsd-9-4-RELEASE:1.7.16.1
	netbsd-10-0-RELEASE:1.9
	netbsd-10-0-RC6:1.9
	netbsd-10-0-RC5:1.9
	netbsd-10-0-RC4:1.9
	netbsd-10-0-RC3:1.9
	netbsd-10-0-RC2:1.9
	netbsd-10-0-RC1:1.9
	netbsd-10:1.9.0.2
	netbsd-10-base:1.9
	netbsd-9-3-RELEASE:1.7.16.1
	cjep_sun2x-base1:1.8
	cjep_sun2x:1.8.0.4
	cjep_sun2x-base:1.8
	cjep_staticlib_x-base1:1.8
	netbsd-9-2-RELEASE:1.7.16.1
	cjep_staticlib_x:1.8.0.2
	cjep_staticlib_x-base:1.8
	netbsd-9-1-RELEASE:1.7.16.1
	phil-wifi-20200421:1.7
	phil-wifi-20200411:1.7
	is-mlppp:1.7.0.18
	is-mlppp-base:1.7
	phil-wifi-20200406:1.7
	netbsd-8-2-RELEASE:1.7.6.1
	netbsd-9-0-RELEASE:1.7
	netbsd-9-0-RC2:1.7
	netbsd-9-0-RC1:1.7
	phil-wifi-20191119:1.7
	netbsd-9:1.7.0.16
	netbsd-9-base:1.7
	phil-wifi-20190609:1.7
	netbsd-8-1-RELEASE:1.7.6.1
	netbsd-8-1-RC1:1.7.6.1
	pgoyette-compat-merge-20190127:1.7
	pgoyette-compat-20190127:1.7
	pgoyette-compat-20190118:1.7
	pgoyette-compat-1226:1.7
	pgoyette-compat-1126:1.7
	pgoyette-compat-1020:1.7
	pgoyette-compat-0930:1.7
	pgoyette-compat-0906:1.7
	netbsd-7-2-RELEASE:1.6
	pgoyette-compat-0728:1.7
	netbsd-8-0-RELEASE:1.7
	phil-wifi:1.7.0.14
	phil-wifi-base:1.7
	pgoyette-compat-0625:1.7
	netbsd-8-0-RC2:1.7
	pgoyette-compat-0521:1.7
	pgoyette-compat-0502:1.7
	pgoyette-compat-0422:1.7
	netbsd-8-0-RC1:1.7
	pgoyette-compat-0415:1.7
	pgoyette-compat-0407:1.7
	pgoyette-compat-0330:1.7
	pgoyette-compat-0322:1.7
	pgoyette-compat-0315:1.7
	netbsd-7-1-2-RELEASE:1.6
	pgoyette-compat:1.7.0.12
	pgoyette-compat-base:1.7
	netbsd-7-1-1-RELEASE:1.6
	matt-nb8-mediatek:1.7.0.10
	matt-nb8-mediatek-base:1.7
	perseant-stdc-iso10646:1.7.0.8
	perseant-stdc-iso10646-base:1.7
	netbsd-8:1.7.0.6
	netbsd-8-base:1.7
	prg-localcount2-base3:1.7
	prg-localcount2-base2:1.7
	prg-localcount2-base1:1.7
	prg-localcount2:1.7.0.4
	prg-localcount2-base:1.7
	pgoyette-localcount-20170426:1.7
	bouyer-socketcan-base1:1.7
	pgoyette-localcount-20170320:1.7
	netbsd-7-1:1.6.0.28
	netbsd-7-1-RELEASE:1.6
	netbsd-7-1-RC2:1.6
	netbsd-7-nhusb-base-20170116:1.6
	bouyer-socketcan:1.7.0.2
	bouyer-socketcan-base:1.7
	pgoyette-localcount-20170107:1.7
	netbsd-7-1-RC1:1.6
	pgoyette-localcount-20161104:1.7
	netbsd-7-0-2-RELEASE:1.6
	localcount-20160914:1.7
	netbsd-7-nhusb:1.6.0.26
	netbsd-7-nhusb-base:1.6
	pgoyette-localcount-20160806:1.6
	pgoyette-localcount-20160726:1.6
	pgoyette-localcount:1.6.0.24
	pgoyette-localcount-base:1.6
	netbsd-7-0-1-RELEASE:1.6
	netbsd-7-0:1.6.0.22
	netbsd-7-0-RELEASE:1.6
	netbsd-7-0-RC3:1.6
	netbsd-7-0-RC2:1.6
	netbsd-7-0-RC1:1.6
	netbsd-5-2-3-RELEASE:1.3.4.1
	netbsd-5-1-5-RELEASE:1.3.4.1
	netbsd-6-0-6-RELEASE:1.6
	netbsd-6-1-5-RELEASE:1.6
	netbsd-7:1.6.0.20
	netbsd-7-base:1.6
	yamt-pagecache-base9:1.6
	yamt-pagecache-tag8:1.6
	netbsd-6-1-4-RELEASE:1.6
	netbsd-6-0-5-RELEASE:1.6
	tls-earlyentropy:1.6.0.18
	tls-earlyentropy-base:1.6
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.6
	riastradh-drm2-base3:1.6
	netbsd-6-1-3-RELEASE:1.6
	netbsd-6-0-4-RELEASE:1.6
	netbsd-5-2-2-RELEASE:1.3.4.1
	netbsd-5-1-4-RELEASE:1.3.4.1
	netbsd-6-1-2-RELEASE:1.6
	netbsd-6-0-3-RELEASE:1.6
	netbsd-5-2-1-RELEASE:1.3.4.1
	netbsd-5-1-3-RELEASE:1.3.4.1
	netbsd-6-1-1-RELEASE:1.6
	riastradh-drm2-base2:1.6
	riastradh-drm2-base1:1.6
	riastradh-drm2:1.6.0.12
	riastradh-drm2-base:1.6
	netbsd-6-1:1.6.0.16
	netbsd-6-0-2-RELEASE:1.6
	netbsd-6-1-RELEASE:1.6
	netbsd-6-1-RC4:1.6
	netbsd-6-1-RC3:1.6
	agc-symver:1.6.0.14
	agc-symver-base:1.6
	netbsd-6-1-RC2:1.6
	netbsd-6-1-RC1:1.6
	yamt-pagecache-base8:1.6
	netbsd-5-2:1.3.4.1.0.6
	netbsd-6-0-1-RELEASE:1.6
	yamt-pagecache-base7:1.6
	netbsd-5-2-RELEASE:1.3.4.1
	netbsd-5-2-RC1:1.3.4.1
	matt-nb6-plus-nbase:1.6
	yamt-pagecache-base6:1.6
	netbsd-6-0:1.6.0.10
	netbsd-6-0-RELEASE:1.6
	netbsd-6-0-RC2:1.6
	tls-maxphys:1.6.0.8
	tls-maxphys-base:1.6
	matt-nb6-plus:1.6.0.6
	matt-nb6-plus-base:1.6
	netbsd-6-0-RC1:1.6
	yamt-pagecache-base5:1.6
	yamt-pagecache-base4:1.6
	netbsd-6:1.6.0.4
	netbsd-6-base:1.6
	netbsd-5-1-2-RELEASE:1.3.4.1
	netbsd-5-1-1-RELEASE:1.3.4.1
	yamt-pagecache-base3:1.6
	yamt-pagecache-base2:1.6
	yamt-pagecache:1.6.0.2
	yamt-pagecache-base:1.6
	cherry-xenmp:1.5.0.4
	cherry-xenmp-base:1.5
	bouyer-quota2-nbase:1.5
	bouyer-quota2:1.5.0.2
	bouyer-quota2-base:1.5
	matt-mips64-premerge-20101231:1.5
	matt-nb5-mips64-premerge-20101231:1.3.10.1
	matt-nb5-pq3:1.3.4.1.0.4
	matt-nb5-pq3-base:1.3.4.1
	pre-xorg-192:1.4
	netbsd-5-1:1.3.4.1.0.2
	netbsd-5-1-RELEASE:1.3.4.1
	netbsd-5-1-RC4:1.3.4.1
	matt-nb5-mips64-k15:1.3.10.1
	netbsd-5-1-RC3:1.3.4.1
	netbsd-5-1-RC2:1.3.4.1
	netbsd-5-1-RC1:1.3.4.1
	netbsd-5-0-2-RELEASE:1.3
	matt-nb5-mips64-premerge-20091211:1.3
	matt-premerge-20091211:1.4
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.3
	matt-nb4-mips64-k7-u2a-k9b:1.3
	matt-nb5-mips64-u1-k1-k5:1.3
	matt-nb5-mips64:1.3.0.10
	netbsd-5-0-1-RELEASE:1.3
	jym-xensuspend-nbase:1.3
	netbsd-5-0:1.3.0.8
	netbsd-5-0-RELEASE:1.3
	netbsd-5-0-RC4:1.3
	netbsd-5-0-RC3:1.3
	netbsd-5-0-RC2:1.3
	jym-xensuspend:1.3.0.6
	jym-xensuspend-base:1.3
	netbsd-5-0-RC1:1.3
	haad-dm-base:1.3
	haad-dm-base2:1.3
	haad-nbase2:1.3
	netbsd-5:1.3.0.4
	netbsd-5-base:1.3
	matt-mips64-base2:1.3
	haad-dm:1.3.0.2
	haad-dm-base1:1.3
	wrstuden-revivesa-base-3:1.1
	wrstuden-revivesa:1.1.0.2
	wrstuden-revivesa-base-2:1.1;
locks; strict;
comment	@# @;


1.9
date	2022.05.03.12.53.52;	author uwe;	state Exp;
branches;
next	1.8;
commitid	gmWxXXo4xc5KQBCD;

1.8
date	2020.08.10.09.23.37;	author mrg;	state Exp;
branches;
next	1.7;
commitid	dp3wgvowjvyQWujC;

1.7
date	2016.08.14.03.43.04;	author mrg;	state Exp;
branches
	1.7.6.1
	1.7.16.1;
next	1.6;
commitid	J271e7p9sa4wUdiz;

1.6
date	2011.08.02.07.41.01;	author mrg;	state Exp;
branches;
next	1.5;

1.5
date	2010.11.23.08.22.32;	author mrg;	state Exp;
branches;
next	1.4;

1.4
date	2009.06.11.05.43.17;	author mrg;	state Exp;
branches;
next	1.3;

1.3
date	2008.10.14.23.37.19;	author cube;	state Exp;
branches
	1.3.2.1
	1.3.4.1
	1.3.10.1;
next	1.2;

1.2
date	2008.10.13.16.38.52;	author cube;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.05.04.50.18;	author mrg;	state Exp;
branches
	1.1.2.1;
next	;

1.7.6.1
date	2019.04.23.10.28.29;	author martin;	state Exp;
branches;
next	;
commitid	V1IERpAoQpEtBskB;

1.7.16.1
date	2020.08.20.16.15.43;	author martin;	state Exp;
branches;
next	;
commitid	7n4TV3Vf2OQ2WOkC;

1.3.2.1
date	2008.10.14.23.37.19;	author haad;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2008.10.19.22.41.19;	author haad;	state Exp;
branches;
next	;

1.3.4.1
date	2009.09.17.04.24.39;	author snj;	state Exp;
branches;
next	;

1.3.10.1
date	2010.04.21.05.24.45;	author matt;	state Exp;
branches;
next	;

1.1.2.1
date	2008.08.05.04.50.18;	author wrstuden;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2008.09.18.05.18.46;	author wrstuden;	state Exp;
branches;
next	;


desc
@@


1.9
log
@xorg-server: Add xorg.conf.d(5) MLINKS.
@
text
@#	$NetBSD: Makefile,v 1.8 2020/08/10 09:23:37 mrg Exp $

.include <bsd.own.mk>

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/doc
.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/man

FILES=	README.modes

FILESDIR=	${X11USRLIBDIR}/X11/doc

MAN += Xorg.1
MAN += xorg.conf.5

MLINKS += xorg.conf.5 xorg.conf.d.5

X11EXTRAMANTRANSFORMS_BOTH+= \
	xconfigdir		xorg.conf.d \
	xkbdir			${X11LIBDIR}/xkb \
	modulepath		${X11ROOTDIR}/modules

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.8
log
@fix various missing transforms for man page, ala PR#55422.

add method to transform both the "__foo__" and "@@foo@@"
version of various transforms, while upstream are converting
from the former to the latter it seems.  convert all the
common transforms to this method.

expand the grep for .pc files to look for missing @@foo@@
fixes to the man page genration, and ignore a few things
(thanks uwe@@ - .IN lines, and stuff between tab(@@) and .TE.)

xorg-server __default_font_path__ -> @@default_font_path@@,
and xfree86 transform xconfigdir, xkbdir, and modulepath
using new both method.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2016/08/14 03:43:04 mrg Exp $
d12 4
a15 2
MAN=	Xorg.1 xorg.conf.5
# xorg.conf.d.5?
@


1.7
log
@various updates:
- port pkgsrc libxshmfence patches
- Xextbuiltin/module is no longer a thing, make it normal
- always need xorg-config.h/xorg-server.h for server components now
- add present, damage, render, Xi, dri, pixman,  extension where needed
- fix various CPPFLAGS issues
- deal with moved sdksyms.sh
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2011/08/02 07:41:01 mrg Exp $
d15 5
@


1.7.16.1
log
@Pull up following revision(s) (requested by kim in ticket #1059):

	share/mk/bsd.x11.mk: revision 1.133
	share/mk/bsd.x11.mk: revision 1.136
	external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile: revision 1.8
	external/mit/xorg/server/xorg-server/doc/Makefile: revision 1.6

Allow overriding the default man substitutions with X11EXTRAMANTRANSFORMS
fix various missing transforms for man page, ala PR#55422.
add method to transform both the "__foo__" and "@@foo@@"
version of various transforms, while upstream are converting
from the former to the latter it seems.  convert all the
common transforms to this method.

expand the grep for .pc files to look for missing @@foo@@

fixes to the man page genration, and ignore a few things
(thanks uwe@@ - .IN lines, and stuff between tab(@@) and .TE.)

xorg-server __default_font_path__ -> @@default_font_path@@,
and xfree86 transform xconfigdir, xkbdir, and modulepath
using new both method.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2016/08/14 03:43:04 mrg Exp $
a14 5
X11EXTRAMANTRANSFORMS_BOTH+= \
	xconfigdir		xorg.conf.d \
	xkbdir			${X11LIBDIR}/xkb \
	modulepath		${X11ROOTDIR}/modules

@


1.7.6.1
log
@Pull up following revision(s) via patch (requested by mrg in ticket #1243):

	external/mit/xorg/bin/xinit/Makefile: revision 1.7
	external/mit/xorg/lib/libXaw/Makefile: revision 1.12
	external/mit/xorg/lib/xkeyboard-config/Makefile: revision 1.13
	external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile: revision 1.2
	share/mk/bsd.x11.mk: revision 1.130
	external/mit/xorg/bin/sessreg/Makefile: revision 1.7
	external/mit/xorg/bin/proxymngr/Makefile: revision 1.4

fix a bunch of man page transforms.

XXX X11MANCPP=yes has only one use left, maybe it can go away!
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2016/08/14 03:43:04 mrg Exp $
a14 6
X11EXTRAMANTRANSFORMS+= \
	__xconfigdir__		xorg.conf.d \
	__xkbdir__		${X11LIBDIR}/xkb \
	__modulepath__		${X11ROOTDIR}/modules \
	__X11datadir__		${X11LIBDIR}

@


1.6
log
@build updates and fixes for xorg-server 1.10.3.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2010/11/23 08:22:32 mrg Exp $
d6 1
a6 1
.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/doc/man
@


1.5
log
@many build updates and fixes for xorg-server 1.9.2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
d13 1
@


1.4
log
@upgrade the build framework for xorg-server 1.6.

this doesn't quite work yet.  Xvfb and Xnest attempt to link but
have missing symbols.  Xorg doesn't build all its components yet.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/10/14 23:37:19 cube Exp $
d8 1
a8 1
FILES=	README.DRI README.rapidaccess
@


1.3
log
@- Adapt to changes on bsd.x11.mk
- Remove unnecessary targets that handled .man.pre files
- Add transformations for package-specific patterns in man page templates.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/10/13 16:38:52 cube Exp $
d8 1
a8 1
FILES=	README.DRI README.fonts README.rapidaccess
@


1.3.10.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3.4.1 2009/09/17 04:24:39 snj Exp $
d8 1
a8 1
FILES=	README.DRI README.rapidaccess
@


1.3.4.1
log
@Apply patch (requested by mrg in ticket #958):
Sync X.Org reachover build framework and setlists with the new X.Org.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
d8 1
a8 1
FILES=	README.DRI README.rapidaccess
@


1.3.2.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:19 +0000
@
text
@d1 15
@


1.3.2.2
log
@Sync with HEAD.
@
text
@a0 15
#	$NetBSD: Makefile,v 1.3 2008/10/14 23:37:19 cube Exp $

.include <bsd.own.mk>

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/doc
.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/doc/man

FILES=	README.DRI README.fonts README.rapidaccess

FILESDIR=	${X11USRLIBDIR}/X11/doc

MAN=	Xorg.1 xorg.conf.5

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.2
log
@Treat .man.pre files just as regular .man files, that's what is done in the
package itself anyway.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/08/05 04:50:18 mrg Exp $
a13 5
BUILDSYMLINKS+=	${X11SRCDIR.xorg-server}/hw/xfree86/doc/man/Xorg.man.pre \
		Xorg.man \
		${X11SRCDIR.xorg-server}/hw/xfree86/doc/man/xorg.conf.man.pre \
		xorg.conf.man

@


1.1
log
@add common doc and i2c subdirs to hw/xfree86
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2004/03/14 17:00:30 matt Exp $
d14 5
a18 8
# XXX
Xorg.1: Xorg.man.pre
	cp ${.ALLSRC} ${.TARGET}

# XXX
xorg.conf.5: xorg.conf.man.pre
	cp ${.ALLSRC} ${.TARGET}
     
@


1.1.2.1
log
@file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:46 +0000
@
text
@d1 23
@


1.1.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 23
#	$NetBSD: Makefile,v 1.1 2008/08/05 04:50:18 mrg Exp $

.include <bsd.own.mk>

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/doc
.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/doc/man

FILES=	README.DRI README.fonts README.rapidaccess

FILESDIR=	${X11USRLIBDIR}/X11/doc

MAN=	Xorg.1 xorg.conf.5

# XXX
Xorg.1: Xorg.man.pre
	cp ${.ALLSRC} ${.TARGET}

# XXX
xorg.conf.5: xorg.conf.man.pre
	cp ${.ALLSRC} ${.TARGET}
     
.include <bsd.x11.mk>
.include <bsd.prog.mk>
@