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.

16 files changed, 40 insertions, 40 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index efc8e7c0b03..d5934311420 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -3,7 +3,7 @@
 # Date created:         11th December 1997
 # Whom:                 tron
 #
-# $NetBSD: Makefile,v 1.9 1998/02/02 08:10:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 1998/02/02 08:59:13 hubertf Exp $
 #
 
 DISTNAME=	ImageMagick-4.0
@@ -43,6 +43,6 @@ post-extract:
 
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index c5ce2c24540..b47567bbda5 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/01/27 13:51:24 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/02/02 08:59:54 hubertf Exp $
 bin/xtp
 bin/display
 bin/montage
@@ -22,8 +22,8 @@ include/magick/plug-ins.h
 @dirrm include/magick
 lib/libMagick.a
 lib/libMagick.so.4.0.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
 man/cat1/display.0
 man/cat1/montage.0
 man/cat1/import.0
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 306d3fd6804..811b35a9188 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $NetBSD: Makefile,v 1.7 1998/02/02 08:10:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:14 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.19 1997/09/30 19:21:40 max Exp
 #
 
@@ -40,6 +40,6 @@ do-install:
 	${CP} -Rp ${WRKSRC}/demos ${PREFIX}/share/examples/Mesa
 	${CP} -Rp ${WRKSRC}/book ${PREFIX}/share/examples/Mesa
 	${CP} -Rp ${WRKSRC}/widgets-sgi ${PREFIX}/share/examples/Mesa
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/graphics/Mesa/pkg/PLIST b/graphics/Mesa/pkg/PLIST
index 97e92026154..b99895683ca 100644
--- a/graphics/Mesa/pkg/PLIST
+++ b/graphics/Mesa/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/01/24 05:19:32 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/02/02 08:59:56 hubertf Exp $
 include/GL/FooMesa.h
 include/GL/dosmesa.h
 include/GL/gl.h
@@ -30,8 +30,8 @@ lib/libMesaaux.so.2.4
 lib/libMesaaux_pic.a
 lib/libMesatk.so.2.4
 lib/libMesatk_pic.a
-@exec ldconfig -m %B || /usr/bin/true
-@unexec ldconfig -m %B || /usr/bin/true
+@exec ldconfig || /usr/bin/true
+@unexec ldconfig || /usr/bin/true
 share/examples/Mesa/book/Imakefile
 share/examples/Mesa/book/Makefile
 share/examples/Mesa/book/README
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index d59c3962d12..7afa2ea2e69 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		03 May 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:16 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp
 #
 
@@ -18,6 +18,6 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/giflib
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/giflib
 .endif
-	@${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	@${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/graphics/giflib/pkg/PLIST b/graphics/giflib/pkg/PLIST
index 82454bd1ae6..5018fbf7992 100644
--- a/graphics/giflib/pkg/PLIST
+++ b/graphics/giflib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/01/24 05:21:01 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/02/02 08:59:58 hubertf Exp $
 bin/gif2epsn
 bin/gif2ps
 bin/gif2rgb
@@ -33,8 +33,8 @@ include/giflib/gif_hash.h
 include/giflib/gif_lib.h
 lib/libgif.a
 lib/libgif.so.3.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
 share/doc/giflib/gif2bgi.html
 share/doc/giflib/gif2epsn.html
 share/doc/giflib/gif2herc.html
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 28824fd3ba3..0219747098d 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 November 1994
 # Whom:			smace
 #
-# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:17 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/17 15:12:43 max Exp
 #
 
@@ -20,6 +20,6 @@ INSTALL_TARGET= install install-lib
 MAN1=		cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/graphics/jpeg/pkg/PLIST b/graphics/jpeg/pkg/PLIST
index 32961cdec73..b49d25829c0 100644
--- a/graphics/jpeg/pkg/PLIST
+++ b/graphics/jpeg/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1998/01/24 05:22:39 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/02/02 08:59:59 hubertf Exp $
 bin/cjpeg
 bin/djpeg
 bin/jpegtran
@@ -14,6 +14,6 @@ include/jpeglib.h
 include/jmorecfg.h
 include/jerror.h
 lib/libjpeg.so.7.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
 lib/libjpeg.a
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index 299f4ac05b1..8bf01219aae 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -3,7 +3,7 @@
 # Date created:				07 December 1997
 # Whom:					tron@lyssa.owl.de
 #
-# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:19 hubertf Exp $
 
 DISTNAME=	mpeg_lib-1.2.1
 PKGNAME=	mpeg-1.2.1
@@ -24,6 +24,6 @@ post-configure:
 
 post-install:
 	(cd ${WRKSRC};make PREFIX=${PREFIX} includes)
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/graphics/mpeg-lib/pkg/PLIST b/graphics/mpeg-lib/pkg/PLIST
index d71e7da1378..0893880abcd 100644
--- a/graphics/mpeg-lib/pkg/PLIST
+++ b/graphics/mpeg-lib/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 1998/01/24 05:23:49 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/02/02 09:00:01 hubertf Exp $
 lib/libmpeg.a
 lib/libmpeg_p.a
 lib/libmpeg_pic.a
 lib/libmpeg.so.1.2
-@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/mpeg.h
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 024cb16bf31..4ae16b11673 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
-# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:21 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp
 #
 
@@ -18,6 +18,6 @@ MAINTAINER=     ache@FreeBSD.org
 MAKEFILE=       makefile
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/graphics/png/pkg/PLIST b/graphics/png/pkg/PLIST
index 7937600b4cc..2d7a996f2b9 100644
--- a/graphics/png/pkg/PLIST
+++ b/graphics/png/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 1998/01/24 05:27:36 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/02/02 09:00:06 hubertf Exp $
 include/png.h
 include/pngconf.h
 lib/libpng.a
 lib/libpng.so.0.96
-@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
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 2479e833116..2e73f18201f 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 November 1997
 # Whom:			tron
 #
-# $NetBSD: Makefile,v 1.7 1998/02/02 08:10:57 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:22 hubertf Exp $
 
 DISTNAME=	tiff-v3.4beta037
 PKGNAME=	tiff-3.4
@@ -52,6 +52,6 @@ CONFIGURE_ARGS+=	--noninteractive --site ${FILESDIR}
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/graphics/tiff/pkg/PLIST b/graphics/tiff/pkg/PLIST
index 9a042ea1ee3..80d148dd50c 100644
--- a/graphics/tiff/pkg/PLIST
+++ b/graphics/tiff/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/01/24 05:29:27 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/02/02 09:00:11 hubertf Exp $
 bin/fax2tiff
 bin/fax2ps
 bin/gif2tiff
@@ -18,8 +18,8 @@ bin/tiffmedian
 bin/tiffsplit
 lib/libtiff.a
 lib/libtiff.so.3.4
-@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/tiff.h
 include/tiffio.h
 man/man1/fax2ps.1
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 6c5ac8e8203..9e6c58010ab 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 September 1994
 # Whom:			jkh
 #
-# $NetBSD: Makefile,v 1.6 1998/02/02 08:10:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/02/02 08:59:24 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/17 15:12:45 max Exp
 #
 
@@ -18,6 +18,6 @@ USE_IMAKE=	yes
 CAT1= 		sxpm.0
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib || ${TRUE}
+	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/graphics/xpm/pkg/PLIST b/graphics/xpm/pkg/PLIST
index f2a986a7736..e7824c4a6b9 100644
--- a/graphics/xpm/pkg/PLIST
+++ b/graphics/xpm/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 1998/01/24 05:30:47 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/02/02 09:00:14 hubertf Exp $
 bin/sxpm
 lib/libXpm.a
 lib/libXpm.so.4.10
-@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/X11/xpm.h
 man/cat1/sxpm.0.gz