Use automatic shared object handling

28 files changed, 42 insertions, 99 deletions

diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile
index 12e0fb1b985..40e184564b8 100644
--- a/databases/mysql/Makefile
+++ b/databases/mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/07/06 11:42:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/07/15 11:39:47 agc Exp $
 #
 
 DISTNAME=	mysql-3.21.32a
@@ -29,7 +29,6 @@ pre-install:
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
 post-install:
-	${LDCONFIG} || ${TRUE}
 	(cd ${WRKSRC}; ./scripts/mysql_install_db)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql/pkg/PLIST b/databases/mysql/pkg/PLIST
index 3becf8e772c..6b1095709ab 100644
--- a/databases/mysql/pkg/PLIST
+++ b/databases/mysql/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/06/22 10:55:22 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/07/15 11:39:47 agc Exp $
 include/mysql/readline.h
 include/mysql/chardefs.h
 include/mysql/keymaps.h
@@ -76,8 +76,6 @@ man/man1/mysql.1
 info/mysql.info
 @exec %D/bin/install-info %D/info/mysql.info %D/info/dir
 @exec %D/bin/mysql_install_db
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/mysql/english
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index f930f5bcf63..1978f807915 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/07/15 11:44:46 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp 
 #
 
@@ -16,6 +16,5 @@ WRKSRC=         ${WRKDIR}/slang
 
 post-install:
 	@rm -f ${PREFIX}/lib/libslang.so.99.3[348]
-	${LDCONFIG} || ${TRUE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libslang/pkg/PLIST b/devel/libslang/pkg/PLIST
index 9903b0eebf6..42e1db33e18 100644
--- a/devel/libslang/pkg/PLIST
+++ b/devel/libslang/pkg/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 1998/02/02 08:59:48 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/07/15 11:44:46 agc Exp $
 lib/libslang.a
 lib/libslang.so.0.9938
 @exec rm -f %D/libslang.so.99.3[348]
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 include/slcurses.h
 include/slang.h
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index e06c5e759e8..cac4687b24c 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1998/07/04 05:11:13 mycroft Exp $
+# $NetBSD: Makefile,v 1.23 1998/07/15 11:10:42 agc Exp $
 #
 
 DISTNAME=	ImageMagick-4.0.6
@@ -17,7 +17,4 @@ USE_IMAKE=	yes
 XMKMF=		${MAKE_ENV} xmkmf -a
 MAKE_ENV=	LOCALBASE=${LOCALBASE} PREFIX=${PREFIX}
 
-post-install:
-	${LDCONFIG} || ${TRUE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index cb1ce7ea873..5289a815e6a 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1998/06/06 15:18:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 1998/07/15 11:10:44 agc Exp $
 bin/xtp
 bin/display
 bin/montage
@@ -22,8 +22,6 @@ include/magick/plug-ins.h
 @dirrm include/magick
 lib/libMagick.a
 lib/libMagick.so.4.0.6
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 man/cat1/display.0
 man/cat1/montage.0
 man/cat1/import.0
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index feb84960ad0..3347de49012 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/04/15 10:38:25 agc Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/15 11:22:53 agc Exp $
 #
 
 DISTNAME=       MesaLib-2.6
@@ -46,6 +46,9 @@ do-install:
 	${CP} -Rp ${WRKSRC}/book ${PREFIX}/share/examples/Mesa
 	${CP} -Rp ${WRKSRC}/widgets-sgi ${PREFIX}/share/examples/Mesa
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/Mesa
-	${LDCONFIG} || ${TRUE}
+	${LN} -f ${PREFIX}/lib/libMesaGL.so.2.6 ${PREFIX}/lib/libGL.so.2.6
+	${LN} -f ${PREFIX}/lib/libMesaGLU.so.2.6 ${PREFIX}/lib/libGLU.so.2.6
+	${LN} -f ${PREFIX}/lib/libMesaGL.a ${PREFIX}/lib/libGL.a
+	${LN} -f ${PREFIX}/lib/libMesaGLU.a ${PREFIX}/lib/libGLU.a
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Mesa/pkg/PLIST b/graphics/Mesa/pkg/PLIST
index a34eed9ec5f..212618c6ecb 100644
--- a/graphics/Mesa/pkg/PLIST
+++ b/graphics/Mesa/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1998/05/08 15:44:40 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.9 1998/07/15 11:22:53 agc Exp $
 include/GL/FooMesa.h
 include/GL/dosmesa.h
 include/GL/fxmesa.h
@@ -16,25 +16,19 @@ include/GL/svgamesa.h
 include/GL/wmesa.h
 include/GL/xmesa.h
 lib/libMesaGL.so.2.6
-@exec ln %D/%F %D/lib/libGL.so.2.6
-@unexec rm %D/lib/libGL.so.2.6
+lib/libGL.so.2.6
 lib/libMesaGLU.so.2.6
-@exec ln %D/%F %D/lib/libGLU.so.2.6
-@unexec rm %D/lib/libGLU.so.2.6
+lib/libGLU.so.2.6
 lib/libMesaGL.a
-@exec ln %D/%F %D/lib/libGL.a
-@unexec rm %D/lib/libGL.a
+lib/libGL.a
 lib/libMesaGLU.a
-@exec ln %D/%F %D/lib/libGLU.a
-@unexec rm %D/lib/libGLU.a
+lib/libGLU.a
 lib/libMesaaux.so.2.6
 lib/libMesaaux.a
 lib/libMesatk.so.2.6
 lib/libMesatk.a
 lib/libglut.so.3.6
 lib/libglut.a
-@exec ldconfig || /usr/bin/true
-@unexec ldconfig || /usr/bin/true
 share/examples/Mesa/book/Imakefile
 share/examples/Mesa/book/Makefile
 share/examples/Mesa/book/Makefile.win
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index ae450c12756..d0a0f8bf306 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/07/15 11:29:21 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp
 #
 
@@ -12,7 +12,4 @@ MAINTAINER=     packages@netbsd.org
 
 MAKEFILE=       makefile
 
-post-install:
-	${LDCONFIG} || ${TRUE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/png/pkg/PLIST b/graphics/png/pkg/PLIST
index 2d7a996f2b9..b4ae2285112 100644
--- a/graphics/png/pkg/PLIST
+++ b/graphics/png/pkg/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 1998/02/02 09:00:06 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/07/15 11:29:22 agc Exp $
 include/png.h
 include/pngconf.h
 lib/libpng.a
 lib/libpng.so.0.96
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 4fe7e25cc7b..ada1bf366cd 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/06/22 12:39:46 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/07/15 11:27:52 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp
 #
 
@@ -14,7 +14,4 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X11=	yes
 
-post-install:
-	${LDCONFIG} || ${TRUE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/sane/pkg/PLIST b/graphics/sane/pkg/PLIST
index a1e7f72af5c..bd9ccc13591 100644
--- a/graphics/sane/pkg/PLIST
+++ b/graphics/sane/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/05/03 20:49:45 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/07/15 11:27:53 agc Exp $
 bin/scanimage
 bin/xcam
 bin/xscanimage
@@ -81,7 +81,6 @@ lib/libsane-umax.so.0.72
 lib/libsane.a
 lib/libsane.so
 lib/libsane.so.0.72
-@exec /sbin/ldconfig || /usr/bin/true
 man/man1/saned.1.gz
 man/man1/scanimage.1.gz
 man/man1/xscanimage.1.gz
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 2e8f92de045..45bd9b0c87e 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/07/05 02:45:13 tron Exp $
+# $NetBSD: Makefile,v 1.14 1998/07/15 11:24:51 agc Exp $
 
 DISTNAME=	tiff-v3.4beta037
 PKGNAME=	tiff-3.4
@@ -17,7 +17,4 @@ CONFIGURE_ARGS+=	--noninteractive --site ${FILESDIR}
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
 MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}" LN="${LN}"
 
-post-install:
-	${LDCONFIG} || ${TRUE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tiff/pkg/PLIST b/graphics/tiff/pkg/PLIST
index 80d148dd50c..1bd644fd1ca 100644
--- a/graphics/tiff/pkg/PLIST
+++ b/graphics/tiff/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1998/02/02 09:00:11 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/07/15 11:24:51 agc Exp $
 bin/fax2tiff
 bin/fax2ps
 bin/gif2tiff
@@ -18,8 +18,6 @@ bin/tiffmedian
 bin/tiffsplit
 lib/libtiff.a
 lib/libtiff.so.3.4
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 include/tiff.h
 include/tiffio.h
 man/man1/fax2ps.1
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 482b3345a5b..07588857a2d 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/07/04 09:14:52 mycroft Exp $
+# $NetBSD: Makefile,v 1.11 1998/07/15 11:26:21 agc Exp $
 #
 
 DISTNAME=       xpm-3.4k
@@ -11,7 +11,4 @@ CONFLICTS=	xpm-3.4j
 
 USE_IMAKE=	yes
 
-post-install:
-	${LDCONFIG} || ${TRUE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpm/pkg/PLIST b/graphics/xpm/pkg/PLIST
index 6c1733922c1..7b5a91de8ce 100644
--- a/graphics/xpm/pkg/PLIST
+++ b/graphics/xpm/pkg/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 1998/07/04 09:14:54 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.9 1998/07/15 11:26:21 agc Exp $
 bin/cxpm
 bin/sxpm
 lib/libXpm.a
 lib/libXpm.so.4.11
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 include/X11/xpm.h
 man/cat1/cxpm.0.gz
 man/cat1/sxpm.0.gz
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