Module Name: src
Committed By: mrg
Date: Mon Apr 20 03:07:15 UTC 2009
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/xbase: mi shl.elf shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/external/mit/xorg/bin: Makefile
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/tools: getlibvers
Removed Files:
src/external/mit/xorg/bin/xphelloworld: Makefile
src/external/mit/xorg/bin/xplsprinters: Makefile
src/external/mit/xorg/bin/xprehashprinterlist: Makefile
src/external/mit/xorg/bin/xpsimplehelloworld: Makefile
src/external/mit/xorg/bin/xpxthelloworld: Makefile
src/external/mit/xorg/include/printproto: Makefile
src/external/mit/xorg/lib/libXp: Makefile shlib_version
src/external/mit/xorg/lib/libXprintAppUtil: Makefile shlib_version
src/external/mit/xorg/lib/libXprintUtil: Makefile shlib_version
Log Message:
part two of excising Xprint support from native xorg:
- delete libXp, libXprintAppUtil and libXprinUtil
- delete printproto
- delete xphelloworld, xplsprinters, xprehashprinterlist,
xpsimplehelloworld and xpxthelloworld
i'll be removing the sources shortly.
To generate a diff of this commit:
cvs rdiff -u -r1.803 -r1.804 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xbase/shl.elf
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xphelloworld/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xplsprinters/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/bin/xprehashprinterlist/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/bin/xpsimplehelloworld/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xpxthelloworld/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/printproto/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/libXp/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/libXp/shlib_version
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/libXprintAppUtil/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/lib/libXprintAppUtil/shlib_version
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/libXprintUtil/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/libXprintUtil/shlib_version
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/getlibvers
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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.803 src/distrib/sets/lists/base/mi:1.804
--- src/distrib/sets/lists/base/mi:1.803 Sun Apr 12 19:55:05 2009
+++ src/distrib/sets/lists/base/mi Mon Apr 20 03:07:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.803 2009/04/12 19:55:05 christos Exp $
+# $NetBSD: mi,v 1.804 2009/04/20 03:07:13 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -492,8 +492,8 @@
./usr/X11R7/include/X11/Xcursor base-x11-root
./usr/X11R7/include/X11/Xft base-x11-root
./usr/X11R7/include/X11/Xmu base-x11-root
-./usr/X11R7/include/X11/XprintAppUtil base-x11-root
-./usr/X11R7/include/X11/XprintUtil base-x11-root
+./usr/X11R7/include/X11/XprintAppUtil base-obsolete obsolete
+./usr/X11R7/include/X11/XprintUtil base-obsolete obsolete
./usr/X11R7/include/X11/Xtrans base-x11-root
./usr/X11R7/include/X11/bitmaps base-x11-root
./usr/X11R7/include/X11/extensions base-x11-root
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.72 src/distrib/sets/lists/xbase/mi:1.73
--- src/distrib/sets/lists/xbase/mi:1.72 Sat Feb 14 11:23:13 2009
+++ src/distrib/sets/lists/xbase/mi Mon Apr 20 03:07:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.72 2009/02/14 11:23:13 abs Exp $
+# $NetBSD: mi,v 1.73 2009/04/20 03:07:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1274,12 +1274,12 @@
./usr/X11R7/bin/xmlwf -unknown- xorg
./usr/X11R7/bin/xmodmap -unknown- xorg
./usr/X11R7/bin/xmore -unknown- xorg
-./usr/X11R7/bin/xphelloworld -unknown- xorg
-./usr/X11R7/bin/xplsprinters -unknown- xorg
-./usr/X11R7/bin/xprehashprinterlist -unknown- xorg
+./usr/X11R7/bin/xphelloworld -obsolete- obsolete
+./usr/X11R7/bin/xplsprinters -obsolete- obsolete
+./usr/X11R7/bin/xprehashprinterlist -obsolete- obsolete
./usr/X11R7/bin/xprop -unknown- xorg
-./usr/X11R7/bin/xpsimplehelloworld -unknown- xorg
-./usr/X11R7/bin/xpxthelloworld -unknown- xorg
+./usr/X11R7/bin/xpsimplehelloworld -obsolete- obsolete
+./usr/X11R7/bin/xpxthelloworld -obsolete- obsolete
./usr/X11R7/bin/xrandr -unknown- xorg
./usr/X11R7/bin/xrdb -unknown- xorg
./usr/X11R7/bin/xrefresh -unknown- xorg
@@ -1998,12 +1998,12 @@
./usr/X11R7/man/cat1/xmlwf.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/xmodmap.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/xmore.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat1/xphelloworld.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat1/xplsprinters.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat1/xprehashprinterlist.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/xphelloworld.0 -obsolete- obsolete
+./usr/X11R7/man/cat1/xplsprinters.0 -obsolete- obsolete
+./usr/X11R7/man/cat1/xprehashprinterlist.0 -obsolete- obsolete
./usr/X11R7/man/cat1/xprop.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat1/xpsimplehelloworld.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat1/xpxthelloworld.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/xpsimplehelloworld.0 -obsolete- obsolete
+./usr/X11R7/man/cat1/xpxthelloworld.0 -obsolete- obsolete
./usr/X11R7/man/cat1/xrandr.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/xrdb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/xrefresh.0 -unknown- .cat,xorg
@@ -2118,12 +2118,12 @@
./usr/X11R7/man/html1/xmlwf.html -unknown- html,xorg
./usr/X11R7/man/html1/xmodmap.html -unknown- html,xorg
./usr/X11R7/man/html1/xmore.html -unknown- html,xorg
-./usr/X11R7/man/html1/xphelloworld.html -unknown- html,xorg
-./usr/X11R7/man/html1/xplsprinters.html -unknown- html,xorg
-./usr/X11R7/man/html1/xprehashprinterlist.html -unknown- html,xorg
+./usr/X11R7/man/html1/xphelloworld.html -obsolete- obsolete
+./usr/X11R7/man/html1/xplsprinters.html -obsolete- obsolete
+./usr/X11R7/man/html1/xprehashprinterlist.html -obsolete- obsolete
./usr/X11R7/man/html1/xprop.html -unknown- html,xorg
-./usr/X11R7/man/html1/xpsimplehelloworld.html -unknown- html,xorg
-./usr/X11R7/man/html1/xpxthelloworld.html -unknown- html,xorg
+./usr/X11R7/man/html1/xpsimplehelloworld.html -obsolete- obsolete
+./usr/X11R7/man/html1/xpxthelloworld.html -obsolete- obsolete
./usr/X11R7/man/html1/xrandr.html -unknown- html,xorg
./usr/X11R7/man/html1/xrdb.html -unknown- html,xorg
./usr/X11R7/man/html1/xrefresh.html -unknown- html,xorg
@@ -2239,12 +2239,12 @@
./usr/X11R7/man/man1/xmlwf.1 -unknown- .man,xorg
./usr/X11R7/man/man1/xmodmap.1 -unknown- .man,xorg
./usr/X11R7/man/man1/xmore.1 -unknown- .man,xorg
-./usr/X11R7/man/man1/xphelloworld.1 -unknown- .man,xorg
-./usr/X11R7/man/man1/xplsprinters.1 -unknown- .man,xorg
-./usr/X11R7/man/man1/xprehashprinterlist.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/xphelloworld.1 -obsolete- obsolete
+./usr/X11R7/man/man1/xplsprinters.1 -obsolete- obsolete
+./usr/X11R7/man/man1/xprehashprinterlist.1 -obsolete- obsolete
./usr/X11R7/man/man1/xprop.1 -unknown- .man,xorg
-./usr/X11R7/man/man1/xpsimplehelloworld.1 -unknown- .man,xorg
-./usr/X11R7/man/man1/xpxthelloworld.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/xpsimplehelloworld.1 -obsolete- obsolete
+./usr/X11R7/man/man1/xpxthelloworld.1 -obsolete- obsolete
./usr/X11R7/man/man1/xrandr.1 -unknown- .man,xorg
./usr/X11R7/man/man1/xrdb.1 -unknown- .man,xorg
./usr/X11R7/man/man1/xrefresh.1 -unknown- .man,xorg
Index: src/distrib/sets/lists/xbase/shl.elf
diff -u src/distrib/sets/lists/xbase/shl.elf:1.23 src/distrib/sets/lists/xbase/shl.elf:1.24
--- src/distrib/sets/lists/xbase/shl.elf:1.23 Sun Apr 19 21:36:46 2009
+++ src/distrib/sets/lists/xbase/shl.elf Mon Apr 20 03:07:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.23 2009/04/19 21:36:46 mrg Exp $
+# $NetBSD: shl.elf,v 1.24 2009/04/20 03:07:13 mrg Exp $
./usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 -unknown- x11
./usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 -unknown- x11
./usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -unknown- x11
@@ -165,14 +165,14 @@
./usr/X11R7/lib/libXmu.so.7 -unknown- xorg
./usr/X11R7/lib/libXmuu.so -unknown- xorg
./usr/X11R7/lib/libXmuu.so.2 -unknown- xorg
-./usr/X11R7/lib/libXp.so -unknown- xorg
-./usr/X11R7/lib/libXp.so.7 -unknown- xorg
+./usr/X11R7/lib/libXp.so -obsolete- obsolete
+./usr/X11R7/lib/libXp.so.7 -obsolete- obsolete
./usr/X11R7/lib/libXpm.so -unknown- xorg
./usr/X11R7/lib/libXpm.so.5 -unknown- xorg
-./usr/X11R7/lib/libXprintAppUtil.so -unknown- xorg
-./usr/X11R7/lib/libXprintAppUtil.so.2 -unknown- xorg
-./usr/X11R7/lib/libXprintUtil.so -unknown- xorg
-./usr/X11R7/lib/libXprintUtil.so.2 -unknown- xorg
+./usr/X11R7/lib/libXprintAppUtil.so -obsolete- obsolete
+./usr/X11R7/lib/libXprintAppUtil.so.2 -obsolete- obsolete
+./usr/X11R7/lib/libXprintUtil.so -obsolete- obsolete
+./usr/X11R7/lib/libXprintUtil.so.2 -obsolete- obsolete
./usr/X11R7/lib/libXrandr.so -unknown- xorg
./usr/X11R7/lib/libXrandr.so.3 -unknown- xorg
./usr/X11R7/lib/libXrender.so -unknown- xorg
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.28 src/distrib/sets/lists/xbase/shl.mi:1.29
--- src/distrib/sets/lists/xbase/shl.mi:1.28 Sun Apr 19 21:36:46 2009
+++ src/distrib/sets/lists/xbase/shl.mi Mon Apr 20 03:07:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.28 2009/04/19 21:36:46 mrg Exp $
+# $NetBSD: shl.mi,v 1.29 2009/04/20 03:07:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -83,10 +83,10 @@
./usr/X11R7/lib/libXinerama.so.2.0 -unknown- xorg
./usr/X11R7/lib/libXmu.so.7.0 -unknown- xorg
./usr/X11R7/lib/libXmuu.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXp.so.7.0 -unknown- xorg
+./usr/X11R7/lib/libXp.so.7.0 -obsolete- obsolete
./usr/X11R7/lib/libXpm.so.5.0 -unknown- xorg
-./usr/X11R7/lib/libXprintAppUtil.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXprintUtil.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libXprintAppUtil.so.2.0 -obsolete- obsolete
+./usr/X11R7/lib/libXprintUtil.so.2.0 -obsolete- obsolete
./usr/X11R7/lib/libXrandr.so.3.0 -unknown- xorg
./usr/X11R7/lib/libXrender.so.2.0 -unknown- xorg
./usr/X11R7/lib/libXres.so.1.0 -obsolete- obsolete
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.86 src/distrib/sets/lists/xcomp/mi:1.87
--- src/distrib/sets/lists/xcomp/mi:1.86 Sun Apr 19 21:36:46 2009
+++ src/distrib/sets/lists/xcomp/mi Mon Apr 20 03:07:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.86 2009/04/19 21:36:46 mrg Exp $
+# $NetBSD: mi,v 1.87 2009/04/20 03:07:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5362,8 +5362,8 @@
./usr/X11R7/include/X11/Xos_r.h -unknown- xorg
./usr/X11R7/include/X11/Xosdefs.h -unknown- xorg
./usr/X11R7/include/X11/Xpoll.h -unknown- xorg
-./usr/X11R7/include/X11/XprintAppUtil/xpapputil.h -unknown- xorg
-./usr/X11R7/include/X11/XprintUtil/xprintutil.h -unknown- xorg
+./usr/X11R7/include/X11/XprintAppUtil/xpapputil.h -obsolete- obsolete
+./usr/X11R7/include/X11/XprintUtil/xprintutil.h -obsolete- obsolete
./usr/X11R7/include/X11/Xproto.h -unknown- xorg
./usr/X11R7/include/X11/Xprotostr.h -unknown- xorg
./usr/X11R7/include/X11/Xregion.h -unknown- xorg
@@ -5487,8 +5487,8 @@
./usr/X11R7/include/X11/drm/via_3d_reg.h -unknown- xorg
./usr/X11R7/include/X11/drm/via_drm.h -unknown- xorg
./usr/X11R7/include/X11/extensions/MITMisc.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/Print.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/Printstr.h -unknown- xorg
+./usr/X11R7/include/X11/extensions/Print.h -obsolete- obsolete
+./usr/X11R7/include/X11/extensions/Printstr.h -obsolete- obsolete
./usr/X11R7/include/X11/extensions/XEVI.h -unknown- xorg
./usr/X11R7/include/X11/extensions/XEVIstr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/XI.h -unknown- xorg
@@ -6065,18 +6065,18 @@
./usr/X11R7/lib/libXmuu.a -unknown- xorg
./usr/X11R7/lib/libXmuu_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXmuu_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXp.a -unknown- xorg
-./usr/X11R7/lib/libXp_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libXp_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libXp.a -obsolete- obsolete
+./usr/X11R7/lib/libXp_g.a -obsolete- obsolete
+./usr/X11R7/lib/libXp_p.a -obsolete- obsolete
./usr/X11R7/lib/libXpm.a -unknown- xorg
./usr/X11R7/lib/libXpm_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXpm_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXprintAppUtil.a -unknown- xorg
-./usr/X11R7/lib/libXprintAppUtil_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libXprintAppUtil_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXprintUtil.a -unknown- xorg
-./usr/X11R7/lib/libXprintUtil_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libXprintUtil_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libXprintAppUtil.a -obsolete- obsolete
+./usr/X11R7/lib/libXprintAppUtil_g.a -obsolete- obsolete
+./usr/X11R7/lib/libXprintAppUtil_p.a -obsolete- obsolete
+./usr/X11R7/lib/libXprintUtil.a -obsolete- obsolete
+./usr/X11R7/lib/libXprintUtil_g.a -obsolete- obsolete
+./usr/X11R7/lib/libXprintUtil_p.a -obsolete- obsolete
./usr/X11R7/lib/libXrandr.a -unknown- xorg
./usr/X11R7/lib/libXrandr_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXrandr_p.a -unknown- profile,xorg
@@ -6172,7 +6172,7 @@
./usr/X11R7/lib/pkgconfig/libdrm.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libfs.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/pixman-1.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/printproto.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/printproto.pc -obsolete- obsolete
./usr/X11R7/lib/pkgconfig/randrproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/recordproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/renderproto.pc -unknown- xorg
@@ -6212,10 +6212,7 @@
./usr/X11R7/lib/pkgconfig/xmu.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xmuu.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xorg-server.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/xp.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xpm.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/xprintapputil.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/xprintutil.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xproxymngproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xrandr.pc -unknown- xorg
@@ -6806,39 +6803,39 @@
./usr/X11R7/man/cat3/XmbufGetVersion.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/XmbufGetWindowAttributes.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/XmbufQueryExtension.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpCancelDoc.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpCancelJob.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpCancelPage.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpCreateContext.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpDestroyContext.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpEndDoc.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpEndJob.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpEndPage.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpFreePrinterList.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetAttributes.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetContext.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetDocumentData.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetImageResolution.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetLocaleHinter.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetOneAttribute.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetPageDimensions.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetPdmStartParams.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetPrinterList.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpGetScreenOfContext.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpInputSelected.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpPutDocumentData.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpQueryExtension.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpQueryScreens.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpQueryVersion.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpRehashPrinterList.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpSelectInput.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpSetAttributes.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpSetContext.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpSetImageResolution.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpSetLocaleHinter.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpStartDoc.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpStartJob.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/XpStartPage.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat3/XpCancelDoc.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpCancelJob.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpCancelPage.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpCreateContext.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpDestroyContext.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpEndDoc.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpEndJob.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpEndPage.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpFreePrinterList.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetAttributes.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetContext.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetDocumentData.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetImageResolution.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetLocaleHinter.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetOneAttribute.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetPageDimensions.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetPdmStartParams.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetPrinterList.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpGetScreenOfContext.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpInputSelected.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpPutDocumentData.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpQueryExtension.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpQueryScreens.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpQueryVersion.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpRehashPrinterList.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpSelectInput.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpSetAttributes.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpSetContext.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpSetImageResolution.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpSetLocaleHinter.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpStartDoc.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpStartJob.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/XpStartPage.0 -obsolete- obsolete
./usr/X11R7/man/cat3/Xrandr.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/XrmEnumerateDatabase.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/XrmGetFileDatabase.0 -unknown- .cat,xorg
@@ -7133,7 +7130,7 @@
./usr/X11R7/man/cat3/XvStopVideo.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/XvUngrabPort.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/XvVideoNotify.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat3/libXp.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/html3/AllPlanes.html -unknown- html,xorg
@@ -7709,39 +7706,39 @@
./usr/X11R7/man/html3/XmbufGetVersion.html -unknown- html,xorg
./usr/X11R7/man/html3/XmbufGetWindowAttributes.html -unknown- html,xorg
./usr/X11R7/man/html3/XmbufQueryExtension.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpCancelDoc.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpCancelJob.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpCancelPage.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpCreateContext.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpDestroyContext.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpEndDoc.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpEndJob.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpEndPage.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpFreePrinterList.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetAttributes.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetContext.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetDocumentData.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetImageResolution.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetLocaleHinter.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetOneAttribute.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetPageDimensions.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetPdmStartParams.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetPrinterList.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpGetScreenOfContext.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpInputSelected.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpPutDocumentData.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpQueryExtension.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpQueryScreens.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpQueryVersion.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpRehashPrinterList.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpSelectInput.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpSetAttributes.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpSetContext.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpSetImageResolution.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpSetLocaleHinter.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpStartDoc.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpStartJob.html -unknown- html,xorg
-./usr/X11R7/man/html3/XpStartPage.html -unknown- html,xorg
+./usr/X11R7/man/html3/XpCancelDoc.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpCancelJob.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpCancelPage.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpCreateContext.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpDestroyContext.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpEndDoc.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpEndJob.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpEndPage.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpFreePrinterList.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetAttributes.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetContext.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetDocumentData.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetImageResolution.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetLocaleHinter.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetOneAttribute.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetPageDimensions.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetPdmStartParams.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetPrinterList.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpGetScreenOfContext.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpInputSelected.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpPutDocumentData.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpQueryExtension.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpQueryScreens.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpQueryVersion.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpRehashPrinterList.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpSelectInput.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpSetAttributes.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpSetContext.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpSetImageResolution.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpSetLocaleHinter.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpStartDoc.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpStartJob.html -obsolete- obsolete
+./usr/X11R7/man/html3/XpStartPage.html -obsolete- obsolete
./usr/X11R7/man/html3/Xrandr.html -unknown- html,xorg
./usr/X11R7/man/html3/XrmEnumerateDatabase.html -unknown- html,xorg
./usr/X11R7/man/html3/XrmGetFileDatabase.html -unknown- html,xorg
@@ -8036,7 +8033,7 @@
./usr/X11R7/man/html3/XvStopVideo.html -unknown- html,xorg
./usr/X11R7/man/html3/XvUngrabPort.html -unknown- html,xorg
./usr/X11R7/man/html3/XvVideoNotify.html -unknown- html,xorg
-./usr/X11R7/man/html3/libXp.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/man3/AllPlanes.3 -unknown- .man,xorg
./usr/X11R7/man/man3/BlackPixelOfScreen.3 -unknown- .man,xorg
@@ -8611,39 +8608,39 @@
./usr/X11R7/man/man3/XmbufGetVersion.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XmbufGetWindowAttributes.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XmbufQueryExtension.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpCancelDoc.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpCancelJob.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpCancelPage.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpCreateContext.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpDestroyContext.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpEndDoc.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpEndJob.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpEndPage.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpFreePrinterList.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetAttributes.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetContext.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetDocumentData.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetImageResolution.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetLocaleHinter.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetOneAttribute.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetPageDimensions.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetPdmStartParams.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetPrinterList.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpGetScreenOfContext.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpInputSelected.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpPutDocumentData.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpQueryExtension.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpQueryScreens.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpQueryVersion.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpRehashPrinterList.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpSelectInput.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpSetAttributes.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpSetContext.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpSetImageResolution.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpSetLocaleHinter.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpStartDoc.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpStartJob.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/XpStartPage.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/XpCancelDoc.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpCancelJob.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpCancelPage.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpCreateContext.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpDestroyContext.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpEndDoc.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpEndJob.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpEndPage.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpFreePrinterList.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetAttributes.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetContext.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetDocumentData.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetImageResolution.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetLocaleHinter.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetOneAttribute.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetPageDimensions.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetPdmStartParams.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetPrinterList.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpGetScreenOfContext.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpInputSelected.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpPutDocumentData.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpQueryExtension.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpQueryScreens.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpQueryVersion.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpRehashPrinterList.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpSelectInput.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpSetAttributes.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpSetContext.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpSetImageResolution.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpSetLocaleHinter.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpStartDoc.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpStartJob.3 -obsolete- obsolete
+./usr/X11R7/man/man3/XpStartPage.3 -obsolete- obsolete
./usr/X11R7/man/man3/Xrandr.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XrmEnumerateDatabase.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XrmGetFileDatabase.3 -unknown- .man,xorg
@@ -8938,7 +8935,7 @@
./usr/X11R7/man/man3/XvStopVideo.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XvUngrabPort.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XvVideoNotify.3 -unknown- .man,xorg
-./usr/X11R7/man/man3/libXp.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/libXp.3 -obsolete- obsolete
./usr/libdata/debug/usr/X11R6/bin/Xdmx.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xnest.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xprt.debug -unknown- debug,x11
@@ -9170,12 +9167,12 @@
./usr/libdata/debug/usr/X11R7/bin/xmlwf.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/xmodmap.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/xmore.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/xphelloworld.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/xplsprinters.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/xprehashprinterlist.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/xphelloworld.debug -obsolete- obsolete
+./usr/libdata/debug/usr/X11R7/bin/xplsprinters.debug -obsolete- obsolete
+./usr/libdata/debug/usr/X11R7/bin/xprehashprinterlist.debug -obsolete- obsolete
./usr/libdata/debug/usr/X11R7/bin/xprop.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/xpsimplehelloworld.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/xpxthelloworld.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/xpsimplehelloworld.debug -obsolete- obsolete
+./usr/libdata/debug/usr/X11R7/bin/xpxthelloworld.debug -obsolete- obsolete
./usr/libdata/debug/usr/X11R7/bin/xrandr.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/xrdb.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/xrefresh.debug -unknown- debug,xorg
@@ -9248,8 +9245,8 @@
./usr/libdata/lint/llib-lXp.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXpm.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXpm.ln -unknown- lint,xorg
-./usr/libdata/lint/llib-lXprintAppUtil.ln -unknown- lint,xorg
-./usr/libdata/lint/llib-lXprintUtil.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lXprintAppUtil.ln -obsolete- obsolete
+./usr/libdata/lint/llib-lXprintUtil.ln -obsolete- obsolete
./usr/libdata/lint/llib-lXrandr.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXrandr.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXrender.ln -unknown- lint,x11
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.12 src/distrib/sets/lists/xcomp/shl.mi:1.13
--- src/distrib/sets/lists/xcomp/shl.mi:1.12 Sun Apr 19 21:36:46 2009
+++ src/distrib/sets/lists/xcomp/shl.mi Mon Apr 20 03:07:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.12 2009/04/19 21:36:46 mrg Exp $
+# $NetBSD: shl.mi,v 1.13 2009/04/20 03:07:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -74,10 +74,10 @@
./usr/X11R7/lib/libXinerama_pic.a -unknown- xorg
./usr/X11R7/lib/libXmu_pic.a -unknown- xorg
./usr/X11R7/lib/libXmuu_pic.a -unknown- xorg
-./usr/X11R7/lib/libXp_pic.a -unknown- xorg
+./usr/X11R7/lib/libXp_pic.a -obsolete- obsolete
./usr/X11R7/lib/libXpm_pic.a -unknown- xorg
-./usr/X11R7/lib/libXprintAppUtil_pic.a -unknown- xorg
-./usr/X11R7/lib/libXprintUtil_pic.a -unknown- xorg
+./usr/X11R7/lib/libXprintAppUtil_pic.a -obsolete- obsolete
+./usr/X11R7/lib/libXprintUtil_pic.a -obsolete- obsolete
./usr/X11R7/lib/libXrandr_pic.a -unknown- xorg
./usr/X11R7/lib/libXrender_pic.a -unknown- xorg
./usr/X11R7/lib/libXres_pic.a -obsolete- obsolete
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.5 src/external/mit/xorg/bin/Makefile:1.6
--- src/external/mit/xorg/bin/Makefile:1.5 Sun Oct 5 17:54:29 2008
+++ src/external/mit/xorg/bin/Makefile Mon Apr 20 03:07:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/10/05 17:54:29 cube Exp $
+# $NetBSD: Makefile,v 1.6 2009/04/20 03:07:13 mrg Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cxpm editres fc-cache fc-cat fc-list fc-match \
@@ -13,8 +13,6 @@
xfs xfsinfo xft-config xfwp xgamma xgc xhost xinit xinput xkbcomp \
xkbevd xkbprint xkbutils xkill xload xlogo xlsatoms xlsclients \
xlsfonts xmag xman xmessage xmh xmkmf xmlwf xmodmap xmore \
- xplsprinters xprehashprinterlist xphelloworld \
- xpxthelloworld xpsimplehelloworld \
xprop xrandr xrdb xrefresh xset xsetmode xsetpointer \
xsetroot xsm xstdcmap xterm xtrap xvidtune \
xvinfo xwd xwininfo xwud xdriinfo sessreg
Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.1.1.1 src/external/mit/xorg/include/Makefile:1.2
--- src/external/mit/xorg/include/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/include/Makefile Mon Apr 20 03:07:14 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/20 03:07:14 mrg Exp $
# *proto packages for xorg
@@ -6,7 +6,7 @@
fixesproto inputproto scrnsaverproto xextproto evieext xineramaproto \
resourceproto recordproto videoproto xf86dgaproto xf86miscproto \
compositeproto damageproto trapproto glproto randrproto fontcacheproto \
- xf86driproto xf86vidmodeproto printproto renderproto \
+ xf86driproto xf86vidmodeproto renderproto \
xproxymanagementprotocol xbitmaps .WAIT \
xtrans
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.10 src/external/mit/xorg/lib/Makefile:1.11
--- src/external/mit/xorg/lib/Makefile:1.10 Sun Apr 19 21:36:47 2009
+++ src/external/mit/xorg/lib/Makefile Mon Apr 20 03:07:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/04/19 21:36:47 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2009/04/20 03:07:15 mrg Exp $
# build libraries for xorg
@@ -10,13 +10,13 @@
libXcomposite libXdamage libXext libXfixes libXt \
libxkbfile \
.WAIT \
- libXi libXp libXxf86vm \
+ libXi libXxf86vm \
.WAIT \
libGL libXScrnSaver libXTrap libXevie libXfont libXfontcache \
- libXinerama libXmu libXmuu libXpm libXprintUtil libXrender \
+ libXinerama libXmu libXmuu libXpm libXrender \
libXres libXtst libXvMC libXv libXxf86dga libXxf86misc libxkbui \
.WAIT \
- libGLU libGLw libXaw6 libXaw libXcursor libXprintAppUtil \
+ libGLU libGLw libXaw6 libXaw libXcursor \
libXrandr \
.WAIT \
libXft libglut
Index: src/external/mit/xorg/tools/getlibvers
diff -u src/external/mit/xorg/tools/getlibvers:1.1.1.1 src/external/mit/xorg/tools/getlibvers:1.2
--- src/external/mit/xorg/tools/getlibvers:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/tools/getlibvers Mon Apr 20 03:07:15 2009
@@ -1,6 +1,6 @@
#! /bin/sh
-list='expat fontconfig freetype libFS libICE libSM libX11 libXScrnSaver libXTrap libXau libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXft libXi libXinerama libXmu libXp libXpm libXprintUtil libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdrm libfontenc libxkbfile libxkbui'
+list='expat fontconfig freetype libFS libICE libSM libX11 libXScrnSaver libXTrap libXau libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdrm libfontenc libxkbfile libxkbui'
DISTFILES=${DISTFILES-/usr/pkgsrc/distfiles}
