summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-02-22 08:21:52 +0000
committerrillig <rillig@pkgsrc.org>2007-02-22 08:21:52 +0000
commite312114c7fbbfc4f18d7993a12b77c81a73b9783 (patch)
tree95045af05de06e781c8a6cc1ee0370c727468646
parent990ee366b66178649324ccbab3d7a928f22b59c9 (diff)
downloadpkgsrc-e312114c7fbbfc4f18d7993a12b77c81a73b9783.tar.gz
Updated url2pkg to 2.4.
Changes since 2.3: - When more than one directory exists in WRKDIR after extracting the distfile, a helpful comment is added to the generated Makefile.
-rw-r--r--pkgtools/url2pkg/Makefile4
-rw-r--r--pkgtools/url2pkg/files/url2pkg.pl5
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 2e6ec0fd67a..41614a2cd09 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2007/01/12 21:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2007/02/22 08:21:52 rillig Exp $
#
-DISTNAME= url2pkg-2.3
+DISTNAME= url2pkg-2.4
CATEGORIES= pkgtools
MASTER_SITES= # none
DISTFILES= # none
diff --git a/pkgtools/url2pkg/files/url2pkg.pl b/pkgtools/url2pkg/files/url2pkg.pl
index ceee57eb0d5..656b82af933 100644
--- a/pkgtools/url2pkg/files/url2pkg.pl
+++ b/pkgtools/url2pkg/files/url2pkg.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: url2pkg.pl,v 1.4 2007/01/12 21:35:52 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.5 2007/02/22 08:21:53 rillig Exp $
#
use strict;
@@ -333,7 +333,8 @@ sub adjust_package_from_extracted_distfiles()
}
$abs_wrksrc = "${abs_wrkdir}/$files[0]";
} else {
- push(@build_vars, ["WRKSRC", "\${WRKDIR}"]);
+ push(@build_vars, ["WRKSRC", "\${WRKDIR}" .
+ ((@files > 1) ? " # More than one possibility -- please check manually." : "")]);
$abs_wrksrc = $abs_wrkdir;
}