Module Name: src
Committed By: mrg
Date: Sun Apr 19 21:36:47 UTC 2009
Modified Files:
src/distrib/sets/lists/xbase: shl.elf shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/external/mit/xorg/bin/xmore: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/libXaw: Makefile shlib_version
Removed Files:
src/external/mit/xorg/lib/libXaw7: Makefile shlib_version
Log Message:
in preparation for removing Xprint:
- retire libXaw8
- remote Xprint support from xmore
- bump libXaw7 to major 10 so that "libXaw.so" gets a new SONAME, and
make it the "libXaw" used.
XXX: this probably should be pulled up to netbsd-5, which is why i have
XXX: separated it out from the general Xprint removal
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xbase/shl.elf
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xmore/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXaw/shlib_version
cvs rdiff -u -r1.5 -r0 src/external/mit/xorg/lib/libXaw7/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/libXaw7/shlib_version
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/xbase/shl.elf
diff -u src/distrib/sets/lists/xbase/shl.elf:1.22 src/distrib/sets/lists/xbase/shl.elf:1.23
--- src/distrib/sets/lists/xbase/shl.elf:1.22 Fri Apr 3 16:21:08 2009
+++ src/distrib/sets/lists/xbase/shl.elf Sun Apr 19 21:36:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.22 2009/04/03 16:21:08 perry Exp $
+# $NetBSD: shl.elf,v 1.23 2009/04/19 21:36:46 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
@@ -134,9 +134,9 @@
./usr/X11R7/lib/libXaw.so -unknown- xorg
./usr/X11R7/lib/libXaw6.so.7 -unknown- xorg
./usr/X11R7/lib/libXaw7.so -unknown- xorg
-./usr/X11R7/lib/libXaw7.so.8 -unknown- xorg
-./usr/X11R7/lib/libXaw8.so -unknown- xorg
-./usr/X11R7/lib/libXaw8.so.9 -unknown- xorg
+./usr/X11R7/lib/libXaw7.so.10 -unknown- xorg
+./usr/X11R7/lib/libXaw8.so -obsolete- obsolete
+./usr/X11R7/lib/libXaw8.so.9 -obsolete- obsolete
./usr/X11R7/lib/libXcomposite.so -unknown- xorg
./usr/X11R7/lib/libXcomposite.so.2 -unknown- xorg
./usr/X11R7/lib/libXcursor.so -unknown- xorg
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.27 src/distrib/sets/lists/xbase/shl.mi:1.28
--- src/distrib/sets/lists/xbase/shl.mi:1.27 Mon Apr 13 18:58:08 2009
+++ src/distrib/sets/lists/xbase/shl.mi Sun Apr 19 21:36:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.27 2009/04/13 18:58:08 snj Exp $
+# $NetBSD: shl.mi,v 1.28 2009/04/19 21:36:46 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -67,8 +67,8 @@
./usr/X11R7/lib/libXTrap.so.7.0 -unknown- xorg
./usr/X11R7/lib/libXau.so.7.0 -unknown- xorg
./usr/X11R7/lib/libXaw6.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXaw7.so.8.0 -unknown- xorg
-./usr/X11R7/lib/libXaw8.so.9.0 -unknown- xorg
+./usr/X11R7/lib/libXaw7.so.10.0 -unknown xorg
+./usr/X11R7/lib/libXaw8.so.9.0 -obsolete- obsolete
./usr/X11R7/lib/libXcomposite.so.2.0 -unknown- xorg
./usr/X11R7/lib/libXcursor.so.2.0 -unknown- xorg
./usr/X11R7/lib/libXdamage.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.85 src/distrib/sets/lists/xcomp/mi:1.86
--- src/distrib/sets/lists/xcomp/mi:1.85 Mon Apr 13 20:11:59 2009
+++ src/distrib/sets/lists/xcomp/mi Sun Apr 19 21:36:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.85 2009/04/13 20:11:59 snj Exp $
+# $NetBSD: mi,v 1.86 2009/04/19 21:36:46 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6019,9 +6019,9 @@
./usr/X11R7/lib/libXaw7.a -unknown- xorg
./usr/X11R7/lib/libXaw7_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXaw7_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXaw8.a -unknown- xorg
-./usr/X11R7/lib/libXaw8_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libXaw8_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libXaw8.a -obsolete- obsolete
+./usr/X11R7/lib/libXaw8_g.a -obsolete- obsolete
+./usr/X11R7/lib/libXaw8_p.a -obsolete- obsolete
./usr/X11R7/lib/libXaw_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXcomposite.a -unknown- xorg
./usr/X11R7/lib/libXcomposite_g.a -unknown- debuglib,xorg
@@ -6185,7 +6185,7 @@
./usr/X11R7/lib/pkgconfig/xau.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xaw6.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xaw7.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/xaw8.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xaw8.pc -obsolete- obsolete
./usr/X11R7/lib/pkgconfig/xbitmaps.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcmiscproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcomposite.pc -unknown- xorg
@@ -9219,7 +9219,7 @@
./usr/libdata/lint/llib-lXau.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXaw.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXaw7.ln -unknown- lint,xorg
-./usr/libdata/lint/llib-lXaw8.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lXaw8.ln -obsolete- obsolete
./usr/libdata/lint/llib-lXcomposite.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXcursor.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXcursor.ln -unknown- lint,xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.11 src/distrib/sets/lists/xcomp/shl.mi:1.12
--- src/distrib/sets/lists/xcomp/shl.mi:1.11 Tue Nov 11 16:13:50 2008
+++ src/distrib/sets/lists/xcomp/shl.mi Sun Apr 19 21:36:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.11 2008/11/11 16:13:50 cube Exp $
+# $NetBSD: shl.mi,v 1.12 2009/04/19 21:36:46 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -59,7 +59,7 @@
./usr/X11R7/lib/libXTrap_pic.a -unknown- xorg
./usr/X11R7/lib/libXau_pic.a -unknown- xorg
./usr/X11R7/lib/libXaw7_pic.a -unknown- xorg
-./usr/X11R7/lib/libXaw8_pic.a -unknown- xorg
+./usr/X11R7/lib/libXaw8_pic.a -obsolete- obsolete
./usr/X11R7/lib/libXcomposite_pic.a -unknown- xorg
./usr/X11R7/lib/libXcursor_pic.a -unknown- xorg
./usr/X11R7/lib/libXdamage_pic.a -unknown- xorg
Index: src/external/mit/xorg/bin/xmore/Makefile
diff -u src/external/mit/xorg/bin/xmore/Makefile:1.1.1.1 src/external/mit/xorg/bin/xmore/Makefile:1.2
--- src/external/mit/xorg/bin/xmore/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xmore/Makefile Sun Apr 19 21:36:47 2009
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/19 21:36:47 mrg Exp $
.include <bsd.own.mk>
PROG= xmore
APPDEFS= XMore.ad
-SRCS= xmore.c print.c printdialog.c
+SRCS= xmore.c
-CPPFLAGS+= -DXMORE -DUSE_XPRINT
+CPPFLAGS+= -DXMORE
-LDADD+= -lXprintUtil -lXp -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXp -lXext -lX11
-DPADD+= ${LIBXPRINTUTIL} ${LIBXP} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} \
+LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
+DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} \
${LIBICE} ${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.9 src/external/mit/xorg/lib/Makefile:1.10
--- src/external/mit/xorg/lib/Makefile:1.9 Sun Feb 15 19:00:21 2009
+++ src/external/mit/xorg/lib/Makefile Sun Apr 19 21:36:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/02/15 19:00:21 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2009/04/19 21:36:47 mrg Exp $
# build libraries for xorg
@@ -16,7 +16,7 @@
libXinerama libXmu libXmuu libXpm libXprintUtil libXrender \
libXres libXtst libXvMC libXv libXxf86dga libXxf86misc libxkbui \
.WAIT \
- libGLU libGLw libXaw6 libXaw7 libXaw libXcursor libXprintAppUtil \
+ libGLU libGLw libXaw6 libXaw libXcursor libXprintAppUtil \
libXrandr \
.WAIT \
libXft libglut
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.4 src/external/mit/xorg/lib/libXaw/Makefile:1.5
--- src/external/mit/xorg/lib/libXaw/Makefile:1.4 Fri Apr 3 16:21:08 2009
+++ src/external/mit/xorg/lib/libXaw/Makefile Sun Apr 19 21:36:47 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/04/03 16:21:08 perry Exp $
+# $NetBSD: Makefile,v 1.5 2009/04/19 21:36:47 mrg Exp $
.include <bsd.own.mk>
-LIB= Xaw8
+LIB= Xaw7
LIBOLD= Xaw
.if ${MKSTATICLIB} != "no"
@@ -22,7 +22,7 @@
AsciiText.c Box.c Command.c Converters.c Dialog.c \
DisplayList.c Form.c Grip.c Label.c List.c MenuButton.c \
MultiSrc.c MultiSink.c OS.c Paned.c Panner.c Pixmap.c \
- Porthole.c PrintShell.c Repeater.c Scrollbar.c Simple.c \
+ Porthole.c Repeater.c Scrollbar.c Simple.c \
SimpleMenu.c Sme.c SmeBSB.c SmeLine.c StripChart.c \
Text.c TextSink.c TextSrc.c TextAction.c TextPop.c \
TextTr.c Tip.c Toggle.c Tree.c Vendor.c Viewport.c \
@@ -49,22 +49,22 @@
INCSDIR=${X11INCDIR}/X11/Xaw
+
CPPFLAGS+= -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM
-CPPFLAGS+= -DPROJECT_ROOT=\"${X11ROOTDIR}\"
+CPPFLAGS+= -DPROJECT_ROOT=\"${X11ROOTDIR}\" -DXAW7
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xaw
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
LIBDPLIBS=\
Xmu ${.CURDIR}/../libXmu \
Xt ${.CURDIR}/../libXt \
- Xp ${.CURDIR}/../libXp \
SM ${.CURDIR}/../libSM \
ICE ${.CURDIR}/../libICE \
Xpm ${.CURDIR}/../libXpm \
Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
-PKGCONFIG= xaw8
+PKGCONFIG= xaw7
PKGDIST= ${LIBOLD}
.include <bsd.x11.mk>
Index: src/external/mit/xorg/lib/libXaw/shlib_version
diff -u src/external/mit/xorg/lib/libXaw/shlib_version:1.2 src/external/mit/xorg/lib/libXaw/shlib_version:1.3
--- src/external/mit/xorg/lib/libXaw/shlib_version:1.2 Sun Jan 11 03:10:11 2009
+++ src/external/mit/xorg/lib/libXaw/shlib_version Sun Apr 19 21:36:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
+# $NetBSD: shlib_version,v 1.3 2009/04/19 21:36:47 mrg Exp $
#
-major=9
+major=10
minor=0
