Final round of the INSTALLS_SHLIBS=yes conversion. Few remaining ports with

ldconfig in PLIST need personal consideration.

8 files changed, 4 insertions, 10 deletions

diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 0e3ff5811936..9ffff2f391d7 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/cim/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
+INSTALLS_SHLIBS=	yes
 MAN1=		cim.1
 
 .include <bsd.port.mk>
diff --git a/lang/cim/pkg-plist b/lang/cim/pkg-plist
index fc8d59c69ef4..1a6ef410e3a9 100644
--- a/lang/cim/pkg-plist
+++ b/lang/cim/pkg-plist
@@ -7,8 +7,6 @@ lib/libcim-atr.a
 lib/libcim.a
 lib/libcim.so
 lib/libcim.so.3
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @unexec install-info --delete %D/info/cim.info %D/info/dir
 info/cim.info
 @exec install-info %D/info/cim.info %D/info/dir
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index fe79aea4f244..ed4ec0488326 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS?=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/expect-5.31
+INSTALLS_SHLIBS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?= --enable-shared \
 		--with-tclconfig=${PREFIX}/lib/tcl8.2 \
@@ -30,6 +31,5 @@ MAN3=		libexpect.3
 
 post-install:
 	${LN} -sf libexpect531.so.1 ${PREFIX}/lib/libexpect531.so
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/lang/expect/pkg-plist b/lang/expect/pkg-plist
index 3a2ab17467a8..3d10400022e6 100644
--- a/lang/expect/pkg-plist
+++ b/lang/expect/pkg-plist
@@ -29,6 +29,4 @@ lib/expect5.31/libexpect531.a
 lib/libexpect531.a
 lib/libexpect531.so
 lib/libexpect531.so.1
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm lib/expect5.31
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 2da3e4fc6778..a5910d7490c4 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	guile
 MAINTAINER=	jseger@FreeBSD.org
 
 USE_LIBTOOL=	yes
+INSTALLS_SHLIBS=	yes
 LIBTOOLFILES=	configure guile-readline/configure
 CONFIGURE_ARGS=	--with-threads
 
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index 3aa34aed8379..89aa7f7d6d65 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -99,8 +99,6 @@ lib/libguilereadline.so.0
 lib/libqthreads.a
 lib/libqthreads.so
 lib/libqthreads.so.0
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/guile.m4
 share/aclocal/qthreads.m4
 share/guile/%%GUILE_VER%%/ice-9/and-let*.scm
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 61578bafee3f..2b1430da430b 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	dmlb@ragnet.demon.co.uk
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 
 WRKSRC=		${WRKDIR}/itcl3.0.1/itcl/unix
+INSTALLS_SHLIBS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} ITCL_LIB_FILE=${ITCL_LIB_FILE}
@@ -48,7 +49,6 @@ pre-build:
 post-install:
 	${LN} -sf ${PREFIX}/bin/itclsh3.0 ${PREFIX}/bin/itclsh
 	${LN} -sf ${ITCL_LIB_FILE} ${PREFIX}/lib/${ITCL_LIB}
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
diff --git a/lang/itcl/pkg-plist b/lang/itcl/pkg-plist
index c8d8f754cd66..a5bfa485435e 100644
--- a/lang/itcl/pkg-plist
+++ b/lang/itcl/pkg-plist
@@ -6,8 +6,6 @@ include/itcl3.0/itcl.h
 lib/libitcl30.so.1
 lib/libitcl30.so
 lib/libitcl30.a
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/itcl3.0/itclConfig.sh
 lib/itcl3.0/itcl.tcl
 lib/itcl3.0/tclAppInit.c