Third round of INSTALL_SHLIBS=yes fixes.

24 files changed, 12 insertions, 36 deletions

diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 76f942a88ad3..c9fea50291ac 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ycheng@sinica.edu.tw
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist
index 75b76a7939e5..f521b53d7584 100644
--- a/devel/popt/pkg-plist
+++ b/devel/popt/pkg-plist
@@ -2,7 +2,5 @@ include/popt.h
 lib/libpopt.a
 lib/libpopt.so
 lib/libpopt.so.0
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/locale/sk/LC_MESSAGES/popt.mo
 share/locale/ro/LC_MESSAGES/popt.mo
diff --git a/devel/pth-devel/Makefile b/devel/pth-devel/Makefile
index e1bf695db80b..7210fc0f4814 100644
--- a/devel/pth-devel/Makefile
+++ b/devel/pth-devel/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	rse@engelschall.com
 NO_LATEST_LINK=	yes
 NO_CDROM=	yes
 
+INSTALL_SHLIBS=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-pthread \
@@ -32,7 +33,4 @@ post-build:
 test:
 	@cd ${WRKSRC} && ${MAKE} test
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/devel/pth-devel/pkg-plist b/devel/pth-devel/pkg-plist
index 806733998016..e0245d424b5b 100644
--- a/devel/pth-devel/pkg-plist
+++ b/devel/pth-devel/pkg-plist
@@ -10,6 +10,4 @@ lib/libpthread.a
 lib/libpthread.la
 lib/libpthread.so
 lib/libpthread.so.14
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/pth.m4
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 8c7e6bb8cb3a..e48d2f5dc81b 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	pth
 
 MAINTAINER=	rse@engelschall.com
 
+INSTALL_SHLIBS=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-pthread \
@@ -30,7 +31,4 @@ post-build:
 test:
 	@cd ${WRKSRC} && ${MAKE} test
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/devel/pth/pkg-plist b/devel/pth/pkg-plist
index c8b3b060bafc..d8e5f47b8d1b 100644
--- a/devel/pth/pkg-plist
+++ b/devel/pth/pkg-plist
@@ -10,6 +10,4 @@ lib/libpthread.a
 lib/libpthread.la
 lib/libpthread.so
 lib/libpthread.so.13
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/pth.m4
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 173f52c7ae2a..e098c3e52764 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -16,5 +16,6 @@ LIB_DEPENDS=	lwp.1:${PORTSDIR}/devel/lwp
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rpc2/pkg-plist b/devel/rpc2/pkg-plist
index 87c58a470a16..0043d6610198 100644
--- a/devel/rpc2/pkg-plist
+++ b/devel/rpc2/pkg-plist
@@ -17,6 +17,4 @@ lib/librpc2.so.2
 lib/libse.a
 lib/libse.so
 lib/libse.so.1
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm include/rpc2
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 267511f230ea..8bcf7c26c3ca 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -16,5 +16,6 @@ LIB_DEPENDS=	lwp.1:${PORTSDIR}/devel/lwp
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rvm/pkg-plist b/devel/rvm/pkg-plist
index dda7a80c3dcd..82d27708d5da 100644
--- a/devel/rvm/pkg-plist
+++ b/devel/rvm/pkg-plist
@@ -17,8 +17,6 @@ lib/librvmlwp.so.1
 lib/libseg.a
 lib/libseg.so
 lib/libseg.so.1
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 sbin/rdsinit
 sbin/rvmutl
 @dirrm include/rvm
diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile
index d8ff4fa26d72..bd210bb1cfa7 100644
--- a/devel/sdl-devel/Makefile
+++ b/devel/sdl-devel/Makefile
@@ -21,6 +21,7 @@ BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=		yes
 USE_XLIB=		yes
+INSTALL_SHLIBS=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV=		NASM="${LOCALBASE}/bin/nasm" \
diff --git a/devel/sdl-devel/pkg-plist b/devel/sdl-devel/pkg-plist
index 36bdbce65ab5..eafe56b1e3fe 100644
--- a/devel/sdl-devel/pkg-plist
+++ b/devel/sdl-devel/pkg-plist
@@ -29,8 +29,6 @@ lib/libSDL-1.1.a
 lib/libSDL-1.1.la
 lib/libSDL-1.1.so
 lib/libSDLmain-1.1.a
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 share/aclocal/sdl11.m4
 share/doc/SDL11/BUGS
 share/doc/SDL11/COPYING
diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile
index 7a8c80114be6..d712818217f1 100644
--- a/devel/sdl/Makefile
+++ b/devel/sdl/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=		yes
 USE_XLIB=		yes
+INSTALL_SHLIBS=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		NASM="${LOCALBASE}/bin/nasm" \
 			LOCALBASE="${LOCALBASE}"
diff --git a/devel/sdl/pkg-plist b/devel/sdl/pkg-plist
index eab0e6eff881..cdd117a9955d 100644
--- a/devel/sdl/pkg-plist
+++ b/devel/sdl/pkg-plist
@@ -29,8 +29,6 @@ lib/libSDL.a
 lib/libSDL.la
 lib/libSDL.so
 lib/libSDLmain.a
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 share/aclocal/sdl.m4
 share/doc/SDL/BUGS
 share/doc/SDL/COPYING
diff --git a/devel/sdl10/Makefile b/devel/sdl10/Makefile
index 7a8c80114be6..d712818217f1 100644
--- a/devel/sdl10/Makefile
+++ b/devel/sdl10/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=		yes
 USE_XLIB=		yes
+INSTALL_SHLIBS=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		NASM="${LOCALBASE}/bin/nasm" \
 			LOCALBASE="${LOCALBASE}"
diff --git a/devel/sdl10/pkg-plist b/devel/sdl10/pkg-plist
index eab0e6eff881..cdd117a9955d 100644
--- a/devel/sdl10/pkg-plist
+++ b/devel/sdl10/pkg-plist
@@ -29,8 +29,6 @@ lib/libSDL.a
 lib/libSDL.la
 lib/libSDL.so
 lib/libSDLmain.a
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 share/aclocal/sdl.m4
 share/doc/SDL/BUGS
 share/doc/SDL/COPYING
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index d8ff4fa26d72..bd210bb1cfa7 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -21,6 +21,7 @@ BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=		yes
 USE_XLIB=		yes
+INSTALL_SHLIBS=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV=		NASM="${LOCALBASE}/bin/nasm" \
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index 36bdbce65ab5..eafe56b1e3fe 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -29,8 +29,6 @@ lib/libSDL-1.1.a
 lib/libSDL-1.1.la
 lib/libSDL-1.1.so
 lib/libSDLmain-1.1.a
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 share/aclocal/sdl11.m4
 share/doc/SDL11/BUGS
 share/doc/SDL11/COPYING
diff --git a/devel/sip/Makefile b/devel/sip/Makefile
index a290c08869a7..7489b037a7f4 100644
--- a/devel/sip/Makefile
+++ b/devel/sip/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	adsharma@home.com
 BUILD_DEPENDS=	${LOCALBASE}/include/python1.5/Python.h:${PORTSDIR}/lang/python
 
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 USE_QT=		yes
 CONFIGURE_ARGS=	--enable-qt --with-qt-includes=${X11BASE}/include/X11/qt
 GNU_CONFIGURE=	yes
diff --git a/devel/sip/pkg-plist b/devel/sip/pkg-plist
index 17abf6aba7ad..9dbec3e2c223 100644
--- a/devel/sip/pkg-plist
+++ b/devel/sip/pkg-plist
@@ -5,5 +5,3 @@ lib/libsip.a
 include/sip/sip.h
 include/sip/sipQt.h
 @dirrm include/sip
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
diff --git a/devel/str/Makefile b/devel/str/Makefile
index 45d67cc3f2cf..1a9c0f46d5da 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.engelschall.com/sw/str/ \
 MAINTAINER=	rse@engelschall.com
 
 HAS_CONFIGURE=	yes
+INSTALL_SHLIBS=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 MAN1=		str-config.1
@@ -25,7 +26,4 @@ post-build:
 test:
 	@cd ${WRKSRC} && ${MAKE} test
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/devel/str/pkg-plist b/devel/str/pkg-plist
index 97cf5caa3636..4f31810516d8 100644
--- a/devel/str/pkg-plist
+++ b/devel/str/pkg-plist
@@ -4,5 +4,3 @@ lib/libstr.a
 lib/libstr.la
 lib/libstr.so
 lib/libstr.so.9
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 6850b2e15f92..2b47dd322f87 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -19,13 +19,11 @@ LIB_DEPENDS=	ffi.2:${PORTSDIR}/devel/libffi \
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
 		--with-tclincludedir=${PREFIX}/include/tcl8.2 \
 		--with-tkincludedir=${PREFIX}/include/tk8.2 \
 		--with-tclscriptdir=${PREFIX}/lib/tcl8.2 \
 		--with-tkscriptdir=${PREFIX}/lib/tk8.2
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/devel/swarm/pkg-plist b/devel/swarm/pkg-plist
index 55dcfc2078da..a4d289ee4a61 100644
--- a/devel/swarm/pkg-plist
+++ b/devel/swarm/pkg-plist
@@ -232,8 +232,6 @@ lib/libtclobjc.so.1
 lib/libtkobjc.a
 lib/libtkobjc.so
 lib/libtkobjc.so.4
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm etc/swarm
 @dirrm include/activity
 @dirrm include/analysis