diff options
| -rw-r--r-- | devel/libtool/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/libtool/files/patch-sum | 4 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ab | 36 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
4 files changed, 38 insertions, 14 deletions
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index a0ae8da4435..c28b265ca97 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.2 2001/02/27 08:20:24 skrll Exp $ +# $NetBSD: Makefile.common,v 1.3 2001/02/28 10:16:57 skrll Exp $ # DISTNAME= libtool-ml-20010219 PKGPFX= ${DISTNAME:C/ml-/1.4./} -PKGREV= nb1 +PKGREV= nb2 WRKSRC= ${WRKDIR}/libtool-ml CATEGORIES= devel pkgtools MASTER_SITES= ftp://ftp.ffii.org/pub/libtool/snap/ diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum index 12a1d11453a..5e1e60ab8d8 100644 --- a/devel/libtool/files/patch-sum +++ b/devel/libtool/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.26 2001/02/27 08:20:25 skrll Exp $ +$NetBSD: patch-sum,v 1.27 2001/02/28 10:16:58 skrll Exp $ MD5 (patch-aa) = fb45156202da4751206e36dd0be5dabc -MD5 (patch-ab) = 23d3086aade5736009530a98014fff59 +MD5 (patch-ab) = abd3b34a1f88b017bc43a598327feee9 MD5 (patch-ac) = a5da475693a57e16bd8462793f87639e MD5 (patch-ad) = f715e7126f5dd7fdece8d61045c74100 MD5 (patch-ae) = 70312d73e1108c7f97ecf56db2e87ad8 diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 2e0486236ad..33f744264f5 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,8 +1,20 @@ -$NetBSD: patch-ab,v 1.16 2001/02/27 08:20:25 skrll Exp $ +$NetBSD: patch-ab,v 1.17 2001/02/28 10:16:58 skrll Exp $ --- ltmain.sh.orig Mon Feb 19 05:05:23 2001 +++ ltmain.sh -@@ -946,7 +946,6 @@ +@@ -508,9 +508,8 @@ + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then +- echo "$modename: unable to infer tagged configuration" +- echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 ++ echo "$modename: warning: unable to infer tagged configuration" 1>&2 ++ echo "$modename: warning: using the default" 1>&2 + # else + # echo "$modename: using $tagname tagged configuration" + fi +@@ -946,7 +945,6 @@ continue ;; release) @@ -10,7 +22,19 @@ $NetBSD: patch-ab,v 1.16 2001/02/27 08:20:25 skrll Exp $ prev= continue ;; -@@ -2397,7 +2396,7 @@ +@@ -1447,9 +1445,8 @@ + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then +- echo "$modename: unable to infer tagged configuration" +- echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 ++ echo "$modename: warning: unable to infer tagged configuration" ++ echo "$modename: warning: using the default" 1>&2 + # else + # echo "$modename: using $tagname tagged configuration" + fi +@@ -2397,7 +2394,7 @@ # Check that each of the things are valid numbers. case "$current" in @@ -19,7 +43,7 @@ $NetBSD: patch-ab,v 1.16 2001/02/27 08:20:25 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 +2403,7 @@ esac case "$revision" in @@ -28,7 +52,7 @@ $NetBSD: patch-ab,v 1.16 2001/02/27 08:20:25 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 +2412,7 @@ esac case "$age" in @@ -37,7 +61,7 @@ $NetBSD: patch-ab,v 1.16 2001/02/27 08:20:25 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 +2609,9 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ce7c1533490..6377c8615f9 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.674 2001/02/27 08:20:27 skrll Exp $ +# $NetBSD: bsd.pkg.mk,v 1.675 2001/02/28 10:16:58 skrll Exp $ # # This file is in the public domain. # @@ -227,12 +227,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.3.5nb11:../../devel/libtool +# BUILD_DEPENDS+=libtool>=1.4.20010219nb2:../../devel/libtool .if make(install-run-depends) || make(fetch-list-recursive) || make(show-depends-dirs) -DEPENDS+= libtool>=1.4.20010219nb1:../../devel/libtool +DEPENDS+= libtool>=1.4.20010219nb2:../../devel/libtool .endif .if defined(USE_LTDL) -DEPENDS+= libtool>=1.4.20010219nb1:../../devel/libtool +DEPENDS+= libtool>=1.4.20010219nb2:../../devel/libtool .endif .endif |