Second round of INSTALL_SHLIBS=yes fixes.

10 files changed, 7 insertions, 17 deletions

diff --git a/graphics/Cgraph/Makefile b/graphics/Cgraph/Makefile
index 04f384e9d941..b0e7990e4a9f 100644
--- a/graphics/Cgraph/Makefile
+++ b/graphics/Cgraph/Makefile
@@ -15,6 +15,8 @@ MAINTAINER=	tobez@plab.ku.dk
 
 WRKSRC=		${WRKDIR}/Cgraph/source
 
+INSTALL_SHLIBS=	yes
+
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
@@ -31,6 +33,5 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/../examples/loglog/TFopt-lrLog.c ${PREFIX}/share/examples/cgraph
 	@${INSTALL_DATA} ${WRKSRC}/../examples/loglog/TFampspect.dat ${PREFIX}/share/examples/cgraph
 .endif
-	@${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/Cgraph/pkg-plist b/graphics/Cgraph/pkg-plist
index 4dcb5e35422e..57b6b486e93c 100644
--- a/graphics/Cgraph/pkg-plist
+++ b/graphics/Cgraph/pkg-plist
@@ -3,8 +3,6 @@ lib/libcgraph.a
 lib/libcgraph_p.a
 lib/libcgraph.so
 lib/libcgraph.so.2
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 share/doc/cgraph/cgraph.ps
 share/examples/cgraph/CGminimal.c
 share/examples/cgraph/dashlist.c
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index b1e597711681..dceed4e34c20 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.3:${PORTSDIR}/graphics/png
 
 USE_X_PREFIX=	yes
+INSTALL_SHLIBS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -46,6 +47,5 @@ post-install:
 	find ${PREFIX}/share/doc/EZ | xargs ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 	find ${PREFIX}/share/doc/EZ -type f | xargs ${CHMOD} ${SHAREMODE}
 .endif
-	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.post.mk>
diff --git a/graphics/EZWGL/pkg-plist b/graphics/EZWGL/pkg-plist
index e63cacb2447c..d36c57e138bc 100644
--- a/graphics/EZWGL/pkg-plist
+++ b/graphics/EZWGL/pkg-plist
@@ -2,8 +2,6 @@ include/EZ.h
 lib/libEZ.a
 lib/libEZ.so
 lib/libEZ.so.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 share/doc/EZ/html/applications.html
 share/doc/EZ/html/documentation.html
 share/doc/EZ/html/download.html
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index b97016a2e666..6a2a0cde4cfd 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES=	http://tzo.linux.tucows.com/files/x11/dev/ \
 MAINTAINER=	will@FreeBSD.org
 
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 USE_GMAKE=	yes
 
 post-install:
@@ -31,6 +32,5 @@ post-install:
 .endfor
 	@ ${INSTALL_DATA} ${WRKSRC}/docs/api/sgml/api.sgml ${PREFIX}/share/doc/Hermes/API
 .endif
-	@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/Hermes/pkg-plist b/graphics/Hermes/pkg-plist
index 3121aa4706a5..2f6fdc5e4817 100644
--- a/graphics/Hermes/pkg-plist
+++ b/graphics/Hermes/pkg-plist
@@ -10,8 +10,6 @@ include/Hermes/Types.h
 lib/libHermes.a
 lib/libHermes.so
 lib/libHermes.so.1
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/doc/Hermes/AUTHORS
 share/doc/Hermes/ChangeLog
 share/doc/Hermes/COPYING
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 16ba61a29dae..107400474681 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -39,7 +39,8 @@ MAN4=		miff.4
 MAN5=		quantize.5
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-USE_AUTOCONF=	YES
+USE_AUTOCONF=	yes
+INSTALL_SHLIBS=	yes
 
 CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --with-perl=${PERL5} \
 		--enable-16bit-pixel
@@ -55,7 +56,4 @@ CONFIGURE_ENV=	LDFLAGS="$(LDFLAGS) -L${WRKSRC}/magick/.libs"
 pre-configure:
 	${RM} -f ${WRKSRC}/config.cache
 
-post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index ac6965731ddc..7258ea040273 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -30,8 +30,6 @@ lib/libMagick.a
 lib/libMagick.la
 lib/libMagick.so
 lib/libMagick.so.5
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 41c6bd9a38c8..72387ecb42cf 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -14,6 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/aalib/pkg-plist b/graphics/aalib/pkg-plist
index 05b15222ae18..270b851ec984 100644
--- a/graphics/aalib/pkg-plist
+++ b/graphics/aalib/pkg-plist
@@ -6,8 +6,6 @@ include/aalib.h
 lib/libaa.a
 lib/libaa.so
 lib/libaa.so.1.3
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec install-info --delete %D/info/aalib.info %D/info/dir
 info/aalib.info
 @exec install-info %D/info/aalib.info %D/info/dir