Module Name: src
Committed By: mrg
Date: Sun Nov 21 01:25:33 UTC 2010
Modified Files:
src/external/mit/xorg/bin/bdftruncate: Makefile
src/external/mit/xorg/bin/ucs2any: Makefile
src/external/mit/xorg/bin/xconsole: Makefile
src/external/mit/xorg/bin/xedit/xedit: Makefile
src/external/mit/xorg/bin/xfd: Makefile
src/external/mit/xorg/bin/xfontsel: Makefile
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/share/fonts/font-util: Makefile
Log Message:
various updates for moved man pages or app-defaults.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/bdftruncate/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/ucs2any/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xconsole/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xedit/xedit/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xfd/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xfontsel/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/share/fonts/font-util/Makefile
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/bdftruncate/Makefile
diff -u src/external/mit/xorg/bin/bdftruncate/Makefile:1.2 src/external/mit/xorg/bin/bdftruncate/Makefile:1.3
--- src/external/mit/xorg/bin/bdftruncate/Makefile:1.2 Sat Aug 22 01:02:47 2009
+++ src/external/mit/xorg/bin/bdftruncate/Makefile Sun Nov 21 01:25:32 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2009/08/22 01:02:47 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 01:25:32 mrg Exp $
.include <bsd.own.mk>
PROG= bdftruncate
-.PATH: ${X11SRCDIR.font-util}
+.PATH: ${X11SRCDIR.font-util} ${X11SRCDIR.font-util}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/ucs2any/Makefile
diff -u src/external/mit/xorg/bin/ucs2any/Makefile:1.1.1.1 src/external/mit/xorg/bin/ucs2any/Makefile:1.2
--- src/external/mit/xorg/bin/ucs2any/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/ucs2any/Makefile Sun Nov 21 01:25:32 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/21 01:25:32 mrg Exp $
.include <bsd.own.mk>
PROG= ucs2any
-.PATH: ${X11SRCDIR.font-util}
+.PATH: ${X11SRCDIR.font-util} ${X11SRCDIR.font-util}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xconsole/Makefile
diff -u src/external/mit/xorg/bin/xconsole/Makefile:1.1.1.1 src/external/mit/xorg/bin/xconsole/Makefile:1.2
--- src/external/mit/xorg/bin/xconsole/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xconsole/Makefile Sun Nov 21 01:25:32 2010
@@ -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 01:25:32 mrg Exp $
.include <bsd.own.mk>
PROG= xconsole
-APPDEFS=XConsole.ad
+APPDEFS=XConsole
LDADD+= -lutil -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
DPADD+= ${LIBUTIL} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xedit/xedit/Makefile
diff -u src/external/mit/xorg/bin/xedit/xedit/Makefile:1.2 src/external/mit/xorg/bin/xedit/xedit/Makefile:1.3
--- src/external/mit/xorg/bin/xedit/xedit/Makefile:1.2 Tue Mar 10 03:55:59 2009
+++ src/external/mit/xorg/bin/xedit/xedit/Makefile Sun Nov 21 01:25:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/10 03:55:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 01:25:32 mrg Exp $
.include <bsd.own.mk>
@@ -8,9 +8,7 @@
CPPFLAGS+= -I${X11SRCDIR.xedit}/lisp/re
-APPDEFS= Xedit.ad Xedit-color.ad
-
-BUILDSYMLINKS= Xedit-xprint.ad Xedit.ad
+APPDEFS= Xedit Xedit-color
.for _L in lisp mp re
LIB.${_L}!= cd ${.CURDIR}/../${_L} && ${PRINTOBJDIR}
Index: src/external/mit/xorg/bin/xfd/Makefile
diff -u src/external/mit/xorg/bin/xfd/Makefile:1.1.1.1 src/external/mit/xorg/bin/xfd/Makefile:1.2
--- src/external/mit/xorg/bin/xfd/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xfd/Makefile Sun Nov 21 01:25:33 2010
@@ -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 01:25:33 mrg Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
-APPDEFS=Xfd.ad
+APPDEFS=Xfd
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
@@ -15,7 +15,7 @@
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xfontsel/Makefile
diff -u src/external/mit/xorg/bin/xfontsel/Makefile:1.1.1.1 src/external/mit/xorg/bin/xfontsel/Makefile:1.2
--- src/external/mit/xorg/bin/xfontsel/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xfontsel/Makefile Sun Nov 21 01:25:33 2010
@@ -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 01:25:33 mrg Exp $
.include <bsd.own.mk>
PROG= xfontsel
SRCS= xfontsel.c ULabel.c
-APPDEFS=XFontSel.ad
+APPDEFS=XFontSel
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.6 src/external/mit/xorg/bin/xfs/Makefile:1.7
--- src/external/mit/xorg/bin/xfs/Makefile:1.6 Mon May 24 05:30:40 2010
+++ src/external/mit/xorg/bin/xfs/Makefile Sun Nov 21 01:25:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/05/24 05:30:40 veego Exp $
+# $NetBSD: Makefile,v 1.7 2010/11/21 01:25:33 mrg Exp $
.include <bsd.own.mk>
@@ -6,6 +6,8 @@
XFSDIR= ${X11SRCDIR.${PROG}}
+.PATH: ${XFSDIR}/man
+
.PATH: ${XFSDIR}/difs
SRCS= atom.c cache.c charinfo.c difsutils.c dispatch.c events.c \
extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \
@@ -45,6 +47,7 @@
s%__configfiledesc__%the default file,%g'
+.PATH: ${XFSDIR}/config
BUILDSYMLINKS= config.cpp fsconfig.cpp
CPPSCRIPTS= fsconfig
CPPSCRIPTFLAGS= -DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Type1/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
Index: src/external/mit/xorg/share/fonts/font-util/Makefile
diff -u src/external/mit/xorg/share/fonts/font-util/Makefile:1.2 src/external/mit/xorg/share/fonts/font-util/Makefile:1.3
--- src/external/mit/xorg/share/fonts/font-util/Makefile:1.2 Sat Sep 13 04:32:31 2008
+++ src/external/mit/xorg/share/fonts/font-util/Makefile Sun Nov 21 01:25:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 01:25:33 mrg Exp $
.include <bsd.own.mk>
@@ -17,4 +17,4 @@
.include <bsd.x11.mk>
.include <bsd.prog.mk>
-.PATH: ${X11SRCDIR.font-util}
+.PATH: ${X11SRCDIR.font-util} ${X11SRCDIR.font-util}/man
