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

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa645dcae8f1
branches:  trunk
changeset: 758907:fa645dcae8f1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Nov 21 01:25:32 2010 +0000

description:
various updates for moved man pages or app-defaults.

diffstat:

 external/mit/xorg/bin/bdftruncate/Makefile       |  4 ++--
 external/mit/xorg/bin/ucs2any/Makefile           |  4 ++--
 external/mit/xorg/bin/xconsole/Makefile          |  6 +++---
 external/mit/xorg/bin/xedit/xedit/Makefile       |  6 ++----
 external/mit/xorg/bin/xfd/Makefile               |  6 +++---
 external/mit/xorg/bin/xfontsel/Makefile          |  6 +++---
 external/mit/xorg/bin/xfs/Makefile               |  5 ++++-
 external/mit/xorg/share/fonts/font-util/Makefile |  4 ++--
 8 files changed, 21 insertions(+), 20 deletions(-)

diffs (167 lines):

diff -r a7e2caf7071a -r fa645dcae8f1 external/mit/xorg/bin/bdftruncate/Makefile
--- a/external/mit/xorg/bin/bdftruncate/Makefile        Sat Nov 20 23:47:30 2010 +0000
+++ b/external/mit/xorg/bin/bdftruncate/Makefile        Sun Nov 21 01:25:32 2010 +0000
@@ -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>
diff -r a7e2caf7071a -r fa645dcae8f1 external/mit/xorg/bin/ucs2any/Makefile
--- a/external/mit/xorg/bin/ucs2any/Makefile    Sat Nov 20 23:47:30 2010 +0000
+++ b/external/mit/xorg/bin/ucs2any/Makefile    Sun Nov 21 01:25:32 2010 +0000
@@ -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>
diff -r a7e2caf7071a -r fa645dcae8f1 external/mit/xorg/bin/xconsole/Makefile
--- a/external/mit/xorg/bin/xconsole/Makefile   Sat Nov 20 23:47:30 2010 +0000
+++ b/external/mit/xorg/bin/xconsole/Makefile   Sun Nov 21 01:25:32 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 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>
diff -r a7e2caf7071a -r fa645dcae8f1 external/mit/xorg/bin/xedit/xedit/Makefile
--- a/external/mit/xorg/bin/xedit/xedit/Makefile        Sat Nov 20 23:47:30 2010 +0000
+++ b/external/mit/xorg/bin/xedit/xedit/Makefile        Sun Nov 21 01:25:32 2010 +0000
@@ -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}
diff -r a7e2caf7071a -r fa645dcae8f1 external/mit/xorg/bin/xfd/Makefile
--- a/external/mit/xorg/bin/xfd/Makefile        Sat Nov 20 23:47:30 2010 +0000
+++ b/external/mit/xorg/bin/xfd/Makefile        Sun Nov 21 01:25:32 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 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>
diff -r a7e2caf7071a -r fa645dcae8f1 external/mit/xorg/bin/xfontsel/Makefile
--- a/external/mit/xorg/bin/xfontsel/Makefile   Sat Nov 20 23:47:30 2010 +0000
+++ b/external/mit/xorg/bin/xfontsel/Makefile   Sun Nov 21 01:25:32 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 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>
diff -r a7e2caf7071a -r fa645dcae8f1 external/mit/xorg/bin/xfs/Makefile
--- a/external/mit/xorg/bin/xfs/Makefile        Sat Nov 20 23:47:30 2010 +0000
+++ b/external/mit/xorg/bin/xfs/Makefile        Sun Nov 21 01:25:32 2010 +0000
@@ -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/ \
diff -r a7e2caf7071a -r fa645dcae8f1 external/mit/xorg/share/fonts/font-util/Makefile
--- a/external/mit/xorg/share/fonts/font-util/Makefile  Sat Nov 20 23:47:30 2010 +0000
+++ b/external/mit/xorg/share/fonts/font-util/Makefile  Sun Nov 21 01:25:32 2010 +0000
@@ -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