Module Name: src
Committed By: martin
Date: Tue Apr 23 10:24:54 UTC 2019
Modified Files:
src/external/mit/xorg/bin/proxymngr [netbsd-8]: Makefile
src/external/mit/xorg/bin/sessreg [netbsd-8]: Makefile
src/external/mit/xorg/bin/xinit [netbsd-8]: Makefile
src/external/mit/xorg/lib/libXaw [netbsd-8]: Makefile
src/external/mit/xorg/lib/xkeyboard-config [netbsd-8]: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc [netbsd-8]:
Makefile
src/share/mk [netbsd-8]: bsd.x11.mk
Log Message:
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!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.54.1 src/external/mit/xorg/bin/proxymngr/Makefile
cvs rdiff -u -r1.6 -r1.6.8.1 src/external/mit/xorg/bin/sessreg/Makefile
cvs rdiff -u -r1.6 -r1.6.34.1 src/external/mit/xorg/bin/xinit/Makefile
cvs rdiff -u -r1.11 -r1.11.8.1 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.12 -r1.12.6.1 \
src/external/mit/xorg/lib/xkeyboard-config/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile
cvs rdiff -u -r1.124 -r1.124.6.1 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/proxymngr/Makefile
diff -u src/external/mit/xorg/bin/proxymngr/Makefile:1.2 src/external/mit/xorg/bin/proxymngr/Makefile:1.2.54.1
--- src/external/mit/xorg/bin/proxymngr/Makefile:1.2 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/bin/proxymngr/Makefile Tue Apr 23 10:24:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile,v 1.2.54.1 2019/04/23 10:24:54 martin Exp $
.include <bsd.own.mk>
@@ -23,6 +23,9 @@ FILESDIR= ${PROXYMANAGERDIR}
LDADD+= -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+X11EXTRAMANTRANSFORMS+= \
+ __configdir__ ${X11ETCDIR}/proxymngr
+
.PATH: ${X11SRCDIR.${PROG}}
.include <bsd.x11.mk>
Index: src/external/mit/xorg/bin/sessreg/Makefile
diff -u src/external/mit/xorg/bin/sessreg/Makefile:1.6 src/external/mit/xorg/bin/sessreg/Makefile:1.6.8.1
--- src/external/mit/xorg/bin/sessreg/Makefile:1.6 Sun Aug 24 18:27:16 2014
+++ src/external/mit/xorg/bin/sessreg/Makefile Tue Apr 23 10:24:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/08/24 18:27:16 apb Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2019/04/23 10:24:54 martin Exp $
.include <bsd.own.mk>
@@ -12,6 +12,11 @@ X11EXTRAMANDEFS+= -e 's,__ttys_file__,/e
-e 's,__utmp_file__,${XDMPIDDIR}/utmp,g' \
-e 's,__wtmp_file__,${XDMLOGDIR}/wtmp,g'
+X11EXTRAMANTRANSFORMS+= \
+ __utmp_manpage__ utmpx \
+ __wtmp_manpage__ wtmpx \
+ __lastlog_file__ lastlogx
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.6 src/external/mit/xorg/bin/xinit/Makefile:1.6.34.1
--- src/external/mit/xorg/bin/xinit/Makefile:1.6 Wed Aug 3 02:56:29 2011
+++ src/external/mit/xorg/bin/xinit/Makefile Tue Apr 23 10:24:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/08/03 02:56:29 mrg Exp $
+# $NetBSD: Makefile,v 1.6.34.1 2019/04/23 10:24:54 martin Exp $
.include <bsd.own.mk>
@@ -27,8 +27,10 @@ FILESDIR= ${XINITDIR}
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR}
-X11MANCPP= yes
+X11EXTRAMANTRANSFORMS+= \
+ __xinitdir__ ${XINITDIR} \
+ __configdir__ ${X11LIBDIR}/xinit \
+ __SCOMAN__ 1
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.11 src/external/mit/xorg/lib/libXaw/Makefile:1.11.8.1
--- src/external/mit/xorg/lib/libXaw/Makefile:1.11 Sun Jul 19 07:55:07 2015
+++ src/external/mit/xorg/lib/libXaw/Makefile Tue Apr 23 10:24:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/07/19 07:55:07 mrg Exp $
+# $NetBSD: Makefile,v 1.11.8.1 2019/04/23 10:24:54 martin Exp $
.include <bsd.own.mk>
@@ -69,6 +69,9 @@ LIBDPLIBS=\
PKGCONFIG= xaw7
PKGDIST= ${LIBOLD}
+X11EXTRAMANTRANSFORMS+= \
+ __docdir__ ${X11LIBDIR}/doc
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.12 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.12.6.1
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.12 Thu Dec 15 09:17:26 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Tue Apr 23 10:24:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/12/15 09:17:26 mrg Exp $
+# $NetBSD: Makefile,v 1.12.6.1 2019/04/23 10:24:54 martin Exp $
.include <bsd.own.mk>
@@ -11,6 +11,9 @@ NOOBJ= # defined
PKGCONFIG= xkeyboard-config
+X11EXTRAMANTRANSFORMS+= \
+ __xkb_base__ ${X11LIBDIR}/xkb
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile:1.1.1.1.8.1
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile Tue Apr 23 10:24:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.1.1.1.8.1 2019/04/23 10:24:54 martin Exp $
.include <bsd.own.mk>
@@ -12,5 +12,10 @@ FILESDIR= ${X11USRLIBDIR}/X11/doc
MAN= Xorg.1 xorg.conf.5
# xorg.conf.d.5?
+X11EXTRAMANTRANSFORMS+= \
+ __xconfigdir__ xorg.conf.d \
+ __xkbdir__ ${X11LIBDIR}/xkb \
+ __modulepath__ ${X11ROOTDIR}/modules
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.124 src/share/mk/bsd.x11.mk:1.124.6.1
--- src/share/mk/bsd.x11.mk:1.124 Wed Dec 14 16:03:19 2016
+++ src/share/mk/bsd.x11.mk Tue Apr 23 10:24:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.124 2016/12/14 16:03:19 scole Exp $
+# $NetBSD: bsd.x11.mk,v 1.124.6.1 2019/04/23 10:24:54 martin Exp $
.include <bsd.init.mk>
@@ -393,6 +393,10 @@ _X11MANTRANSFORM= \
__apploaddir__ ${X11ROOTDIR}/lib/X11/app-defaults \
__appmansuffix__ 1 \
__bindir__ ${X11BINDIR} \
+ __datadir__ ${X11LIBDIR} \
+ __libdir__ ${X11ROOTDIR}/lib \
+ __xkbconfigroot__ ${X11LIBDIR}/xkb \
+ __sysconfdir__ /etc \
__drivermansuffix__ 4 \
__filemansuffix__ 5 \
__LIB_MAN_SUFFIX__ 3 \
@@ -411,7 +415,7 @@ _X11MANTRANSFORM+= \
__vendorversion__ ${XORGVERSION:C/ /%/gW} \
__XCONFIGFILE__ xorg.conf \
__xconfigfile__ xorg.conf \
- __XCONFIGFILEMAN__ '__XCONFIGFILE__%(__filemansuffix__)' \
+ __XCONFIGFILEMAN__ 'xorg.conf(5)' \
__xorgversion__ ${XORGVERSION:C/ /%/gW} \
__XSERVERNAME__ Xorg \
__xservername__ Xorg
