Remove -m argument from ldconfig calls, require the system to

have ${PREFIX}/lib in ld.so.conf instead. This ensures things
even work after a reboot.

9 files changed, 23 insertions, 23 deletions

diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 9114a45ba34..14844a03d2c 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -3,7 +3,7 @@
 # Date created:         30th November 1997
 # Whom:                 tron@lyssa.owl.de, soren@t.dk
 #
-# $NetBSD: Makefile,v 1.9 1998/02/02 08:11:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 1998/02/02 08:59:32 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/06/19 09:33:26 asami Exp
 #
 
@@ -21,7 +21,7 @@ post-extract:
 	@(cd ${WRKSRC};ln -s .. X11)
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 	${MKDIR} ${PREFIX}/share/doc/Xaw3d
 	${CP} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
 
diff --git a/x11/Xaw3d/pkg/PLIST b/x11/Xaw3d/pkg/PLIST
index f17359ed5d3..2e53972a2b9 100644
--- a/x11/Xaw3d/pkg/PLIST
+++ b/x11/Xaw3d/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/01/24 23:58:22 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/02/02 09:00:24 hubertf Exp $
 include/X11/Xaw3d/AllWidgets.h
 include/X11/Xaw3d/AsciiSink.h
 include/X11/Xaw3d/AsciiSinkP.h
@@ -76,8 +76,8 @@ include/X11/Xaw3d/XawImP.h
 include/X11/Xaw3d/XawInit.h
 lib/libXaw3d.a
 lib/libXaw3d.so.6.1
-@exec /sbin/ldconfig -m %B || /usr/bin/true
-@unexec /sbin/ldconfig -m %B || /usr/bin/true
+@exec /sbin/ldconfig || /usr/bin/true
+@unexec /sbin/ldconfig || /usr/bin/true
 share/doc/Xaw3d/README.XAW3D
 @dirrm share/doc/Xaw3d
 @dirrm include/X11/Xaw3d
diff --git a/x11/kdelibs/pkg/PLIST b/x11/kdelibs/pkg/PLIST
index 99990b6f6a8..e32e71aaf84 100644
--- a/x11/kdelibs/pkg/PLIST
+++ b/x11/kdelibs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/01/25 00:04:17 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/02/02 09:00:26 hubertf Exp $
 lib/libkdecore.so.0.11
 lib/libkdecore.la
 lib/libkdeui.so.0.10
@@ -11,8 +11,8 @@ lib/libkfm.so.0.1
 lib/libkfm.la
 lib/libmediatool.so.0.7
 lib/libmediatool.la
-@exec /sbin/ldconfig -m %B || /usr/bin/true
-@unexec /sbin/ldconfig -m %B || /usr/bin/true
+@exec /sbin/ldconfig || /usr/bin/true
+@unexec /sbin/ldconfig || /usr/bin/true
 include/kconfig.h
 include/kconfigdata.h
 include/ksimpleconfig.h
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 1aaee415345..1cd51a55c20 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -3,7 +3,7 @@
 # Date created:		December 10, 1996
 # Whom:			1wardd@airmail.net
 #
-# $NetBSD: Makefile,v 1.7 1998/02/02 08:11:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:35 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
@@ -54,6 +54,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/Mwm \
 		${PREFIX}/lib/X11/app-defaults/Mwm
 	/usr/bin/strip ${PREFIX}/lib/libXm.so.0.1 ${PREFIX}/lib/libMrm.so.0.1
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST
index 157d2eca4d0..9ec7162d19f 100644
--- a/x11/lesstif/pkg/PLIST
+++ b/x11/lesstif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1998/01/25 00:05:31 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/02/02 09:00:28 hubertf Exp $
 bin/mwm
 bin/mxmkmf
 bin/uil
@@ -136,8 +136,8 @@ lib/libMrm.so.0.1
 lib/libUil.so.0.1
 lib/libXm.so.0.1
 lib/libltc.a
-@exec ldconfig -m %D/lib || /usr/bin/true
-@unexec ldconfig -m %D/lib || /usr/bin/true
+@exec ldconfig || /usr/bin/true
+@unexec ldconfig || /usr/bin/true
 @dirrm lib/X11/mwm
 @dirrm lib/X11/lesstif
 @dirrm include/Xm
diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index bc481215e47..ba298612b73 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $NetBSD: Makefile,v 1.4 1998/02/02 08:11:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:38 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/10/30 05:15:19 jkh Exp
 #
 
@@ -102,7 +102,7 @@ post-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/qt-1.31/bin/moc ${QTDIR}/bin
 	${INSTALL_DATA} ${WRKDIR}/qt-1.31/lib/libqt.so.1.31 ${QTDIR}/lib
-	${LDCONFIG} -m ${QTDIR}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 	${MKDIR} ${QTDIR}/include/qt
 	${INSTALL_DATA} ${WRKDIR}/qt-1.31/include/* ${QTDIR}/include/qt
 	${INSTALL_MAN} ${WRKDIR}/qt-1.31/man/man1/* ${QTDIR}/man/man1
diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST
index 50ef1c0ea95..f4cc53d1479 100644
--- a/x11/qt/pkg/PLIST
+++ b/x11/qt/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 1998/01/25 00:10:12 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/02/02 09:00:29 hubertf Exp $
 lib/libqt.so.1.31
-@exec /sbin/ldconfig -m %B || /usr/bin/true
-@unexec /sbin/ldconfig -m %B || /usr/bin/true
+@exec /sbin/ldconfig || /usr/bin/true
+@unexec /sbin/ldconfig || /usr/bin/true
 man/man1/moc.1.gz
 man/man3/QApplication.3qt.gz
 man/man3/QArray.3qt.gz
diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index c98574d0c13..1402edf99c6 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $NetBSD: Makefile,v 1.8 1998/02/02 08:11:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/02/02 08:59:42 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp
 #
 
@@ -54,7 +54,7 @@ MANN=		bell.n bind.n bindtags.n bitmap.n button.n canvas.n \
 		tkerror.n tkvars.n tkwait.n toplevel.n winfo.n wm.n
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 test:
 	cd ${WRKSRC}; make test
diff --git a/x11/tk80/pkg/PLIST b/x11/tk80/pkg/PLIST
index 73eca565da8..0f29987d000 100644
--- a/x11/tk80/pkg/PLIST
+++ b/x11/tk80/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/01/25 00:16:48 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/02/02 09:00:30 hubertf Exp $
 bin/wish8.0
 include/tk8.0/tk.h
 include/tk8.0/unix/tkUnixDefault.h
@@ -245,8 +245,8 @@ lib/tk8.0/safetk.tcl
 lib/tk8.0/tkConfig.sh
 lib/libtk80.a
 lib/libtk80.so.1.0
-@exec /sbin/ldconfig -m %B || /usr/bin/true
-@unexec /sbin/ldconfig -m %B || /usr/bin/true
+@exec /sbin/ldconfig || /usr/bin/true
+@unexec /sbin/ldconfig || /usr/bin/true
 @dirrm lib/tk8.0/demos/images
 @dirrm lib/tk8.0/demos
 @dirrm lib/tk8.0/images