Fourth round of INSTALLS_SHLIBS conversion.

14 files changed, 7 insertions, 18 deletions

diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 6017e7a7fe64..77888573d2f2 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	audiofile-${PORTVERSION}
 MAINTAINER=	vanilla@FreeBSD.org
 
 USE_LIBTOOL=	yes
+INSTALLS_SHLIBS=	yes
 
 MAKE_ARGS=	"-E CFLAGS"
 
diff --git a/audio/libaudiofile/pkg-plist b/audio/libaudiofile/pkg-plist
index 18398657818f..308ca0a7a9f0 100644
--- a/audio/libaudiofile/pkg-plist
+++ b/audio/libaudiofile/pkg-plist
@@ -7,6 +7,4 @@ include/aupvlist.h
 lib/libaudiofile.a
 lib/libaudiofile.so
 lib/libaudiofile.so.0
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/audiofile.m4
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 82b18f13f52e..199bef75dd45 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -13,5 +13,6 @@ MASTER_SITES=	ftp://cdcd.undergrid.net/libcdaudio/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
+INSTALLS_SHLIBS=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libcdaudio/pkg-plist b/audio/libcdaudio/pkg-plist
index b9d755fb7c3a..14661e42e689 100644
--- a/audio/libcdaudio/pkg-plist
+++ b/audio/libcdaudio/pkg-plist
@@ -3,6 +3,4 @@ include/cdaudio.h
 lib/libcdaudio.a
 lib/libcdaudio.so
 lib/libcdaudio.so.1
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/libcdaudio.m4
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index eed7736bfc14..1af45f3bae6b 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	mharo@FreeBSD.org
 LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound
 
 USE_LIBTOOL=	yes
+INSTALLS_SHLIBS=	yes
 USE_GMAKE=	yes
 
 MAN1=	libmikmod-config.1
diff --git a/audio/libmikmod/pkg-plist b/audio/libmikmod/pkg-plist
index 5e185b9dd70b..66c4f48bd013 100644
--- a/audio/libmikmod/pkg-plist
+++ b/audio/libmikmod/pkg-plist
@@ -7,5 +7,3 @@ lib/libmikmod.so.2
 info/mikmod.info
 @exec install-info %D/info/mikmod.info %D/info/dir
 share/aclocal/libmikmod.m4
-@unexec /sbin/ldconfig -R
-@exec /sbin/ldconfig -m %B
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index c42accd288d1..7719796eb846 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://developer.icecast.org/libshout/releases/
 MAINTAINER=	zach@pabst.bendnet.com
 
 GNU_CONFIGURE=	yes
+INSTALLS_SHLIBS=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/audio/libshout/pkg-plist b/audio/libshout/pkg-plist
index 5c1b45b0a016..0111fd02935a 100644
--- a/audio/libshout/pkg-plist
+++ b/audio/libshout/pkg-plist
@@ -2,8 +2,6 @@ lib/libshout.a
 lib/libshout.la
 lib/libshout.so
 lib/libshout.so.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 include/shout/shout.h
 @dirrm include/shout
 share/doc/libshout-%%PORTVERSION%%/example.html
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index c42accd288d1..7719796eb846 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://developer.icecast.org/libshout/releases/
 MAINTAINER=	zach@pabst.bendnet.com
 
 GNU_CONFIGURE=	yes
+INSTALLS_SHLIBS=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist
index 5c1b45b0a016..0111fd02935a 100644
--- a/audio/libshout2/pkg-plist
+++ b/audio/libshout2/pkg-plist
@@ -2,8 +2,6 @@ lib/libshout.a
 lib/libshout.la
 lib/libshout.so
 lib/libshout.so.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 include/shout/shout.h
 @dirrm include/shout
 share/doc/libshout-%%PORTVERSION%%/example.html
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index eee4d4cb716e..873c32dfbebf 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -16,13 +16,11 @@ MAINTAINER=	jim@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/libworkman
 USE_IMAKE=	yes
+INSTALLS_SHLIBS=	yes
 
 post-patch:
 	@${CP} ${WRKSRC}/Config ${WRKSRC}/Config.orig;
 	@${SED} -e 's^/usr/local/^${PREFIX}/^g' \
 		${WRKSRC}/Config.orig > ${WRKSRC}/Config
 
-post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/audio/libworkman/pkg-plist b/audio/libworkman/pkg-plist
index f262f7ef6330..9522b8b9da82 100644
--- a/audio/libworkman/pkg-plist
+++ b/audio/libworkman/pkg-plist
@@ -1,7 +1,5 @@
 lib/libworkman.so
 lib/libworkman.so.1
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/workman/wm_cdda.h
 include/workman/wm_cddb.h
 include/workman/wm_cdinfo.h
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 3d20017064ed..b0faddaaf86f 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
+INSTALLS_SHLIBS=	yes
 ALL_TARGET=	World
 # no need to "xmkmf -a" and create the Makefiles twice -- see above
 XMKMF=		xmkmf
@@ -74,7 +75,6 @@ post-patch:
 		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/audio/nas/pkg-plist b/audio/nas/pkg-plist
index 519f849269e7..c82c66600704 100644
--- a/audio/nas/pkg-plist
+++ b/audio/nas/pkg-plist
@@ -42,6 +42,4 @@ lib/X11/AuErrorDB
 lib/libaudio.a
 lib/libaudio.so
 lib/libaudio.so.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 @dirrm include/audio