Fourth round of INSTALLS_SHLIBS conversion.

22 files changed, 10 insertions, 38 deletions

diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 672e5434d23e..6ca9487dcaf3 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
+INSTALLS_SHLIBS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
index bc9acbfba126..e337e8930d38 100644
--- a/security/kgpg-kde4/pkg-plist
+++ b/security/kgpg-kde4/pkg-plist
@@ -581,5 +581,3 @@ share/toolbar/filedel.xpm
 @dirrm share/apps/kab
 @dirrm share/apps/ark/toolbar
 @dirrm share/apps/ark
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index 9dc828875f97..acd501567d7a 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
 USE_GMAKE=		yes
+INSTALLS_SHLIBS=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
 CONFIGURE_ENV=		INSTALL="${INSTALL}"
@@ -104,7 +105,6 @@ post-build:
 .include <bsd.port.pre.mk>
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 # html documentation
 .if defined(WANT_HTML) && ${WANT_HTML} == "YES"
 	@${MKDIR} ${PREFIX}/share/doc/krb5
diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist
index 9ecf19c0055a..4e1ef4346098 100644
--- a/security/krb5-16/pkg-plist
+++ b/security/krb5-16/pkg-plist
@@ -1,4 +1,3 @@
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @unexec install-info --delete %D/info/krb425.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-install.info %D/info/dir
@@ -118,8 +117,6 @@ share/gnats/mit
 @dirrm include/gssapi
 @dirrm include/kerberosIV
 @dirrm share/doc/krb5
-@exec /sbin/ldconfig -m %D/lib
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 9dc828875f97..acd501567d7a 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
 USE_GMAKE=		yes
+INSTALLS_SHLIBS=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
 CONFIGURE_ENV=		INSTALL="${INSTALL}"
@@ -104,7 +105,6 @@ post-build:
 .include <bsd.port.pre.mk>
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 # html documentation
 .if defined(WANT_HTML) && ${WANT_HTML} == "YES"
 	@${MKDIR} ${PREFIX}/share/doc/krb5
diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist
index 9ecf19c0055a..4e1ef4346098 100644
--- a/security/krb5-17/pkg-plist
+++ b/security/krb5-17/pkg-plist
@@ -1,4 +1,3 @@
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @unexec install-info --delete %D/info/krb425.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-install.info %D/info/dir
@@ -118,8 +117,6 @@ share/gnats/mit
 @dirrm include/gssapi
 @dirrm include/kerberosIV
 @dirrm share/doc/krb5
-@exec /sbin/ldconfig -m %D/lib
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 9dc828875f97..acd501567d7a 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
 USE_GMAKE=		yes
+INSTALLS_SHLIBS=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
 CONFIGURE_ENV=		INSTALL="${INSTALL}"
@@ -104,7 +105,6 @@ post-build:
 .include <bsd.port.pre.mk>
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 # html documentation
 .if defined(WANT_HTML) && ${WANT_HTML} == "YES"
 	@${MKDIR} ${PREFIX}/share/doc/krb5
diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist
index 9ecf19c0055a..4e1ef4346098 100644
--- a/security/krb5-appl/pkg-plist
+++ b/security/krb5-appl/pkg-plist
@@ -1,4 +1,3 @@
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @unexec install-info --delete %D/info/krb425.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-install.info %D/info/dir
@@ -118,8 +117,6 @@ share/gnats/mit
 @dirrm include/gssapi
 @dirrm include/kerberosIV
 @dirrm share/doc/krb5
-@exec /sbin/ldconfig -m %D/lib
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 9dc828875f97..acd501567d7a 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
 USE_GMAKE=		yes
+INSTALLS_SHLIBS=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
 CONFIGURE_ENV=		INSTALL="${INSTALL}"
@@ -104,7 +105,6 @@ post-build:
 .include <bsd.port.pre.mk>
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 # html documentation
 .if defined(WANT_HTML) && ${WANT_HTML} == "YES"
 	@${MKDIR} ${PREFIX}/share/doc/krb5
diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist
index 9ecf19c0055a..4e1ef4346098 100644
--- a/security/krb5/pkg-plist
+++ b/security/krb5/pkg-plist
@@ -1,4 +1,3 @@
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @unexec install-info --delete %D/info/krb425.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-install.info %D/info/dir
@@ -118,8 +117,6 @@ share/gnats/mit
 @dirrm include/gssapi
 @dirrm include/kerberosIV
 @dirrm share/doc/krb5
-@exec /sbin/ldconfig -m %D/lib
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 672e5434d23e..6ca9487dcaf3 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
+INSTALLS_SHLIBS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
index bc9acbfba126..e337e8930d38 100644
--- a/security/kwallet/pkg-plist
+++ b/security/kwallet/pkg-plist
@@ -581,5 +581,3 @@ share/toolbar/filedel.xpm
 @dirrm share/apps/kab
 @dirrm share/apps/ark/toolbar
 @dirrm share/apps/ark
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index 0df6d2231833..3880ab6860e2 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://argeas.cs-net.gr/pub/unix/mcrypt/old/ \
 
 MAINTAINER=	nsayer@freebsd.org
 
+INSTALLS_SHLIBS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-posix-threads
 
@@ -20,7 +21,4 @@ MAN3=		mcrypt.3
 
 RESTRICTED=	"yes - cryptography"
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/security/libmcrypt/pkg-plist b/security/libmcrypt/pkg-plist
index 38cf497a3bc7..f0e8a3da1b5f 100644
--- a/security/libmcrypt/pkg-plist
+++ b/security/libmcrypt/pkg-plist
@@ -4,5 +4,3 @@ lib/libmcrypt-2.2.so.2
 lib/libmcrypt-2.2.so
 lib/libmcrypt.so
 include/mcrypt.h
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/security/libparanoia/Makefile b/security/libparanoia/Makefile
index 7d9732548c4f..de8e89a0cdef 100644
--- a/security/libparanoia/Makefile
+++ b/security/libparanoia/Makefile
@@ -14,6 +14,8 @@ MAINTAINER=	snar@paranoia.ru
 
 ONLY_FOR_ARCHS=	i386
 
+INSTALLS_SHLIBS=	yes
+
 # this library depends on system-defined headers "SYS.h" and "DEFS.h"
 # which may differ from release to release.
 
diff --git a/security/libparanoia/pkg-plist b/security/libparanoia/pkg-plist
index db21f49f4a5f..7c3bf2a30931 100644
--- a/security/libparanoia/pkg-plist
+++ b/security/libparanoia/pkg-plist
@@ -1,5 +1,3 @@
 lib/libparanoia.a
 lib/libparanoia.so
 lib/libparanoia.so.1.4
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index d32141f63790..720d6a1202e0 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -12,12 +12,10 @@ MASTER_SITES=	http://schumann.cx/mhash/dl/
 
 MAINTAINER=	nsayer@freebsd.org
 
+INSTALLS_SHLIBS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-LDFLAGS='-lc_r'
 
 MAN3=		mhash.3
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/security/mhash/pkg-plist b/security/mhash/pkg-plist
index 77560d065e21..50a9674933b5 100644
--- a/security/mhash/pkg-plist
+++ b/security/mhash/pkg-plist
@@ -3,5 +3,3 @@ lib/libmhash.so.1
 lib/libmhash.so
 lib/libmhash.a
 include/mhash.h
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index fc90e2e89326..b5734897a7f7 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -94,7 +94,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/$i.so.${SHLIBVER} ${PREFIX}/lib
 	@${LN} -sf $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so
 .endfor
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/openssl
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index 959d549b1240..890ede42b0ec 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -78,5 +78,3 @@ share/doc/openssl/openssl.txt
 @dirrm openssl/private
 @dirrm openssl
 @dirrm share/doc/openssl
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index fc90e2e89326..b5734897a7f7 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -94,7 +94,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/$i.so.${SHLIBVER} ${PREFIX}/lib
 	@${LN} -sf $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so
 .endfor
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/openssl
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 959d549b1240..890ede42b0ec 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -78,5 +78,3 @@ share/doc/openssl/openssl.txt
 @dirrm openssl/private
 @dirrm openssl
 @dirrm share/doc/openssl
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R