Second round of INSTALL_SHLIBS=yes fixes.

22 files changed, 21 insertions, 36 deletions

diff --git a/devel/ORBacus/Makefile b/devel/ORBacus/Makefile
index 542952ed343c..857d85b4fca6 100644
--- a/devel/ORBacus/Makefile
+++ b/devel/ORBacus/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	OB-${PORTVERSION}
 MAINTAINER=	ejc@bazzle.com
 
 USE_XLIB=	yes
+INSTALL_SHLIBS=	yes
 HAS_CONFIGURE=	yes
 USE_NEWGCC=	yes
 CONFIGURE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
@@ -22,7 +23,6 @@ MLINKS=		idl.1 hidl.1	- irdel.1	- irfeed.1 \
 		- irgen.1	- irserv.1	- jidl.1
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
 	${MKDIR} ${PREFIX}/share/doc/ORBacus
 	${INSTALL_DATA} ${WRKSRC}/ob/LICENSE ${PREFIX}/share/doc/ORBacus
 
diff --git a/devel/ORBacus/pkg-plist b/devel/ORBacus/pkg-plist
index 0624aee863fb..9e674ceadb4e 100644
--- a/devel/ORBacus/pkg-plist
+++ b/devel/ORBacus/pkg-plist
@@ -76,6 +76,3 @@ lib/libOBX11.a
 share/doc/ORBacus/LICENSE
 @dirrm share/doc/ORBacus
 @dirrm include/OB
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
-
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 5cc80bbf3292..ab24eb1e7e19 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -20,6 +20,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 LIBTOOLFILES=	configure libIDL/configure popt/configure
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 CONFIGURE_ARGS= --disable-indent
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index 47794fbd30d0..49e2b21bf886 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -90,8 +90,6 @@ lib/libORBitutil.so
 lib/libORBitutil.so.2
 lib/libname-server.a
 lib/liborbit-c-backend.a
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
 @dirrm include/IIOP
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 5cc80bbf3292..ab24eb1e7e19 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -20,6 +20,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 LIBTOOLFILES=	configure libIDL/configure popt/configure
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 CONFIGURE_ARGS= --disable-indent
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index 47794fbd30d0..49e2b21bf886 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -90,8 +90,6 @@ lib/libORBitutil.so
 lib/libORBitutil.so.2
 lib/libname-server.a
 lib/liborbit-c-backend.a
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
 @dirrm include/IIOP
diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index b805c6b27dcb..9e3dd091f75c 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -20,9 +20,10 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
-USE_PERL5=	YES
+USE_PERL5=	yes
+INSTALL_SHLIBS=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
-USE_LIBTOOL=	YES
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
diff --git a/devel/SWIG-devel/pkg-plist b/devel/SWIG-devel/pkg-plist
index 7d4c1458e78f..687e929683ee 100644
--- a/devel/SWIG-devel/pkg-plist
+++ b/devel/SWIG-devel/pkg-plist
@@ -52,8 +52,6 @@ lib/libswigpy.so
 lib/libswigpl.la
 lib/libswigpy.la
 lib/libswigtcl8.la
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 @dirrm lib/swig%%VER%%/guile
 @dirrm lib/swig%%VER%%/java
 @dirrm lib/swig%%VER%%/python
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index b805c6b27dcb..9e3dd091f75c 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -20,9 +20,10 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
-USE_PERL5=	YES
+USE_PERL5=	yes
+INSTALL_SHLIBS=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
-USE_LIBTOOL=	YES
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
diff --git a/devel/SWIG/pkg-plist b/devel/SWIG/pkg-plist
index 7d4c1458e78f..687e929683ee 100644
--- a/devel/SWIG/pkg-plist
+++ b/devel/SWIG/pkg-plist
@@ -52,8 +52,6 @@ lib/libswigpy.so
 lib/libswigpl.la
 lib/libswigpy.la
 lib/libswigtcl8.la
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 @dirrm lib/swig%%VER%%/guile
 @dirrm lib/swig%%VER%%/java
 @dirrm lib/swig%%VER%%/python
diff --git a/devel/amulet/Makefile b/devel/amulet/Makefile
index c54d787fbaa8..e50091eef254 100644
--- a/devel/amulet/Makefile
+++ b/devel/amulet/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	bovynf@awe.be
 
 USE_X_PREFIX=	yes
+INSTALL_SHLIBS=	yes
 WRKSRC=		$(WRKDIR)/amulet
 MAKE_ENV=	AMULET_DIR=$(WRKSRC) AMULET_VARS_FILE=Makefile.vars.gcc.FreeBSD
 
@@ -84,7 +85,6 @@ do-install:
 	$(INSTALL_PROGRAM) $(WRKSRC)/lib/libamulet-release.so.$(SO_VERSION) $(PREFIX)/lib
 	$(LN) -sf libamulet-release.so.$(SO_VERSION) $(PREFIX)/lib/libamulet-release.so
 	$(INSTALL_DATA)    $(WRKSRC)/lib/libamulet-release.a $(PREFIX)/lib
-	$(SETENV) OBJFORMAT=$(PORTOBJFORMAT) $(LDCONFIG) -m $(PREFIX)/lib
 	$(INSTALL_PROGRAM) $(WRKSRC)/bin/gilt $(PREFIX)/bin
 	$(INSTALL_PROGRAM) $(WRKSRC)/bin/agate $(PREFIX)/bin
 	${MKDIR} $(PREFIX)/include/amulet
diff --git a/devel/amulet/pkg-plist b/devel/amulet/pkg-plist
index 4ac4f443bb1f..450c5b765749 100644
--- a/devel/amulet/pkg-plist
+++ b/devel/amulet/pkg-plist
@@ -5,8 +5,6 @@ lib/libamulet.so.3
 lib/libamulet-release.so
 lib/libamulet-release.so.3
 lib/libamulet-release.a
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R %B
 include/am_inc.h
 include/amulet.h
 include/amulet/am_io.h
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index b9b9b461ce22..e1577fcda5fb 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -25,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+INSTALL_SHLIBS=	yes
 LIBTOOLFILES=	configure libefs/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 29e1c747a8ce..374cf04e43d9 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -76,8 +76,6 @@ lib/libefs.so
 lib/libefs.so.0
 lib/libstorage_efs.so
 lib/libstorage_fs.so
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/bonobo/html/bonobo-api.sgml
 share/gnome/bonobo/html/bonobo-decl.txt
 share/gnome/bonobo/html/bonobo-sections.txt
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index fcbcffc4c732..08b818427866 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	obrien@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 GNU_CONFIGURE=	yes
+INSTALL_SHLIBS=	yes
 ALL_TARGET=	default
 
 MAN3=	cdk_alphalist.3 cdk_binding.3 cdk_buttonbox.3 cdk_calendar.3 cdk_cdk.3 \
@@ -50,6 +51,5 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/cdk
 .endfor
 .endif
-	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/cdk/pkg-plist b/devel/cdk/pkg-plist
index 654a407acfb2..d454c4990c1f 100644
--- a/devel/cdk/pkg-plist
+++ b/devel/cdk/pkg-plist
@@ -29,8 +29,6 @@ include/cdk/viewer.h
 lib/libcdk.a
 lib/libcdk.so
 lib/libcdk.so.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 share/doc/cdk/BUGS
 share/doc/cdk/EXPANDING
 share/doc/cdk/INSTALL
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index b805c6b27dcb..9e3dd091f75c 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -20,9 +20,10 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
-USE_PERL5=	YES
+USE_PERL5=	yes
+INSTALL_SHLIBS=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
-USE_LIBTOOL=	YES
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
diff --git a/devel/swig11/pkg-plist b/devel/swig11/pkg-plist
index 7d4c1458e78f..687e929683ee 100644
--- a/devel/swig11/pkg-plist
+++ b/devel/swig11/pkg-plist
@@ -52,8 +52,6 @@ lib/libswigpy.so
 lib/libswigpl.la
 lib/libswigpy.la
 lib/libswigtcl8.la
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 @dirrm lib/swig%%VER%%/guile
 @dirrm lib/swig%%VER%%/java
 @dirrm lib/swig%%VER%%/python
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index b805c6b27dcb..9e3dd091f75c 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -20,9 +20,10 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
-USE_PERL5=	YES
+USE_PERL5=	yes
+INSTALL_SHLIBS=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
-USE_LIBTOOL=	YES
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
diff --git a/devel/swig13/pkg-plist b/devel/swig13/pkg-plist
index 7d4c1458e78f..687e929683ee 100644
--- a/devel/swig13/pkg-plist
+++ b/devel/swig13/pkg-plist
@@ -52,8 +52,6 @@ lib/libswigpy.so
 lib/libswigpl.la
 lib/libswigpy.la
 lib/libswigtcl8.la
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 @dirrm lib/swig%%VER%%/guile
 @dirrm lib/swig%%VER%%/java
 @dirrm lib/swig%%VER%%/python
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index b805c6b27dcb..9e3dd091f75c 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -20,9 +20,10 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
-USE_PERL5=	YES
+USE_PERL5=	yes
+INSTALL_SHLIBS=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
-USE_LIBTOOL=	YES
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
diff --git a/devel/swig20/pkg-plist b/devel/swig20/pkg-plist
index 7d4c1458e78f..687e929683ee 100644
--- a/devel/swig20/pkg-plist
+++ b/devel/swig20/pkg-plist
@@ -52,8 +52,6 @@ lib/libswigpy.so
 lib/libswigpl.la
 lib/libswigpy.la
 lib/libswigtcl8.la
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 @dirrm lib/swig%%VER%%/guile
 @dirrm lib/swig%%VER%%/java
 @dirrm lib/swig%%VER%%/python