Second round of INSTALL_SHLIBS=yes fixes.

11 files changed, 4 insertions, 22 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 25f2d2c364bf..2695f88dd148 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -21,6 +21,7 @@ MAINTAINER=	taguchi@tohoku.iij.ad.jp
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
 
 PREFIX?=	${X11BASE}
+INSTALL_SHLIBS=	yes
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc
@@ -85,7 +86,4 @@ InstallAppDefFiles?=	YES
 # aout libs, such as Netscape), then set following as YES
 BuildAoutLibraries?=	NO
 
-post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index e794c4d888dc..af4328974997 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -452,8 +452,6 @@ lib/modules/fonts/libfreetype.a
 lib/modules/fonts/libspeedo.a
 lib/modules/fonts/libtype1.a
 lib/modules/fonts/libxtt.a
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @unexec rm -f %D/lib/X11/rstart/commands/x
 @unexec rm -f %D/lib/X11/rstart/commands/x11
 @unexec rm -f %D/lib/X11/rstart
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index a80e32690163..1bcdb04f3c8c 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -21,6 +21,7 @@ MAINTAINER=	taguchi@tohoku.iij.ad.jp
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
 
 PREFIX?=	${X11BASE}
+INSTALL_SHLIBS=	yes
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc
@@ -52,7 +53,4 @@ IGNOREFILES=	Wraphelp.c
 .endif
 .endif
 
-post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index 1ea07cc2acdf..208add084424 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -420,8 +420,6 @@ lib/libpsres.so.1
 lib/libxf86config.a
 lib/libxkbfile.a
 lib/libxkbui.a
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm include/DPS
 @dirrm include/GL
 @dirrm include/X11/fonts/codeconv
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile
index 98f69e91d914..4723af0a7de5 100644
--- a/x11/XFree86-aoutlibs/Makefile
+++ b/x11/XFree86-aoutlibs/Makefile
@@ -18,6 +18,7 @@ ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/lib
 NO_BUILD=	yes
+INSTALL_SHLIBS=	yes
 PORTOBJFORMAT=	aout
 
 USE_X_PREFIX=	yes
@@ -33,6 +34,5 @@ do-install:
 		${SETENV} OBJFORMAT=${PORTOBJFORMAT} \
 		${INSTALL_PROGRAM} $$l ${PREFIX}/lib/aout; \
 	done
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/aout
 
 .include <bsd.port.mk>
diff --git a/x11/XFree86-aoutlibs/pkg-plist b/x11/XFree86-aoutlibs/pkg-plist
index f6793c5a33d3..7a0b3db44d11 100644
--- a/x11/XFree86-aoutlibs/pkg-plist
+++ b/x11/XFree86-aoutlibs/pkg-plist
@@ -11,5 +11,3 @@ lib/aout/libXi.so.6.0
 lib/aout/libXtst.so.6.1
 lib/aout/libPEX5.so.6.0
 lib/aout/libXp.so.6.2
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index fb1dfbbd6fa0..5fe39601a44f 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -26,6 +26,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DIST_SUBDIR}
 IS_INTERACTIVE=	yes	# configure script asks questions
+INSTALL_SHLIBS=	yes
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
 .endif
@@ -91,6 +92,5 @@ post-install:
 	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
 .endfor
 .endif
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.post.mk>
diff --git a/x11/XFree86/pkg-plist b/x11/XFree86/pkg-plist
index 6f86bb0a122b..2dc4751df93e 100644
--- a/x11/XFree86/pkg-plist
+++ b/x11/XFree86/pkg-plist
@@ -1513,8 +1513,6 @@ lib/liboldX.so
 lib/liboldX.so.6
 lib/libxkbfile.a
 lib/libxkbui.a
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/modules/pex5.so
 lib/modules/xf86AceCad.so
 lib/modules/xf86Calcomp.so
diff --git a/x11/XFree86/pkg-plist.alpha b/x11/XFree86/pkg-plist.alpha
index 34b74863d677..15c68e4d4ac2 100644
--- a/x11/XFree86/pkg-plist.alpha
+++ b/x11/XFree86/pkg-plist.alpha
@@ -1504,8 +1504,6 @@ lib/liboldX.so
 lib/liboldX.so.6
 lib/libxkbfile.a
 lib/libxkbui.a
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/modules/xf86AceCad.so
 lib/modules/xf86Calcomp.so
 lib/modules/xf86Dial.so
diff --git a/x11/XFree86/pkg-plist.pc98 b/x11/XFree86/pkg-plist.pc98
index a00816f73dd2..6fbf70da710e 100644
--- a/x11/XFree86/pkg-plist.pc98
+++ b/x11/XFree86/pkg-plist.pc98
@@ -1521,8 +1521,6 @@ lib/liboldX.so
 lib/liboldX.so.6
 lib/libxkbfile.a
 lib/libxkbui.a
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/modules/pex5.so
 lib/modules/xf86AceCad.so
 lib/modules/xf86Calcomp.so
diff --git a/x11/XFree86/pkg-plist.stripped b/x11/XFree86/pkg-plist.stripped
index c95e43519c04..f76f282064c1 100644
--- a/x11/XFree86/pkg-plist.stripped
+++ b/x11/XFree86/pkg-plist.stripped
@@ -607,8 +607,6 @@ lib/liboldX.a
 lib/liboldX.so
 lib/liboldX.so.6
 lib/libxkbfile.a
-@exec /usr/bin/env OBJFORMAT=elf /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=elf /sbin/ldconfig -R
 lib/modules/pex5.so
 lib/modules/xf86Elo.so
 lib/modules/xf86Jstk.so