Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk fix a bunch of man page transforms.
details: https://anonhg.NetBSD.org/src/rev/37ed7d14963f
branches: trunk
changeset: 997531:37ed7d14963f
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Mar 11 06:25:55 2019 +0000
description:
fix a bunch of man page transforms.
XXX X11MANCPP=yes has only one use left, maybe it can go away!
diffstat:
external/mit/xorg/bin/proxymngr/Makefile | 5 ++++-
external/mit/xorg/bin/sessreg/Makefile | 7 ++++++-
external/mit/xorg/bin/xinit/Makefile | 7 ++++---
external/mit/xorg/lib/libXaw/Makefile | 5 ++++-
external/mit/xorg/lib/xkeyboard-config/Makefile | 5 ++++-
external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile | 7 ++++++-
share/mk/bsd.x11.mk | 8 ++++++--
7 files changed, 34 insertions(+), 10 deletions(-)
diffs (148 lines):
diff -r a4bf04e3225f -r 37ed7d14963f external/mit/xorg/bin/proxymngr/Makefile
--- a/external/mit/xorg/bin/proxymngr/Makefile Mon Mar 11 05:05:31 2019 +0000
+++ b/external/mit/xorg/bin/proxymngr/Makefile Mon Mar 11 06:25:55 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/03/11 06:25:55 mrg Exp $
.include <bsd.own.mk>
@@ -27,6 +27,9 @@
CPPFLAGS+= -DIPv6
.endif
+X11EXTRAMANTRANSFORMS+= \
+ __configdir__ ${X11ETCDIR}/proxymngr
+
.PATH: ${X11SRCDIR.${PROG}}
.include <bsd.x11.mk>
diff -r a4bf04e3225f -r 37ed7d14963f external/mit/xorg/bin/sessreg/Makefile
--- a/external/mit/xorg/bin/sessreg/Makefile Mon Mar 11 05:05:31 2019 +0000
+++ b/external/mit/xorg/bin/sessreg/Makefile Mon Mar 11 06:25:55 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/08/24 18:27:16 apb Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
.include <bsd.own.mk>
@@ -12,6 +12,11 @@
-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>
diff -r a4bf04e3225f -r 37ed7d14963f external/mit/xorg/bin/xinit/Makefile
--- a/external/mit/xorg/bin/xinit/Makefile Mon Mar 11 05:05:31 2019 +0000
+++ b/external/mit/xorg/bin/xinit/Makefile Mon Mar 11 06:25:55 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/08/03 02:56:29 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
.include <bsd.own.mk>
@@ -27,8 +27,9 @@
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
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
diff -r a4bf04e3225f -r 37ed7d14963f external/mit/xorg/lib/libXaw/Makefile
--- a/external/mit/xorg/lib/libXaw/Makefile Mon Mar 11 05:05:31 2019 +0000
+++ b/external/mit/xorg/lib/libXaw/Makefile Mon Mar 11 06:25:55 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/07/19 07:55:07 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2019/03/11 06:25:55 mrg Exp $
.include <bsd.own.mk>
@@ -69,6 +69,9 @@
PKGCONFIG= xaw7
PKGDIST= ${LIBOLD}
+X11EXTRAMANTRANSFORMS+= \
+ __docdir__ ${X11LIBDIR}/doc
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff -r a4bf04e3225f -r 37ed7d14963f external/mit/xorg/lib/xkeyboard-config/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/Makefile Mon Mar 11 05:05:31 2019 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/Makefile Mon Mar 11 06:25:55 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/12/15 09:17:26 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2019/03/11 06:25:55 mrg Exp $
.include <bsd.own.mk>
@@ -11,6 +11,9 @@
PKGCONFIG= xkeyboard-config
+X11EXTRAMANTRANSFORMS+= \
+ __xkb_base__ ${X11LIBDIR}/xkb
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
diff -r a4bf04e3225f -r 37ed7d14963f external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile Mon Mar 11 05:05:31 2019 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile Mon Mar 11 06:25:55 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/11 06:25:55 mrg Exp $
.include <bsd.own.mk>
@@ -12,5 +12,10 @@
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>
diff -r a4bf04e3225f -r 37ed7d14963f share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk Mon Mar 11 05:05:31 2019 +0000
+++ b/share/mk/bsd.x11.mk Mon Mar 11 06:25:55 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.129 2019/03/03 22:02:49 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.130 2019/03/11 06:25:55 mrg Exp $
.include <bsd.init.mk>
@@ -395,6 +395,10 @@
__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 \
@@ -413,7 +417,7 @@
__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
Home |
Main Index |
Thread Index |
Old Index