Fourth round of INSTALLS_SHLIBS conversion.

14 files changed, 7 insertions, 16 deletions

diff --git a/x11-toolkits/jx/Makefile b/x11-toolkits/jx/Makefile
index 9591abbf1e0b..007c4ae46870 100644
--- a/x11-toolkits/jx/Makefile
+++ b/x11-toolkits/jx/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_XLIB=	yes
+INSTALLS_SHLIBS=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 MAKE_ENV+=	JX_INSTALL_ROOT="${PREFIX}/bin" \
diff --git a/x11-toolkits/jx/pkg-plist b/x11-toolkits/jx/pkg-plist
index bcd3ca2da409..0ccb35c636ac 100644
--- a/x11-toolkits/jx/pkg-plist
+++ b/x11-toolkits/jx/pkg-plist
@@ -1312,5 +1312,3 @@ share/jx/jx_run_script.xpm
 @dirrm include/ace
 bin/jfdesign
 bin/jxlayout
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
diff --git a/x11-toolkits/kde-qt-addon/Makefile b/x11-toolkits/kde-qt-addon/Makefile
index 081b5ddbf620..3a29f5ff0516 100644
--- a/x11-toolkits/kde-qt-addon/Makefile
+++ b/x11-toolkits/kde-qt-addon/Makefile
@@ -17,6 +17,7 @@ SOMAJOR=	4
 SOMINOR=	0
 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/x11-toolkits/kde-qt-addon/pkg-plist b/x11-toolkits/kde-qt-addon/pkg-plist
index a3409e438ebc..7f2dc3417da1 100644
--- a/x11-toolkits/kde-qt-addon/pkg-plist
+++ b/x11-toolkits/kde-qt-addon/pkg-plist
@@ -5,5 +5,3 @@ include/qcanvas.h
 include/qdom.h
 include/qpolygonscanner.h
 include/qxml.h
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index bfc7cb01ace5..22c4100c6308 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake
 MANUAL_PACKAGE_BUILD=	do not want to install during interactive build
 USE_AUTOCONF=	yes
 USE_X_PREFIX=	yes
+INSTALLS_SHLIBS=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS+=--enable-static --enable-shared --disable-build-Xlt \
 		--enable-production --disable-debug --disable-build-Xbae
@@ -95,7 +96,6 @@ post-install:
 	${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/libMrm.a ${PREFIX}/lib/libMrm.a
 	${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/libMrm.la ${PREFIX}/lib/libMrm.la
 .endif
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/lesstif/pkg-plist b/x11-toolkits/lesstif/pkg-plist
index 4adf01d67e43..ade99bc48787 100644
--- a/x11-toolkits/lesstif/pkg-plist
+++ b/x11-toolkits/lesstif/pkg-plist
@@ -324,8 +324,6 @@ lib/libMrm.a
 lib/libMrm.so
 lib/libMrm.so.1
 lib/libMrm.la
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/X11/app-defaults/Mwm
 lib/X11/config/Imake.tmpl
 lib/X11/config/Motif.rules
diff --git a/x11-toolkits/libjsearch/Makefile b/x11-toolkits/libjsearch/Makefile
index d86814625f58..b17f778e434f 100644
--- a/x11-toolkits/libjsearch/Makefile
+++ b/x11-toolkits/libjsearch/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
 USE_XLIB=	yes
+INSTALLS_SHLIBS=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
 		JX_LIB_ROOT="${PREFIX}/lib" \
diff --git a/x11-toolkits/libjsearch/pkg-plist b/x11-toolkits/libjsearch/pkg-plist
index b92fddbe81d5..ace8f3407f98 100644
--- a/x11-toolkits/libjsearch/pkg-plist
+++ b/x11-toolkits/libjsearch/pkg-plist
@@ -17,5 +17,3 @@ share/jx/jsearch/replace.xpm
 @dirrm share/jx/jsearch
 %%PORTDOCS:%%@unexec rmdir %D/share/doc/JX 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11-toolkits/libjtoolbar/Makefile b/x11-toolkits/libjtoolbar/Makefile
index 8fb8f1fc0a97..b5d46aecd539 100644
--- a/x11-toolkits/libjtoolbar/Makefile
+++ b/x11-toolkits/libjtoolbar/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/JX-1.5.3
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
+INSTALLS_SHLIBS=	yes
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
 		JX_LIB_ROOT="${PREFIX}/lib" \
 		X11PREFIX="${X11PREFIX}" \
diff --git a/x11-toolkits/libjtoolbar/pkg-plist b/x11-toolkits/libjtoolbar/pkg-plist
index 41b8c36d8c9e..093616f248d0 100644
--- a/x11-toolkits/libjtoolbar/pkg-plist
+++ b/x11-toolkits/libjtoolbar/pkg-plist
@@ -19,5 +19,3 @@ share/jx/jtoolbar/todonotdone.xpm
 @dirrm share/jx/jtoolbar
 %%PORTDOCS:%%@unexec rmdir %D/share/doc/JX 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11-toolkits/libjtree/Makefile b/x11-toolkits/libjtree/Makefile
index eb9d85cab682..a7a28f0bf228 100644
--- a/x11-toolkits/libjtree/Makefile
+++ b/x11-toolkits/libjtree/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
 USE_XLIB=	yes
+INSTALLS_SHLIBS=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
 		JX_LIB_ROOT="${PREFIX}/lib" \
diff --git a/x11-toolkits/libjtree/pkg-plist b/x11-toolkits/libjtree/pkg-plist
index a092b40bcf1d..2e3c3e444b8b 100644
--- a/x11-toolkits/libjtree/pkg-plist
+++ b/x11-toolkits/libjtree/pkg-plist
@@ -16,5 +16,3 @@ lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
 %%PORTDOCS:%%share/doc/JX/LICENSE_%%PORTNAME%%
 %%PORTDOCS:%%@unexec rmdir %D/share/doc/JX 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 86d76f6a67be..3bb120aa0fad 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.inf.ufrgs.br/~casantos/neXtaw/
 MAINTAINER=	tg@FreeBSD.org
 
 USE_IMAKE=	yes
+INSTALLS_SHLIBS=	yes
 
 MAN1=		neXtclock.1
 
@@ -23,6 +24,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${PREFIX}/share/doc/neXtaw
 	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${PREFIX}/share/doc/neXtaw
 .endif
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/neXtaw/pkg-plist b/x11-toolkits/neXtaw/pkg-plist
index db7e80d1b0e1..ffb8544ccc61 100644
--- a/x11-toolkits/neXtaw/pkg-plist
+++ b/x11-toolkits/neXtaw/pkg-plist
@@ -2,8 +2,6 @@ bin/neXtclock
 lib/libneXtaw.a
 lib/libneXtaw.so
 lib/libneXtaw.so.6
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/X11/neXtaw/AllWidgets.h
 include/X11/neXtaw/AsciiSink.h
 include/X11/neXtaw/AsciiSinkP.h