diff options
| author | rillig <rillig> | 2016-06-10 21:43:04 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2016-06-10 21:43:04 +0000 |
| commit | ed653160c8db20207f6467bc0d3f0737db4c797f (patch) | |
| tree | c773fb2687f0918fd52265c8477005f065ed1908 /pkgtools | |
| parent | eeba0b2da1aa8edf6aa2dae3d4961733dc703072 (diff) | |
| download | pkgsrc-ed653160c8db20207f6467bc0d3f0737db4c797f.tar.gz | |
Fixed error message when url2pkg is run from a non-pkgsrc directory.
See http://stackoverflow.com/q/36481302. Bump version.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg.pl | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 7889f8b61a3..09c64c92aa3 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.81 2016/06/01 12:45:59 wiz Exp $ +# $NetBSD: Makefile,v 1.82 2016/06/10 21:43:04 rillig Exp $ -PKGNAME= url2pkg-2.25 +PKGNAME= url2pkg-2.26 CATEGORIES= pkgtools MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/pkgtools/url2pkg/files/url2pkg.pl b/pkgtools/url2pkg/files/url2pkg.pl index d812daea52f..05492874b24 100644 --- a/pkgtools/url2pkg/files/url2pkg.pl +++ b/pkgtools/url2pkg/files/url2pkg.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: url2pkg.pl,v 1.31 2016/06/01 12:45:59 wiz Exp $ +# $NetBSD: url2pkg.pl,v 1.32 2016/06/10 21:43:04 rillig Exp $ # # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -507,14 +507,13 @@ sub adjust_package_from_extracted_distfiles() unlink("Makefile-url2pkg.new"); die("$0: ERROR: didn't find the url2pkg marker in the file.\n"); } - } sub main() { my $url; if (!-f "../../mk/bsd.pkg.mk") { - die("$0 must be run from a package directory (.../pkgsrc/category/package)."); + die("ERROR: $0 must be run from a package directory (.../pkgsrc/category/package).\n"); } my @extract_cookie = <w*/.extract_done>; |