diff options
| -rw-r--r-- | Packages.txt | 8 | ||||
| -rw-r--r-- | devel/libtool/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/libtool/files/patch-sum | 16 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ab | 20 | ||||
| -rw-r--r-- | devel/smpeg/pkg/PLIST | 25 | ||||
| -rw-r--r-- | graphics/gimp/pkg/PLIST | 24 | ||||
| -rw-r--r-- | lang/kaffe/pkg/PLIST | 18 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 6 | ||||
| -rw-r--r-- | sysutils/amanda-common/pkg/PLIST | 6 | ||||
| -rw-r--r-- | sysutils/amanda-server/pkg/PLIST | 7 |
10 files changed, 66 insertions, 68 deletions
diff --git a/Packages.txt b/Packages.txt index d6e85ddae8c..baeab4cdca7 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.142 2001/02/27 08:20:23 skrll Exp $ +# $NetBSD: Packages.txt,v 1.143 2001/03/12 11:23:01 skrll Exp $ ########################################################################### ========================== @@ -877,8 +877,10 @@ Here's how to use libtool in a pkg in seven simple steps: the -version-info especially when major and minor are zero, as libtool will otherwise strip off the shared library version. - The "-release" option has been disabled in the pkgsrc version of libtool - as it creates unnecessary differences between ELF and a.out platforms. + The "-release" option will produce different results for a.out and ELF + (excluding symlinks) in only one case. An ELF library of the form + libfoo-release.so.x.y will have a symlink of libfoo.so.x.y on an a.out + platform. This will be handled automatically soon. The -rpath argument is the install directory of the library being built. diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index 47e9ed2aa5f..1d6a958dfaf 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.4 2001/03/01 08:40:15 skrll Exp $ +# $NetBSD: Makefile.common,v 1.5 2001/03/12 11:23:03 skrll Exp $ # DISTNAME= libtool-ml-20010219 PKGPFX= ${DISTNAME:C/ml-/1.4./} -PKGREV= nb2 +PKGREV= nb3 WRKSRC= ${WRKDIR}/libtool-ml CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum index 494f028f526..c02ae5f54b5 100644 --- a/devel/libtool/files/patch-sum +++ b/devel/libtool/files/patch-sum @@ -1,9 +1,9 @@ -$NetBSD: patch-sum,v 1.29 2001/02/28 21:20:30 skrll Exp $ +$NetBSD: patch-sum,v 1.30 2001/03/12 11:23:03 skrll Exp $ -MD5 (patch-aa) = 91db5755b0d22449a3e93c075f702d50 -MD5 (patch-ab) = 8bc16291ef6407e694ecdccb103bae5d -MD5 (patch-ac) = a5da475693a57e16bd8462793f87639e -MD5 (patch-ad) = 15958457a2ed12613b9ad901677772d3 -MD5 (patch-ae) = 70312d73e1108c7f97ecf56db2e87ad8 -MD5 (patch-af) = cee79627cf58e02ceb2ea483fd3c044c -MD5 (patch-ag) = abc7ae8960f4b1019a3278fb27d8be23 +SHA1 (patch-aa) = 5524bcb4b3ec3faf79e903134ddcb6c8d3dfefe7 +SHA1 (patch-ab) = 18c73a32c1c35c750bd93b1d77e5a1b927d994bf +SHA1 (patch-ac) = 85ea8ee09d9cf2d2ea005042538466b68d754722 +SHA1 (patch-ad) = 2407b8ef5c210b64c6c7bec28b56e4390f9f0300 +SHA1 (patch-ae) = fae19762fa8ce27c0050c6dffd30424a6ab6f966 +SHA1 (patch-af) = 8de29f3ba4f77de1c8c0e781d5f1064342cddcaf +SHA1 (patch-ag) = 2e5d6ec05a2ae841074df1363268ef97837c9750 diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 19fbbb0a007..625c4820433 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,16 +1,8 @@ -$NetBSD: patch-ab,v 1.18 2001/02/28 18:18:23 skrll Exp $ +$NetBSD: patch-ab,v 1.19 2001/03/12 11:23:04 skrll Exp $ ---- ltmain.sh.orig Wed Feb 28 17:56:25 2001 +--- ltmain.sh.orig Mon Feb 19 05:05:23 2001 +++ ltmain.sh -@@ -946,7 +946,6 @@ - continue - ;; - release) -- release="-$arg" - prev= - continue - ;; -@@ -2397,7 +2396,7 @@ +@@ -2397,7 +2397,7 @@ # Check that each of the things are valid numbers. case "$current" in @@ -19,7 +11,7 @@ $NetBSD: patch-ab,v 1.18 2001/02/28 18:18:23 skrll Exp $ *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -@@ -2406,7 +2405,7 @@ +@@ -2406,7 +2406,7 @@ esac case "$revision" in @@ -28,7 +20,7 @@ $NetBSD: patch-ab,v 1.18 2001/02/28 18:18:23 skrll Exp $ *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -@@ -2415,7 +2414,7 @@ +@@ -2415,7 +2415,7 @@ esac case "$age" in @@ -37,7 +29,7 @@ $NetBSD: patch-ab,v 1.18 2001/02/28 18:18:23 skrll Exp $ *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -@@ -2612,6 +2611,9 @@ +@@ -2612,6 +2612,9 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; diff --git a/devel/smpeg/pkg/PLIST b/devel/smpeg/pkg/PLIST index 7c604a7bb58..2b87a167eea 100644 --- a/devel/smpeg/pkg/PLIST +++ b/devel/smpeg/pkg/PLIST @@ -1,25 +1,26 @@ -@comment $NetBSD: PLIST,v 1.4 2001/03/04 18:10:15 skrll Exp $ -bin/plaympeg -bin/gtv +@comment $NetBSD: PLIST,v 1.5 2001/03/12 11:23:04 skrll Exp $ bin/glmovie +bin/gtv +bin/plaympeg bin/smpeg-config -lib/libsmpeg.a -lib/libsmpeg.la -lib/libsmpeg.so -lib/libsmpeg.so -lib/libsmpeg.so.1 -lib/libsmpeg.so.1.0 -man/man1/plaympeg.1 -man/man1/gtv.1 include/smpeg/MPEG.h include/smpeg/MPEGaction.h include/smpeg/MPEGaudio.h include/smpeg/MPEGerror.h include/smpeg/MPEGfilter.h -include/smpeg/MPEGring.h include/smpeg/MPEGlist.h +include/smpeg/MPEGring.h include/smpeg/MPEGstream.h include/smpeg/MPEGsystem.h include/smpeg/MPEGvideo.h include/smpeg/smpeg.h +lib/libsmpeg.so +lib/libsmpeg-0.4.so +lib/libsmpeg-0.4.so.1 +lib/libsmpeg-0.4.so.1.0 +lib/libsmpeg.a +lib/libsmpeg.la +lib/libsmpeg.so.1.0 +man/man1/gtv.1 +man/man1/plaympeg.1 @dirrm include/smpeg diff --git a/graphics/gimp/pkg/PLIST b/graphics/gimp/pkg/PLIST index fc59b82259b..00bba453ef4 100644 --- a/graphics/gimp/pkg/PLIST +++ b/graphics/gimp/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2001/03/03 17:27:36 tron Exp $ +@comment $NetBSD: PLIST,v 1.27 2001/03/12 11:23:04 skrll Exp $ bin/escputil bin/gimp bin/gimp-config @@ -255,21 +255,24 @@ lib/gimp/1.2/plug-ins/xjt lib/gimp/1.2/plug-ins/xpm lib/gimp/1.2/plug-ins/xwd lib/gimp/1.2/plug-ins/zealouscrop -lib/libgck.so -lib/libgck.so.0 -lib/libgck.so.0.1 +lib/libgck-1.2.so +lib/libgck-1.2.so.0 +lib/libgck-1.2.so.0.1 lib/libgck.a lib/libgck.la -lib/libgimp.so -lib/libgimp.so.0 -lib/libgimp.so.0.1 +lib/libgck.so +lib/libgimp-1.2.so +lib/libgimp-1.2.so.0 +lib/libgimp-1.2.so.0.1 lib/libgimp.a lib/libgimp.la -lib/libgimpui.so -lib/libgimpui.so.0 -lib/libgimpui.so.0.1 +lib/libgimp.so +lib/libgimpui-1.2.so +lib/libgimpui-1.2.so.0 +lib/libgimpui-1.2.so.0.1 lib/libgimpui.a lib/libgimpui.la +lib/libgimpui.so man/man1/escputil.1 man/man1/gimp-remote.1 man/man1/gimp.1 @@ -1420,6 +1423,7 @@ share/locale/uk/LC_MESSAGES/gimp.mo @unexec rmdir %D/share/aclocal 2>/dev/null || true @dirrm lib/gimp/1.2/plug-ins @dirrm lib/gimp/1.2/modules +@dirrm lib/gimp/1.2 @dirrm include/libgimp @dirrm include/gck @dirrm etc/gimp/1.2 diff --git a/lang/kaffe/pkg/PLIST b/lang/kaffe/pkg/PLIST index f271dfa4551..1e9ba43e26e 100644 --- a/lang/kaffe/pkg/PLIST +++ b/lang/kaffe/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2001/03/04 10:07:53 tron Exp $ +@comment $NetBSD: PLIST,v 1.15 2001/03/12 11:23:05 skrll Exp $ kaffe/bin/appletviewer kaffe/bin/install-jar kaffe/bin/jar @@ -72,15 +72,15 @@ kaffe/share/kaffe/rmi.jar kaffe/share/kaffe/servlet.jar kaffe/share/kaffe/tools.jar kaffe/share/license.terms -@dirrm kaffe/bin -@dirrm kaffe/include/kaffe -@dirrm kaffe/include +@dirrm kaffe/share/kaffe +@dirrm kaffe/share +@dirrm kaffe/man/man1 +@dirrm kaffe/man +@dirrm kaffe/libexec @dirrm kaffe/lib/kaffe/security @dirrm kaffe/lib/kaffe @dirrm kaffe/lib -@dirrm kaffe/libexec -@dirrm kaffe/man/man1 -@dirrm kaffe/man -@dirrm kaffe/share/kaffe -@dirrm kaffe/share +@dirrm kaffe/include/kaffe +@dirrm kaffe/include +@dirrm kaffe/bin @dirrm kaffe diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7c0293a019f..01f49b7c19f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.683 2001/03/11 09:51:59 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.684 2001/03/12 11:23:06 skrll Exp $ # # This file is in the public domain. # @@ -220,12 +220,12 @@ CONFIGURE_ENV+= LIBS="${LIBS} -L${LOCALBASE}/lib -lintl" LIBTOOL= ${LOCALBASE}/bin/libtool # XXX Here we really need the following, but BUILD_DEPENDS doesn't # XXX support it at the moment. -# BUILD_DEPENDS+=libtool>=1.4.20010219nb2:../../devel/libtool +# BUILD_DEPENDS+=libtool>=1.4.20010219nb3:../../devel/libtool .if make(install-run-depends) || make(fetch-list-recursive) || make(show-depends-dirs) DEPENDS+= libtool>=1.4.20010219nb2:../../devel/libtool .endif .if defined(USE_LTDL) -DEPENDS+= libtool>=1.4.20010219nb2:../../devel/libtool +DEPENDS+= libtool>=1.4.20010219nb3:../../devel/libtool .endif .endif diff --git a/sysutils/amanda-common/pkg/PLIST b/sysutils/amanda-common/pkg/PLIST index 7dee278a080..441eb9c41c8 100644 --- a/sysutils/amanda-common/pkg/PLIST +++ b/sysutils/amanda-common/pkg/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2001/01/16 21:59:32 cjones Exp $ +@comment $NetBSD: PLIST,v 1.6 2001/03/12 11:23:07 skrll Exp $ +lib/libamanda-2.4.2.so lib/libamanda.a lib/libamanda.la lib/libamanda.so -lib/libamanda-2.4.2.so +lib/libamtape-2.4.2.so lib/libamtape.a lib/libamtape.la lib/libamtape.so -lib/libamtape-2.4.2.so man/man8/amanda.8 diff --git a/sysutils/amanda-server/pkg/PLIST b/sysutils/amanda-server/pkg/PLIST index f1e230064c7..c0298f2069f 100644 --- a/sysutils/amanda-server/pkg/PLIST +++ b/sysutils/amanda-server/pkg/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.7 2001/03/05 13:05:09 skrll Exp $ +@comment $NetBSD: PLIST,v 1.8 2001/03/12 11:23:08 skrll Exp $ +lib/libamserver-2.4.2.so lib/libamserver.a lib/libamserver.la lib/libamserver.so -lib/libamserver.so.0 -lib/libamserver.so.0.0 libexec/amcleanupdisk libexec/amidxtaped libexec/amindexd @@ -88,5 +87,5 @@ share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/config.site share/examples/amanda/disklist -@dirrm share/doc/amanda @dirrm share/examples/amanda +@dirrm share/doc/amanda |