diff options
42 files changed, 111 insertions, 110 deletions
diff --git a/Packages.txt b/Packages.txt index 7b1bd856675..bee0d1e248a 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.15 1998/02/02 08:10:41 hubertf Exp $ +# $NetBSD: Packages.txt,v 1.16 1998/02/02 08:58:13 hubertf Exp $ ########################################################################### ========================== @@ -284,8 +284,8 @@ port from the FreeBSD ports collection: - Add MANCOMPRESSED (if not already there) if manpages are installed in compressed form by the package; see comment in bsd.port.mk - Replace /usr/local by ${PREFIX} in all files (see patches below) - - Rewrite any ldconfig commands as "ldconfig ... || ${TRUE}", as there - isn't a ldconfig command on all platforms NetBSD runs on (e.g. alpha). + - Rewrite any ldconfig commands as "ldconfig || ${TRUE}", as there isn't a + ldconfig command on all platforms NetBSD runs on (e.g. alpha). - If modifying a package from the FreeBSD ports collection, preserve their RCS ID: remove the '$'s around the FreeBSD RCS Id, and insert the word FreeBSD, then add a <$>NetBSD<$> (Without the <>s, please remember @@ -389,7 +389,7 @@ attention to the following things in pkg/PLIST: - If there's a "@exec ldconfig ...", add an "@unexec ldconfig ...", so the hints-file for ld.so doesn't grow without end. - - For @exec and @unexec rewrite any ldconfig-command as "ldconfig ... || + - For @exec and @unexec rewrite any ldconfig-command as "ldconfig || /usr/bin/true", as there's no ldconfig command on some of the platforms NetBSD runs on (e.g. alpha). - Add any missing @dirrm statements @@ -473,11 +473,12 @@ of when dealing with the PLIST file (or files, see below!). * ldconfig: Two issues here. First, if there's a @exec command calling ldconfig, also add a @unexec command, so the ld.so cache doesn't grow into - eternity with libs no longer available. + eternity with libs no longer available (this also makes debugging the + package itself easier). The second issue is that there's no ldconfig command on some of the platforms NetBSD runs on, e.g. alpha. For this, change the ldconfig call - to "ldconfig ... || /usr/bin/true". + to "ldconfig || /usr/bin/true". * ${MACHINE_ARCH}: Some packages like emacs and perl embed information about which diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile index 6d63c62f86e..43e92c68926 100644 --- a/audio/gsm/Makefile +++ b/audio/gsm/Makefile @@ -3,7 +3,7 @@ # Date created: 5 January 1995 # Whom: pst # -# $NetBSD: Makefile,v 1.5 1998/02/02 08:10:44 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 1998/02/02 08:59:06 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:39 max Exp # @@ -21,6 +21,6 @@ MAN1= toast.1 MAN3= gsm.3 gsm_explode.3 gsm_option.3 gsm_print.3 post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/audio/gsm/pkg/PLIST b/audio/gsm/pkg/PLIST index 2e662b69525..3ae8df84a7c 100644 --- a/audio/gsm/pkg/PLIST +++ b/audio/gsm/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/01/19 00:54:28 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/02/02 08:59:44 hubertf Exp $ bin/toast @exec ln -fs %f %B/untoast @exec ln -fs %f %B/untoastt @@ -10,7 +10,7 @@ man/man3/gsm_explode.3.gz man/man3/gsm_option.3.gz man/man3/gsm_print.3.gz lib/libgsm.so.1.0.10 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true lib/libgsm.a include/gsm.h diff --git a/converters/kdesupport/pkg/PLIST b/converters/kdesupport/pkg/PLIST index d24e3542eed..b207fc7d68a 100644 --- a/converters/kdesupport/pkg/PLIST +++ b/converters/kdesupport/pkg/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 1998/01/24 03:38:36 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/02/02 08:59:46 hubertf Exp $ lib/libmimelib.so.1.0 lib/libmimelib.la lib/libuulib.so.0.0 lib/libuulib.la -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true include/mimelib/address.h include/mimelib/addrlist.h include/mimelib/body.h diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 0b4205e58e1..843501e5afc 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -3,7 +3,7 @@ # Date created: 11 July 1996 # Whom: ache # -# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:46 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:08 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp # @@ -21,6 +21,6 @@ WRKSRC= ${WRKDIR}/slang post-install: @rm -f ${PREFIX}/lib/libslang.so.99.3[348] - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/devel/libslang/pkg/PLIST b/devel/libslang/pkg/PLIST index 679fd1af220..9903b0eebf6 100644 --- a/devel/libslang/pkg/PLIST +++ b/devel/libslang/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 1998/01/24 04:17:42 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/02/02 08:59:48 hubertf Exp $ lib/libslang.a lib/libslang.so.0.9938 @exec rm -f %D/libslang.so.99.3[348] -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true include/slcurses.h include/slang.h diff --git a/devel/mit-pthreads/pkg/PLIST b/devel/mit-pthreads/pkg/PLIST index cc6998347a0..1053910be02 100644 --- a/devel/mit-pthreads/pkg/PLIST +++ b/devel/mit-pthreads/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1998/01/08 16:22:15 agc Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/02/02 08:59:50 hubertf Exp $ @exec if [ ! -d %d/pthreads ]; then mkdir -p %D/pthreads; fi pthreads/bin/pgcc pthreads/bin/pg++ @@ -6,8 +6,8 @@ pthreads/lib/libpthread.a pthreads/lib/libpthread_p.a pthreads/lib/libpthread_pic.a pthreads/lib/libpthread.so.1.60 -@exec ldconfig -m %B || true -@unexec ldconfig -m %B || true +@exec ldconfig || true +@unexec ldconfig || true pthreads/include/Makefile.inc pthreads/include/dirent.h pthreads/include/endian.h diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index b1c437113ca..385a7833c07 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -3,7 +3,7 @@ # Date created: Tue Oct 28 00:12:41 CET 1997 # Whom: Hubert Feyrer (hubertf@netbsd.org) # -# $NetBSD: Makefile,v 1.9 1998/02/02 08:10:48 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 1998/02/02 08:59:11 hubertf Exp $ DISTNAME= ncurses-1.9.9g CATEGORIES= devel @@ -61,6 +61,6 @@ post-install: ( cd ${PREFIX}/include ; for i in form.h menu.h panel.h ; do \ ${SED} '/#include/s|curses.h|ncurses.h|g' $$i >$$i.BAK ; \ ${MV} $$i.BAK $$i ; done ) - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/devel/ncurses/pkg/PLIST b/devel/ncurses/pkg/PLIST index c7bbc39f3d5..803e91bc7df 100644 --- a/devel/ncurses/pkg/PLIST +++ b/devel/ncurses/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1998/01/24 04:28:24 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/02/02 08:59:52 hubertf Exp $ bin/tic bin/toe bin/infocmp @@ -23,8 +23,8 @@ lib/libmenu_g.a lib/libform.so.3.4 lib/libform.a lib/libform_g.a -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true man/man1/captoinfo.1 man/man1/infocmp.1 man/man1/tic.1 diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index efc8e7c0b03..d5934311420 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -3,7 +3,7 @@ # Date created: 11th December 1997 # Whom: tron # -# $NetBSD: Makefile,v 1.9 1998/02/02 08:10:50 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 1998/02/02 08:59:13 hubertf Exp $ # DISTNAME= ImageMagick-4.0 @@ -43,6 +43,6 @@ post-extract: post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST index c5ce2c24540..b47567bbda5 100644 --- a/graphics/ImageMagick/pkg/PLIST +++ b/graphics/ImageMagick/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 1998/01/27 13:51:24 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/02/02 08:59:54 hubertf Exp $ bin/xtp bin/display bin/montage @@ -22,8 +22,8 @@ include/magick/plug-ins.h @dirrm include/magick lib/libMagick.a lib/libMagick.so.4.0.0 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@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 306d3fd6804..811b35a9188 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -3,7 +3,7 @@ # Date created: Tue Feb 7 12:02:49 1995 # Whom: hsu # -# $NetBSD: Makefile,v 1.7 1998/02/02 08:10:51 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:14 hubertf Exp $ # FreeBSD Id: Makefile,v 1.19 1997/09/30 19:21:40 max Exp # @@ -40,6 +40,6 @@ do-install: ${CP} -Rp ${WRKSRC}/demos ${PREFIX}/share/examples/Mesa ${CP} -Rp ${WRKSRC}/book ${PREFIX}/share/examples/Mesa ${CP} -Rp ${WRKSRC}/widgets-sgi ${PREFIX}/share/examples/Mesa - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/graphics/Mesa/pkg/PLIST b/graphics/Mesa/pkg/PLIST index 97e92026154..b99895683ca 100644 --- a/graphics/Mesa/pkg/PLIST +++ b/graphics/Mesa/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1998/01/24 05:19:32 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/02/02 08:59:56 hubertf Exp $ include/GL/FooMesa.h include/GL/dosmesa.h include/GL/gl.h @@ -30,8 +30,8 @@ lib/libMesaaux.so.2.4 lib/libMesaaux_pic.a lib/libMesatk.so.2.4 lib/libMesatk_pic.a -@exec ldconfig -m %B || /usr/bin/true -@unexec ldconfig -m %B || /usr/bin/true +@exec ldconfig || /usr/bin/true +@unexec ldconfig || /usr/bin/true share/examples/Mesa/book/Imakefile share/examples/Mesa/book/Makefile share/examples/Mesa/book/README diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index d59c3962d12..7afa2ea2e69 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -3,7 +3,7 @@ # Date created: 03 May 1997 # Whom: Thomas Gellekum <tg@FreeBSD.ORG> # -# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:52 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:16 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp # @@ -18,6 +18,6 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/giflib @${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/giflib .endif - @${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + @${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/graphics/giflib/pkg/PLIST b/graphics/giflib/pkg/PLIST index 82454bd1ae6..5018fbf7992 100644 --- a/graphics/giflib/pkg/PLIST +++ b/graphics/giflib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 1998/01/24 05:21:01 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/02/02 08:59:58 hubertf Exp $ bin/gif2epsn bin/gif2ps bin/gif2rgb @@ -33,8 +33,8 @@ include/giflib/gif_hash.h include/giflib/gif_lib.h lib/libgif.a lib/libgif.so.3.0 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true share/doc/giflib/gif2bgi.html share/doc/giflib/gif2epsn.html share/doc/giflib/gif2herc.html diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index 28824fd3ba3..0219747098d 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -3,7 +3,7 @@ # Date created: 6 November 1994 # Whom: smace # -# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:53 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:17 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/07/17 15:12:43 max Exp # @@ -20,6 +20,6 @@ INSTALL_TARGET= install install-lib MAN1= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1 post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/graphics/jpeg/pkg/PLIST b/graphics/jpeg/pkg/PLIST index 32961cdec73..b49d25829c0 100644 --- a/graphics/jpeg/pkg/PLIST +++ b/graphics/jpeg/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/01/24 05:22:39 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/02/02 08:59:59 hubertf Exp $ bin/cjpeg bin/djpeg bin/jpegtran @@ -14,6 +14,6 @@ include/jpeglib.h include/jmorecfg.h include/jerror.h lib/libjpeg.so.7.0 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true lib/libjpeg.a diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile index 299f4ac05b1..8bf01219aae 100644 --- a/graphics/mpeg-lib/Makefile +++ b/graphics/mpeg-lib/Makefile @@ -3,7 +3,7 @@ # Date created: 07 December 1997 # Whom: tron@lyssa.owl.de # -# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:55 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:19 hubertf Exp $ DISTNAME= mpeg_lib-1.2.1 PKGNAME= mpeg-1.2.1 @@ -24,6 +24,6 @@ post-configure: post-install: (cd ${WRKSRC};make PREFIX=${PREFIX} includes) - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/graphics/mpeg-lib/pkg/PLIST b/graphics/mpeg-lib/pkg/PLIST index d71e7da1378..0893880abcd 100644 --- a/graphics/mpeg-lib/pkg/PLIST +++ b/graphics/mpeg-lib/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 1998/01/24 05:23:49 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.3 1998/02/02 09:00:01 hubertf Exp $ lib/libmpeg.a lib/libmpeg_p.a lib/libmpeg_pic.a lib/libmpeg.so.1.2 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true include/mpeg.h diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 024cb16bf31..4ae16b11673 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -3,7 +3,7 @@ # Date created: 5 Dec 1995 # Whom: ache # -# $NetBSD: Makefile,v 1.4 1998/02/02 08:10:56 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:21 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp # @@ -18,6 +18,6 @@ MAINTAINER= ache@FreeBSD.org MAKEFILE= makefile post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/graphics/png/pkg/PLIST b/graphics/png/pkg/PLIST index 7937600b4cc..2d7a996f2b9 100644 --- a/graphics/png/pkg/PLIST +++ b/graphics/png/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.4 1998/01/24 05:27:36 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/02/02 09:00:06 hubertf Exp $ include/png.h include/pngconf.h lib/libpng.a lib/libpng.so.0.96 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 2479e833116..2e73f18201f 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -3,7 +3,7 @@ # Date created: 27 November 1997 # Whom: tron # -# $NetBSD: Makefile,v 1.7 1998/02/02 08:10:57 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:22 hubertf Exp $ DISTNAME= tiff-v3.4beta037 PKGNAME= tiff-3.4 @@ -52,6 +52,6 @@ CONFIGURE_ARGS+= --noninteractive --site ${FILESDIR} CONFIGURE_ENV+= PREFIX=${PREFIX} post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/graphics/tiff/pkg/PLIST b/graphics/tiff/pkg/PLIST index 9a042ea1ee3..80d148dd50c 100644 --- a/graphics/tiff/pkg/PLIST +++ b/graphics/tiff/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1998/01/24 05:29:27 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/02/02 09:00:11 hubertf Exp $ bin/fax2tiff bin/fax2ps bin/gif2tiff @@ -18,8 +18,8 @@ bin/tiffmedian bin/tiffsplit lib/libtiff.a lib/libtiff.so.3.4 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@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 6c5ac8e8203..9e6c58010ab 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -3,7 +3,7 @@ # Date created: 14 September 1994 # Whom: jkh # -# $NetBSD: Makefile,v 1.6 1998/02/02 08:10:58 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 1998/02/02 08:59:24 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/07/17 15:12:45 max Exp # @@ -18,6 +18,6 @@ USE_IMAKE= yes CAT1= sxpm.0 post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/graphics/xpm/pkg/PLIST b/graphics/xpm/pkg/PLIST index f2a986a7736..e7824c4a6b9 100644 --- a/graphics/xpm/pkg/PLIST +++ b/graphics/xpm/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.6 1998/01/24 05:30:47 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.7 1998/02/02 09:00:14 hubertf Exp $ bin/sxpm lib/libXpm.a lib/libXpm.so.4.10 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true include/X11/xpm.h man/cat1/sxpm.0.gz diff --git a/lang/expect/Makefile b/lang/expect/Makefile index a283639d556..2bab7cca04a 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -3,7 +3,7 @@ # Whom: pst # Version required: 5.25 # -# $NetBSD: Makefile,v 1.6 1998/02/02 08:11:00 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 1998/02/02 08:59:25 hubertf Exp $ # FreeBSD Id: Makefile,v 1.29 1998/01/27 01:11:47 fenner Exp # @@ -39,6 +39,6 @@ test: @(cd ${WRKSRC}; make test) post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/lang/expect/pkg/PLIST b/lang/expect/pkg/PLIST index 4de3bb8cf8b..e041e2b6a5e 100644 --- a/lang/expect/pkg/PLIST +++ b/lang/expect/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/02/01 01:58:10 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/02/02 09:00:16 hubertf Exp $ bin/autoexpect bin/autopasswd bin/cryptdir @@ -29,8 +29,8 @@ lib/expect5.25/pkgIndex.tcl lib/expect5.25/libexpect525.a lib/libexpect525.a lib/libexpect525.so.1.2 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true man/man1/autoexpect.1.gz man/man1/cryptdir.1.gz man/man1/decryptdir.1.gz diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index 2cdf9bea1bd..95f25e5aa9a 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -3,7 +3,7 @@ # Date created: 20 February 1995 # Whom: Tim Wilkinson <tim@sarc.city.ac.uk> # -# $NetBSD: Makefile,v 1.4 1998/02/02 08:11:01 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:27 hubertf Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/08 09:37:16 obrien Exp # @@ -28,6 +28,6 @@ MAN1= kaffe.1 post-install: ${MKDIR} ${PREFIX}/share/kaffe ${INSTALL_DATA} ${WRKSRC}/ENVIRONMENT ${WRKSRC}/license.terms ${PREFIX}/share/kaffe - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/lang/kaffe/pkg/PLIST b/lang/kaffe/pkg/PLIST index 8357c92fefa..21cb4913370 100644 --- a/lang/kaffe/pkg/PLIST +++ b/lang/kaffe/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/02/01 02:05:16 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/02/02 09:00:19 hubertf Exp $ bin/kaffe bin/kaffeh bin/appletviewer @@ -32,8 +32,8 @@ lib/libzip.so.0.92 lib/libzip.so lib/libkaffevm.so.0.92 lib/libkaffevm.so -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true man/man1/kaffe.1.gz share/kaffe/lib/security/java.security share/kaffe/lib/appletviewer.properties diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile index cb7836c4b89..ec053351e30 100644 --- a/lang/tcl80/Makefile +++ b/lang/tcl80/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $NetBSD: Makefile,v 1.6 1998/02/02 08:11:02 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 1998/02/02 08:59:29 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/20 10:33:35 jkh Exp # @@ -24,7 +24,7 @@ MAN3= Alloc.3 AddErrInfo.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 BackgdErr.3 MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n catch.n cd.n clock.n close.n concat.n continue.n eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n fcopy.n if.n file.n fileevent.n filename.n flush.n for.n foreach.n format.n gets.n glob.n global.n history.n http.n incr.n info.n interp.n join.n lappend.n library.n lindex.n linsert.n list.n llength.n load.n lrange.n lreplace.n lsearch.n lsort.n namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n read.n regexp.n registry.n regsub.n rename.n resource.n return.n safe.n scan.n seek.n set.n socket.n source.n split.n string.n subst.n switch.n tclvars.n tell.n time.n trace.n unknown.n unset.n update.n uplevel.n upvar.n variable.n vwait.n while.n Base.n Http.n Safe.n pkg_mkIndex.n post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} test: cd ${WRKSRC} && ${MAKE} test diff --git a/lang/tcl80/pkg/PLIST b/lang/tcl80/pkg/PLIST index 6d319aeba31..4ecdfc5d19a 100644 --- a/lang/tcl80/pkg/PLIST +++ b/lang/tcl80/pkg/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.5 1998/01/24 20:26:42 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/02/02 09:00:21 hubertf Exp $ bin/tclsh8.0 lib/libtcl80.a lib/libtcl80.so.1.0 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true include/tcl8.0/tcl.h include/tcl8.0/unix/tclUnixPort.h include/tcl8.0/generic/tcl.h diff --git a/net/socks5/Makefile b/net/socks5/Makefile index e28d85adf20..da76d479cf3 100644 --- a/net/socks5/Makefile +++ b/net/socks5/Makefile @@ -3,7 +3,7 @@ # Date created: 24 Apr 1996 # Whom: pst # -# $NetBSD: Makefile,v 1.7 1998/02/02 08:11:03 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:30 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp # @@ -40,6 +40,6 @@ MAN5= libsocks5.conf.5 socks5.conf.5 socks5.passwd.5 post-install: ln -fs ${PREFIX}/lib/libsocks5_sh.so ${PREFIX}/lib/libsocks5_sh.so.0.0 - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/net/socks5/pkg/PLIST b/net/socks5/pkg/PLIST index 2176820cc11..d59c5accc83 100644 --- a/net/socks5/pkg/PLIST +++ b/net/socks5/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/01/24 21:45:46 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/02/02 09:00:23 hubertf Exp $ bin/socks5 bin/runsocks bin/stopsocks @@ -20,6 +20,6 @@ man/man5/socks5.passwd.5 lib/libsocks5.a lib/libsocks5_sh.so @exec ln -fs %D/lib/libsocks5_sh.so %d/lib/libsocks5_sh.so.0.0 -@exec /sbin/ldconfig -m %D/lib || /usr/bin/true -@unexec /sbin/ldconfig -m %D/lib || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true @unexec rm -f %D/lib/libsocks5_sh.so.0.0 diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile index 9114a45ba34..14844a03d2c 100644 --- a/x11/Xaw3d/Makefile +++ b/x11/Xaw3d/Makefile @@ -3,7 +3,7 @@ # Date created: 30th November 1997 # Whom: tron@lyssa.owl.de, soren@t.dk # -# $NetBSD: Makefile,v 1.9 1998/02/02 08:11:04 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 1998/02/02 08:59:32 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/06/19 09:33:26 asami Exp # @@ -21,7 +21,7 @@ post-extract: @(cd ${WRKSRC};ln -s .. X11) post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} ${MKDIR} ${PREFIX}/share/doc/Xaw3d ${CP} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d diff --git a/x11/Xaw3d/pkg/PLIST b/x11/Xaw3d/pkg/PLIST index f17359ed5d3..2e53972a2b9 100644 --- a/x11/Xaw3d/pkg/PLIST +++ b/x11/Xaw3d/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1998/01/24 23:58:22 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/02/02 09:00:24 hubertf Exp $ include/X11/Xaw3d/AllWidgets.h include/X11/Xaw3d/AsciiSink.h include/X11/Xaw3d/AsciiSinkP.h @@ -76,8 +76,8 @@ include/X11/Xaw3d/XawImP.h include/X11/Xaw3d/XawInit.h lib/libXaw3d.a lib/libXaw3d.so.6.1 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true share/doc/Xaw3d/README.XAW3D @dirrm share/doc/Xaw3d @dirrm include/X11/Xaw3d diff --git a/x11/kdelibs/pkg/PLIST b/x11/kdelibs/pkg/PLIST index 99990b6f6a8..e32e71aaf84 100644 --- a/x11/kdelibs/pkg/PLIST +++ b/x11/kdelibs/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 1998/01/25 00:04:17 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/02/02 09:00:26 hubertf Exp $ lib/libkdecore.so.0.11 lib/libkdecore.la lib/libkdeui.so.0.10 @@ -11,8 +11,8 @@ lib/libkfm.so.0.1 lib/libkfm.la lib/libmediatool.so.0.7 lib/libmediatool.la -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true include/kconfig.h include/kconfigdata.h include/ksimpleconfig.h diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 1aaee415345..1cd51a55c20 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -3,7 +3,7 @@ # Date created: December 10, 1996 # Whom: 1wardd@airmail.net # -# $NetBSD: Makefile,v 1.7 1998/02/02 08:11:05 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:35 hubertf Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -54,6 +54,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/Mwm \ ${PREFIX}/lib/X11/app-defaults/Mwm /usr/bin/strip ${PREFIX}/lib/libXm.so.0.1 ${PREFIX}/lib/libMrm.so.0.1 - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} .include <bsd.port.mk> diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST index 157d2eca4d0..9ec7162d19f 100644 --- a/x11/lesstif/pkg/PLIST +++ b/x11/lesstif/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 1998/01/25 00:05:31 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.7 1998/02/02 09:00:28 hubertf Exp $ bin/mwm bin/mxmkmf bin/uil @@ -136,8 +136,8 @@ lib/libMrm.so.0.1 lib/libUil.so.0.1 lib/libXm.so.0.1 lib/libltc.a -@exec ldconfig -m %D/lib || /usr/bin/true -@unexec ldconfig -m %D/lib || /usr/bin/true +@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 bc481215e47..ba298612b73 100644 --- a/x11/qt/Makefile +++ b/x11/qt/Makefile @@ -3,7 +3,7 @@ # Date created: 30 Jul 1996 # Whom: searle@longacre.demon.co.uk # -# $NetBSD: Makefile,v 1.4 1998/02/02 08:11:07 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:38 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/10/30 05:15:19 jkh Exp # @@ -102,7 +102,7 @@ post-configure: do-install: ${INSTALL_PROGRAM} ${WRKDIR}/qt-1.31/bin/moc ${QTDIR}/bin ${INSTALL_DATA} ${WRKDIR}/qt-1.31/lib/libqt.so.1.31 ${QTDIR}/lib - ${LDCONFIG} -m ${QTDIR}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} ${MKDIR} ${QTDIR}/include/qt ${INSTALL_DATA} ${WRKDIR}/qt-1.31/include/* ${QTDIR}/include/qt ${INSTALL_MAN} ${WRKDIR}/qt-1.31/man/man1/* ${QTDIR}/man/man1 diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST index 50ef1c0ea95..f4cc53d1479 100644 --- a/x11/qt/pkg/PLIST +++ b/x11/qt/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.3 1998/01/25 00:10:12 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/02/02 09:00:29 hubertf Exp $ lib/libqt.so.1.31 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true man/man1/moc.1.gz man/man3/QApplication.3qt.gz man/man3/QArray.3qt.gz diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile index c98574d0c13..1402edf99c6 100644 --- a/x11/tk80/Makefile +++ b/x11/tk80/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $NetBSD: Makefile,v 1.8 1998/02/02 08:11:11 hubertf Exp $ +# $NetBSD: Makefile,v 1.9 1998/02/02 08:59:42 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp # @@ -54,7 +54,7 @@ MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n \ tkerror.n tkvars.n tkwait.n toplevel.n winfo.n wm.n post-install: - ${LDCONFIG} -m ${PREFIX}/lib || ${TRUE} + ${LDCONFIG} || ${TRUE} test: cd ${WRKSRC}; make test diff --git a/x11/tk80/pkg/PLIST b/x11/tk80/pkg/PLIST index 73eca565da8..0f29987d000 100644 --- a/x11/tk80/pkg/PLIST +++ b/x11/tk80/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1998/01/25 00:16:48 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/02/02 09:00:30 hubertf Exp $ bin/wish8.0 include/tk8.0/tk.h include/tk8.0/unix/tkUnixDefault.h @@ -245,8 +245,8 @@ lib/tk8.0/safetk.tcl lib/tk8.0/tkConfig.sh lib/libtk80.a lib/libtk80.so.1.0 -@exec /sbin/ldconfig -m %B || /usr/bin/true -@unexec /sbin/ldconfig -m %B || /usr/bin/true +@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 |