Use automatic shared object handling

12 files changed, 18 insertions, 42 deletions

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index c3e87fa7fcc..a3f9156379a 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1998/07/13 10:05:29 frueauf Exp $
+# $NetBSD: Makefile,v 1.25 1998/07/15 10:51:16 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
@@ -33,7 +33,4 @@ pre-fetch:
 		return 1;						\
 	fi
 
-post-install:
-	${LDCONFIG} || ${TRUE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST
index ac6195a76cf..4953aa50294 100644
--- a/x11/lesstif/pkg/PLIST
+++ b/x11/lesstif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 1998/06/06 20:40:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 1998/07/15 10:51:16 agc Exp $
 bin/mwm
 bin/mxmkmf
 bin/uil
@@ -233,8 +233,6 @@ man/man3/XmWorld.3
 man/man3/XmToggleButtonGadget.3
 man/man3/XmVendorShellExt.3
 man/man5/mwmrc.5
-@exec ldconfig || /usr/bin/true
-@unexec ldconfig || /usr/bin/true
 @dirrm lib/X11/mwm
 @dirrm lib/X11/lesstif
 @dirrm include/Xm
diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index 693c76d3b50..4336f9657d4 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/06/22 13:51:34 agc Exp $
+# $NetBSD: Makefile,v 1.14 1998/07/15 10:54:03 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/10/30 05:15:19 jkh Exp
 #
 
@@ -100,7 +100,6 @@ do-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTDIR}/bin
 	${INSTALL_DATA} ${WRKSRC}/lib/libqt.so.1.33 ${QTDIR}/lib
-	${LDCONFIG} || ${TRUE}
 	${MKDIR} ${QTDIR}/include/qt
 	${INSTALL_DATA} ${WRKSRC}/include/* ${QTDIR}/include/qt
 	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${QTDIR}/man/man1
diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST
index 700e05193e2..3bd9d7c017f 100644
--- a/x11/qt/pkg/PLIST
+++ b/x11/qt/pkg/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 1998/04/14 20:17:03 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/07/15 10:54:03 agc Exp $
 lib/libqt.so.1.33
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 man/man1/moc.1
 man/man3/QApplication.3
 man/man3/QArray.3
diff --git a/x11/tix/Makefile b/x11/tix/Makefile
index 173357036b3..6bfa5bd8dc8 100644
--- a/x11/tix/Makefile
+++ b/x11/tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/06/22 13:21:02 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/07/15 10:56:58 agc Exp $
 # $FreeBSD Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp
 
 DISTNAME=	Tix4.1.0.006
@@ -30,7 +30,6 @@ post-install:
 	@${MKDIR} ${PREFIX}/man/man1
 	@${MV} ${PREFIX}/man/mann/tixwish.1 ${PREFIX}/man/man1
 	@${LN} -sf ${PREFIX}/bin/tixwish4.1.8.0 ${PREFIX}/bin/tixwish
-	${LDCONFIG} || ${TRUE}
 .for dir in generic unix
 	@${MKDIR} ${PREFIX}/include/tix/${dir}
 	${INSTALL_DATA} ${WRKSRC}/../../${dir}/*.h ${PREFIX}/include/tix/${dir}
@@ -39,4 +38,4 @@ post-install:
 	@# These two files are the same
 	${LN} -sf ../../tix.h ${PREFIX}/include/tix/generic
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tix/pkg/PLIST b/x11/tix/pkg/PLIST
index fabd123cb4a..8634c9a53b0 100644
--- a/x11/tix/pkg/PLIST
+++ b/x11/tix/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/05/04 22:55:30 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/07/15 10:56:59 agc Exp $
 bin/tixwish4.1.8.0
 @exec ln -s %D/%F %B/tixwish
 @unexec rm %B/tixwish
@@ -19,8 +19,6 @@ include/tix/unix/tixUnixInt.h
 include/tix/unix/tixUnixPort.h
 lib/libtix4180.so.1.2
 lib/libtixsam4180.so.1.2
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 man/mann/BtnBox.n.gz
 man/mann/Balloon.n.gz
 man/mann/ChkList.n.gz
diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index cf38c0c663f..0052847c447 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/07/04 04:11:34 mycroft Exp $
+# $NetBSD: Makefile,v 1.18 1998/07/15 10:58:53 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp
 #
 
@@ -16,9 +16,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=  PORTSDIR=${.CURDIR}/../../../../..
 
-post-install:
-	${LDCONFIG} || ${TRUE}
-
 test:
 	cd ${WRKSRC}; make test
 
diff --git a/x11/tk80/pkg/PLIST b/x11/tk80/pkg/PLIST
index cf4c2d90e89..02e5f08d934 100644
--- a/x11/tk80/pkg/PLIST
+++ b/x11/tk80/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 1998/03/01 18:16:36 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 1998/07/15 10:58:54 agc Exp $
 bin/wish8.0
 include/tk8.0/tk.h
 include/tk8.0/unix/tkUnixDefault.h
@@ -457,8 +457,6 @@ lib/tk8.0/safetk.tcl
 lib/tk8.0/tkConfig.sh
 lib/libtk80.a
 lib/libtk80.so.1.0
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 @dirrm lib/tk8.0/demos/images
 @dirrm lib/tk8.0/demos
 @dirrm lib/tk8.0/images
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 37717e87922..fdeb1f7b000 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 13:21:04 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/07/15 11:06:45 agc Exp $
 #
 
 DISTNAME=		bxform-088
@@ -33,6 +33,7 @@ post-patch:
 	${CP} ${FILESDIR}/mkconfig.h ${WRKSRC}
 
 post-install:
-	${LDCONFIG} || ${TRUE}
+	${LN} -fs ${PREFIX}/lib/libforms.a ${PREFIX}/lib/libxforms.a
+	${LN} -fs ${PREFIX}/lib/libforms.so.0.88 ${PREFIX}/lib/libxforms.so.0.88
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xforms/pkg/PLIST b/x11/xforms/pkg/PLIST
index fa78821bcbf..6b34d21906b 100644
--- a/x11/xforms/pkg/PLIST
+++ b/x11/xforms/pkg/PLIST
@@ -1,15 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 1998/05/08 14:22:04 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/07/15 11:06:46 agc Exp $
 bin/fd2ps
 bin/fdesign
 include/X11/forms.h
 lib/libforms.a
-@exec	ln -sf %D/%F %D/lib/libxforms.a
-@unexec	rm -f %D/lib/libxforms.a
+lib/libxforms.a
 lib/libforms.so.0.88
-@exec	ln -sf %D/%F %D/lib/libxforms.so.0.88
-@unexec	rm -f %D/lib/libxforms.so.0.88
-@exec	/sbin/ldconfig || /usr/bin/true
-@unexec	/sbin/ldconfig || /usr/bin/true
+lib/libxforms.so.0.88
 man/man1/fd2ps.1.gz
 man/man1/fdesign.1.gz
 man/man5/forms.5.gz
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index abac4dea812..634d15a738b 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/07/03 23:30:10 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/07/15 11:08:55 agc Exp $
 # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
 #
 
@@ -14,7 +14,4 @@ DEPENDS=        xview-config-3.2.1:../../x11/xview-config
 MIRROR_DISTFILE= no
 USE_IMAKE=	yes
 
-post-install:
-	${LDCONFIG} || ${TRUE}
-
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-lib/pkg/PLIST b/x11/xview-lib/pkg/PLIST
index e8ec31bde24..c6712b54076 100644
--- a/x11/xview-lib/pkg/PLIST
+++ b/x11/xview-lib/pkg/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 1998/07/04 14:51:18 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/07/15 11:08:55 agc Exp $
 bin/xgettext
 bin/msgfmt
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 include/bitmaps/1x1
 include/bitmaps/2x2
 include/bitmaps/black