pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg Fixed error message when url2pkg is r...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d62b7ea4cf7b
branches:  trunk
changeset: 348244:d62b7ea4cf7b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jun 10 21:43:04 2016 +0000

description:
Fixed error message when url2pkg is run from a non-pkgsrc directory.

See http://stackoverflow.com/q/36481302. Bump version.

diffstat:

 pkgtools/url2pkg/Makefile         |  4 ++--
 pkgtools/url2pkg/files/url2pkg.pl |  5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 307f95480db0 -r d62b7ea4cf7b pkgtools/url2pkg/Makefile
--- a/pkgtools/url2pkg/Makefile Fri Jun 10 21:21:42 2016 +0000
+++ b/pkgtools/url2pkg/Makefile Fri Jun 10 21:43:04 2016 +0000
@@ -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@localhost
diff -r 307f95480db0 -r d62b7ea4cf7b pkgtools/url2pkg/files/url2pkg.pl
--- a/pkgtools/url2pkg/files/url2pkg.pl Fri Jun 10 21:21:42 2016 +0000
+++ b/pkgtools/url2pkg/files/url2pkg.pl Fri Jun 10 21:43:04 2016 +0000
@@ -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 @@
                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>;



Home | Main Index | Thread Index | Old Index