Module Name: src
Committed By: mrg
Date: Sun Nov 21 06:01:50 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/bin: Makefile
src/external/mit/xorg/bin/xsm: Makefile
src/external/mit/xorg/lib/libXext: Makefile
src/external/mit/xorg/lib/libXmu: Makefile
Log Message:
remove deprecated xft-config, fix xsm locations, don't install lbx
headers, instal Xmu/WhitePoint.h.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xsm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXext/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXmu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.114 src/distrib/sets/lists/xcomp/mi:1.115
--- src/distrib/sets/lists/xcomp/mi:1.114 Sun Nov 21 02:43:31 2010
+++ src/distrib/sets/lists/xcomp/mi Sun Nov 21 06:01:49 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.114 2010/11/21 02:43:31 mrg Exp $
+# $NetBSD: mi,v 1.115 2010/11/21 06:01:49 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5169,7 +5169,7 @@
./usr/X11R6/man/man3/gluTessVertex.3 -unknown- .man,x11
./usr/X11R6/man/man3/gluUnProject.3 -unknown- .man,x11
./usr/X11R7/bin/freetype-config -unknown- xorg
-./usr/X11R7/bin/xft-config -unknown- xorg
+./usr/X11R7/bin/xft-config -unknown- obsolete
./usr/X11R7/include/GL/GLwDrawA.h -unknown- xorg
./usr/X11R7/include/GL/GLwDrawAP.h -unknown- xorg
./usr/X11R7/include/GL/GLwMDrawA.h -unknown- xorg
@@ -5356,6 +5356,7 @@
./usr/X11R7/include/X11/Xmu/StdCmap.h -unknown- xorg
./usr/X11R7/include/X11/Xmu/StdSel.h -unknown- xorg
./usr/X11R7/include/X11/Xmu/SysUtil.h -unknown- xorg
+./usr/X11R7/include/X11/Xmu/WhitePoint.h -unknown- xorg
./usr/X11R7/include/X11/Xmu/WidgetNode.h -unknown- xorg
./usr/X11R7/include/X11/Xmu/WinUtil.h -unknown- xorg
./usr/X11R7/include/X11/Xmu/Xct.h -unknown- xorg
@@ -6500,7 +6501,7 @@
./usr/X11R7/lib/pkgconfig/xxf86misc.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xxf86vm.pc -unknown- xorg
./usr/X11R7/man/cat1/mergelib.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat1/xft-config.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/xft-config.0 -unknown- obsolete
./usr/X11R7/man/cat3/AllPlanes.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/BlackPixelOfScreen.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/DBE.0 -unknown- .cat,xorg
@@ -7403,7 +7404,7 @@
./usr/X11R7/man/cat3/XvVideoNotify.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/libXp.0 -obsolete- obsolete
./usr/X11R7/man/html1/mergelib.html -unknown- html,xorg
-./usr/X11R7/man/html1/xft-config.html -unknown- html,xorg
+./usr/X11R7/man/html1/xft-config.html -unknown- obsolete
./usr/X11R7/man/html3/AllPlanes.html -unknown- html,xorg
./usr/X11R7/man/html3/BlackPixelOfScreen.html -unknown- html,xorg
./usr/X11R7/man/html3/DBE.html -unknown- html,xorg
@@ -8305,7 +8306,7 @@
./usr/X11R7/man/html3/XvUngrabPort.html -unknown- html,xorg
./usr/X11R7/man/html3/XvVideoNotify.html -unknown- html,xorg
./usr/X11R7/man/html3/libXp.html -obsolete- obsolete
-./usr/X11R7/man/man1/xft-config.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/xft-config.1 -unknown- obsolete
./usr/X11R7/man/man3/AllPlanes.3 -unknown- .man,xorg
./usr/X11R7/man/man3/BlackPixelOfScreen.3 -unknown- .man,xorg
./usr/X11R7/man/man3/DBE.3 -unknown- .man,xorg
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.8 src/external/mit/xorg/bin/Makefile:1.9
--- src/external/mit/xorg/bin/Makefile:1.8 Sun Nov 21 02:43:31 2010
+++ src/external/mit/xorg/bin/Makefile Sun Nov 21 06:01:49 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/21 02:43:31 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/11/21 06:01:49 mrg Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cxpm editres fc-cache fc-cat fc-list fc-match \
@@ -10,7 +10,7 @@
twm ucs2any viewres x11perf xauth xbiff xcalc \
xclipboard xclock xcmsdb xconsole xcutsel xditview xdm \
xdpyinfo xedit xev xeyes xf86dga xfd xfindproxy xfontsel \
- xfs xfsinfo xft-config xfwp xgamma xgc xhost xinit xinput xkbcomp \
+ xfs xfsinfo xfwp xgamma xgc xhost xinit xinput xkbcomp \
xkbevd xkbprint xkbutils xkill xload xlogo xlsatoms xlsclients \
xlsfonts xmag xman xmessage xmh xmkmf xmlwf xmodmap xmore \
xprop xrandr xrdb xrefresh xset xsetmode xsetpointer \
Index: src/external/mit/xorg/bin/xsm/Makefile
diff -u src/external/mit/xorg/bin/xsm/Makefile:1.1.1.1 src/external/mit/xorg/bin/xsm/Makefile:1.2
--- src/external/mit/xorg/bin/xsm/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xsm/Makefile Sun Nov 21 06:01:50 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 06:01:50 mrg Exp $
.include <bsd.own.mk>
@@ -10,13 +10,14 @@
XSMDIR= ${X11ETCDIR}/xsm
CPPFLAGS+=-DHAS_MKSTEMP
-CPPFLAGS.remote.c= -DRSHCMD=\"rsh\"
+CPPFLAGS.remote.c= -DRSHCMD=\"ssh\"
CPPFLAGS.restart.c= -DSYSTEM_INIT_FILE=\"${XSMDIR}/system.xsm\"
CONFIGFILES= system.xsm
FILESDIR= ${XSMDIR}
-APPDEFS=XSm.ad
+.PATH: ${X11SRCDIR.${PROG}}/app-defaults
+APPDEFS=XSm
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
Index: src/external/mit/xorg/lib/libXext/Makefile
diff -u src/external/mit/xorg/lib/libXext/Makefile:1.5 src/external/mit/xorg/lib/libXext/Makefile:1.6
--- src/external/mit/xorg/lib/libXext/Makefile:1.5 Sat May 22 02:27:08 2010
+++ src/external/mit/xorg/lib/libXext/Makefile Sun Nov 21 06:01:50 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/22 02:27:08 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/21 06:01:50 mrg Exp $
.include <bsd.own.mk>
@@ -75,9 +75,6 @@
Xge.h \
dpms.h \
extutil.h \
- lbxbuf.h \
- lbxbufstr.h \
- lbximage.h \
multibuf.h \
security.h \
shape.h \
Index: src/external/mit/xorg/lib/libXmu/Makefile
diff -u src/external/mit/xorg/lib/libXmu/Makefile:1.2 src/external/mit/xorg/lib/libXmu/Makefile:1.3
--- src/external/mit/xorg/lib/libXmu/Makefile:1.2 Sat Sep 13 04:32:30 2008
+++ src/external/mit/xorg/lib/libXmu/Makefile Sun Nov 21 06:01:50 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 06:01:50 mrg Exp $
.include <bsd.own.mk>
@@ -19,7 +19,8 @@
INCS= Atoms.h CharSet.h CloseHook.h Converters.h CurUtil.h \
CvtCache.h DisplayQue.h Drawing.h Editres.h EditresP.h \
Error.h ExtAgent.h Initer.h Lookup.h Misc.h StdCmap.h \
- StdSel.h SysUtil.h WidgetNode.h WinUtil.h Xct.h Xmu.h
+ StdSel.h SysUtil.h WidgetNode.h WinUtil.h Xct.h Xmu.h \
+ WhitePoint.h
INCSDIR=${X11INCDIR}/X11/Xmu
CPPFLAGS+= ${X11FLAGS.THREADLIB}
