Module Name: src
Committed By: perry
Date: Fri Apr 3 16:21:08 UTC 2009
Modified Files:
src/distrib/sets/lists/xbase: shl.elf
src/external/mit/xorg/lib/libXaw: Makefile
src/external/mit/xorg/lib/libXaw6: Makefile
src/external/mit/xorg/lib/libXaw7: Makefile
Log Message:
Remove the creation of the following symlinks to nowhere:
/usr/X11R7/lib/libXaw.so.6
/usr/X11R7/lib/libXaw.so.7
/usr/X11R7/lib/libXaw.so.8
Note that there is still some use of the "LIBOLD" variables in the
Makefiles associated with PKG* variables that I don't understand.
Discussed with mrg and martin
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xbase/shl.elf
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXaw6/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXaw7/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/xbase/shl.elf
diff -u src/distrib/sets/lists/xbase/shl.elf:1.21 src/distrib/sets/lists/xbase/shl.elf:1.22
--- src/distrib/sets/lists/xbase/shl.elf:1.21 Sun Jan 11 23:14:53 2009
+++ src/distrib/sets/lists/xbase/shl.elf Fri Apr 3 16:21:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.21 2009/01/11 23:14:53 jnemeth Exp $
+# $NetBSD: shl.elf,v 1.22 2009/04/03 16:21:08 perry 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
@@ -132,9 +132,6 @@
./usr/X11R7/lib/libXau.so -unknown- xorg
./usr/X11R7/lib/libXau.so.7 -unknown- xorg
./usr/X11R7/lib/libXaw.so -unknown- xorg
-./usr/X11R7/lib/libXaw.so.6 -unknown- xorg
-./usr/X11R7/lib/libXaw.so.7 -unknown- xorg
-./usr/X11R7/lib/libXaw.so.8 -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
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.3 src/external/mit/xorg/lib/libXaw/Makefile:1.4
--- src/external/mit/xorg/lib/libXaw/Makefile:1.3 Sun Oct 12 20:20:49 2008
+++ src/external/mit/xorg/lib/libXaw/Makefile Fri Apr 3 16:21:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/12 20:20:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/03 16:21:08 perry Exp $
.include <bsd.own.mk>
@@ -15,7 +15,6 @@
.if ${MKPIC} != "no"
SYMLINKS+= lib${LIB}.so ${X11USRLIBDIR}/lib${LIBOLD}.so
-SYMLINKS+= lib${LIB}.so.8 ${X11USRLIBDIR}/lib${LIBOLD}.so.8
.endif
.PATH: ${X11SRCDIR.Xaw}/src
Index: src/external/mit/xorg/lib/libXaw6/Makefile
diff -u src/external/mit/xorg/lib/libXaw6/Makefile:1.3 src/external/mit/xorg/lib/libXaw6/Makefile:1.4
--- src/external/mit/xorg/lib/libXaw6/Makefile:1.3 Sun Oct 12 20:20:49 2008
+++ src/external/mit/xorg/lib/libXaw6/Makefile Fri Apr 3 16:21:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/12 20:20:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/03 16:21:08 perry Exp $
NOCHECKVER= yes # we want to install an older version ...
MKLINKLIB= no
@@ -8,10 +8,6 @@
LIB= Xaw6
LIBOLD= Xaw
-.if ${MKPIC} != "no"
-SYMLINKS+= lib${LIB}.so.6 ${X11USRLIBDIR}/lib${LIBOLD}.so.6
-.endif
-
.PATH: ${X11SRCDIR.Xaw}/src
SRCS= Actions.c AllWidgets.c AsciiSink.c AsciiSrc.c AsciiText.c \
Index: src/external/mit/xorg/lib/libXaw7/Makefile
diff -u src/external/mit/xorg/lib/libXaw7/Makefile:1.4 src/external/mit/xorg/lib/libXaw7/Makefile:1.5
--- src/external/mit/xorg/lib/libXaw7/Makefile:1.4 Wed Nov 5 19:50:06 2008
+++ src/external/mit/xorg/lib/libXaw7/Makefile Fri Apr 3 16:21:08 2009
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2008/11/05 19:50:06 cube Exp $
+# $NetBSD: Makefile,v 1.5 2009/04/03 16:21:08 perry Exp $
.include <bsd.own.mk>
LIB= Xaw7
LIBOLD= Xaw
-.if ${MKPIC} != "no"
-SYMLINKS+= lib${LIB}.so.7 ${X11USRLIBDIR}/lib${LIBOLD}.so.7
-.endif
-
.PATH: ${X11SRCDIR.Xaw}/src
SRCS= Actions.c AllWidgets.c AsciiSink.c AsciiSrc.c AsciiText.c \
