[src/trunk]: src/external/mit/xorg/bin various updates for moved man pages or...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/mit/xorg/bin various updates for moved man pages or...
From: mrg <mrg%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 19:32:04 +0000
details:   https://anonhg.NetBSD.org/src/rev/021a31d69107
branches:  trunk
changeset: 758909:021a31d69107
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Nov 21 02:33:39 2010 +0000

description:
various updates for moved man pages or app-defaults.
remove some dated CPPFLAGS defines.

diffstat:

 external/mit/xorg/bin/beforelight/Makefile |  6 +++---
 external/mit/xorg/bin/bitmap/Makefile      |  7 +++----
 external/mit/xorg/bin/luit/Makefile        |  5 +++--
 external/mit/xorg/bin/oclock/Makefile      |  6 +++---
 external/mit/xorg/bin/rgb/Makefile         |  4 ++--
 external/mit/xorg/bin/smproxy/Makefile     |  4 ++--
 external/mit/xorg/bin/twm/Makefile         |  4 ++--
 external/mit/xorg/bin/xfs/Makefile         |  5 +++--
 external/mit/xorg/bin/xgc/Makefile         |  4 ++--
 external/mit/xorg/bin/xinit/Makefile       |  4 ++--
 external/mit/xorg/bin/xman/Makefile        |  6 +++---
 external/mit/xorg/bin/xmessage/Makefile    |  4 +---
 external/mit/xorg/bin/xprop/Makefile       |  4 ++--
 13 files changed, 31 insertions(+), 32 deletions(-)

diffs (265 lines):

diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/beforelight/Makefile
--- a/external/mit/xorg/bin/beforelight/Makefile        Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/beforelight/Makefile        Sun Nov 21 02:33:39 2010 +0000
@@ -1,17 +1,17 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2010/11/21 02:33:39 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  beforelight
 SRCS=  b4light
 
-APPDEFS=Beforelight.ad
+APPDEFS=Beforelight
 
 LDADD+=        -lXss -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
 DPADD+=        ${LIBXSS} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
        ${LIBXPM} ${LIBXEXT} ${LIBX11}
 
-.PATH: ${X11SRCDIR.beforelight}
+.PATH: ${X11SRCDIR.beforelight} ${X11SRCDIR.beforelight}/app-defaults
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/bitmap/Makefile
--- a/external/mit/xorg/bin/bitmap/Makefile     Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/bitmap/Makefile     Sun Nov 21 02:33:39 2010 +0000
@@ -1,23 +1,22 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2010/11/21 02:33:40 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  bitmap
 SRCS=  BitEdit.c CutPaste.c Graphics.c ReqMach.c Bitmap.c Dialog.c Handlers.c
 
+.PATH: ${X11SRCDIR.bitmap}/man
 MLINKS=        bitmap.1 bmtoa.1 bitmap.1 atobm.1
 
 FILES= Dashes Down Excl FlipHoriz FlipVert Fold Left Right RotateLeft \
        RotateRight Stipple Term Up
 FILESDIR=${X11INCDIR}/X11/bitmaps
 
-APPDEFS=Bitmap.ad Bitmap-color.ad
-
 LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
 DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
        ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
 
-SUBDIR=        bmtoa atobm
+SUBDIR=        bmtoa atobm app-defaults
 
 .PATH: ${X11SRCDIR.bitmap}
 
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/luit/Makefile
--- a/external/mit/xorg/bin/luit/Makefile       Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/luit/Makefile       Sun Nov 21 02:33:39 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+#      $NetBSD: Makefile,v 1.3 2010/11/21 02:33:40 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,13 +6,14 @@
 SRCS=  luit.c iso2022.c charset.c parser.c sys.c other.c
 
 CPPFLAGS+=-DLOCALE_ALIAS_FILE=\"${X11LIBDIR}/locale/locale.alias\"
+CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
 
 X11EXTRAMANDEFS+= -e 's,__localealiasfile__,${X11LIBDIR}/locale/locale.alias,g'
 
 LDADD+=        -lfontenc -lz
 DPADD+=        ${LIBFONTENC} ${LIBZ}
 
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/oclock/Makefile
--- a/external/mit/xorg/bin/oclock/Makefile     Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/oclock/Makefile     Sun Nov 21 02:33:39 2010 +0000
@@ -1,16 +1,16 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2010/11/21 02:33:40 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  oclock
 SRCS=  oclock.c Clock.c transform.c
 
-APPDEFS=Clock-color.ad
+APPDEFS=Clock-color
 
 LDADD+=        -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
 DPADD+=        ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
 
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/rgb/Makefile
--- a/external/mit/xorg/bin/rgb/Makefile        Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/rgb/Makefile        Sun Nov 21 02:33:39 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+#      $NetBSD: Makefile,v 1.3 2010/11/21 02:33:40 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -13,7 +13,7 @@
 FILES= rgb.txt
 FILESDIR=${X11LIBDIR}
 
-.PATH: ${X11SRCDIR.rgb}
+.PATH: ${X11SRCDIR.rgb} ${X11SRCDIR.rgb}/man
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/smproxy/Makefile
--- a/external/mit/xorg/bin/smproxy/Makefile    Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/smproxy/Makefile    Sun Nov 21 02:33:39 2010 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2010/11/21 02:33:41 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  smproxy
 SRCS=  smproxy.c save.c
 
-CPPFLAGS+=-DHAS_MKSTEMP
+CPPFLAGS+=-DHAVE_MKSTEMP
 
 LDADD+=        -lXmu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/twm/Makefile
--- a/external/mit/xorg/bin/twm/Makefile        Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/twm/Makefile        Sun Nov 21 02:33:39 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2008/10/25 22:27:34 apb Exp $
+#      $NetBSD: Makefile,v 1.4 2010/11/21 02:33:41 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -16,7 +16,7 @@
 TWMDIR=                        ${X11SRCDIR.${PROG}}
 
 CPPFLAGS+=             -I. -I${TWMDIR}/src
-CPPFLAGS+=             -DHAS_MKSTEMP -DXORG_RELEASE=${XORG_RELEASE} \
+CPPFLAGS+=             -DHAVE_MKSTEMP -DXORG_RELEASE=${XORG_RELEASE} \
                        -DXVENDORNAME=${XVENDORNAME}
 
 CPPFLAGS.parse.c=      -DSYSTEM_INIT_FILE=\"${TWMCONFIGDIR}/system.twmrc\"
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/xfs/Makefile
--- a/external/mit/xorg/bin/xfs/Makefile        Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/xfs/Makefile        Sun Nov 21 02:33:39 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2010/11/21 01:25:33 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2010/11/21 02:33:41 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -21,7 +21,8 @@
                        -I${DESTDIR}${X11INCDIR}/X11/FS \
                        -I${X11SRCDIR.libXfont}/include \
                        -I${X11SRCDIR.libXfont}/bitmap \
-                       -I${XFSDIR}/../include
+                       -I${XFSDIR}/../include \
+                       -DHAVE_DAEMON
 
 CONN_DEFINES=          ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
                        -DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/xgc/Makefile
--- a/external/mit/xorg/bin/xgc/Makefile        Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/xgc/Makefile        Sun Nov 21 02:33:39 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/05/21 06:04:37 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2010/11/21 02:33:41 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
        choice.c main.c interpret.c record.c testfrac.c gram.y lex.l
 
 YHEADER=1
-CPPFLAGS+=-I. -I${X11SRCDIR.${PROG}} -DHAS_SNPRINTF
+CPPFLAGS+=-I. -I${X11SRCDIR.${PROG}}
 
 APPDEFS=Xgc Xgc-color
 
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/xinit/Makefile
--- a/external/mit/xorg/bin/xinit/Makefile      Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/xinit/Makefile      Sun Nov 21 02:33:39 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2008/10/14 23:37:19 cube Exp $
+#      $NetBSD: Makefile,v 1.5 2010/11/21 02:33:41 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
 
 XINITDIR=      ${X11ETCDIR}/xinit
 
-CPPFLAGS+=     -DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
+CPPFLAGS+=     ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
                -DRETSIGTYPE=void
 
 CPPSCRIPTS=    startx xinitrc
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/xman/Makefile
--- a/external/mit/xorg/bin/xman/Makefile       Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/xman/Makefile       Sun Nov 21 02:33:39 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2010/11/20 23:30:24 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2010/11/21 02:33:42 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
        search.c globals.c main.c misc.c tkfuncs.c vendor.c
 
 CPPFLAGS+=${X11FLAGS.VERSION}
-CPPFLAGS+=-DHAS_SNPRINTF -DHELPFILE=\"${X11LIBDIR}/xman.help\" -DHAS_MKSTEMP
-CPPFLAGS+=-DHAS_GROFF -DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
+CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
+CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
 CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
 
 APPDEFS=Xman
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/xmessage/Makefile
--- a/external/mit/xorg/bin/xmessage/Makefile   Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/xmessage/Makefile   Sun Nov 21 02:33:39 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2010/11/21 02:33:42 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,8 +11,6 @@
 DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
        ${LIBXPM} ${LIBXEXT} ${LIBX11}
 
-CPPFLAGS+=-DHAS_MKSTEMP
-
 .PATH: ${X11SRCDIR.${PROG}}
 
 .include <bsd.x11.mk>
diff -r 530c0e31e12b -r 021a31d69107 external/mit/xorg/bin/xprop/Makefile
--- a/external/mit/xorg/bin/xprop/Makefile      Sun Nov 21 01:46:20 2010 +0000
+++ b/external/mit/xorg/bin/xprop/Makefile      Sun Nov 21 02:33:39 2010 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2009/11/09 00:30:27 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2010/11/21 02:33:42 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xprop
 SRCS=  xprop.c dsimple.c clientwin.c
 
-CPPFLAGS+=-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+CPPFLAGS+=-DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H
 CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include
 
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11
Prev by Date: [src/trunk]: src install lndir again. (hooray, i've missed this stupid app ; -)
Next by Date: [src/trunk]: src/lib build the ldap libraries; am-utils needs them.
Previous by Thread: [src/trunk]: src install lndir again. (hooray, i've missed this stupid app ; -)
Next by Thread: [src/trunk]: src/lib build the ldap libraries; am-utils needs them.
Indexes:
Home | Main Index | Thread Index | Old Index