CVS commit: [pkgsrc-2019Q3] pkgsrc/pkgtools/url2pkg

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Oct  3 15:23:02 UTC 2019

Modified Files:
        pkgsrc/pkgtools/url2pkg [pkgsrc-2019Q3]: Makefile
        pkgsrc/pkgtools/url2pkg/files [pkgsrc-2019Q3]: url2pkg.pl

Log Message:
Pullup ticket #6061 - requested by rillig
pkgtools/url2pkg: bugfix

Revisions pulled up:
- pkgtools/url2pkg/Makefile                                     1.101
- pkgtools/url2pkg/files/url2pkg.pl                             1.74

---
   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Tue Oct  1 18:43:46 UTC 2019

   Modified Files:
           pkgsrc/pkgtools/url2pkg: Makefile
           pkgsrc/pkgtools/url2pkg/files: url2pkg.pl

   Log Message:
   pkgtools/url2pkg: update to 2.37

   Changes since 2.36:

   * Fixed generation of the package Makefile. Due to a typo, the line that
     included bsd.pkg.mk had been omitted, making any generated package fail.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.100.2.1 pkgsrc/pkgtools/url2pkg/Makefile
cvs rdiff -u -r1.73 -r1.73.2.1 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/url2pkg/Makefile
diff -u pkgsrc/pkgtools/url2pkg/Makefile:1.100 pkgsrc/pkgtools/url2pkg/Makefile:1.100.2.1
--- pkgsrc/pkgtools/url2pkg/Makefile:1.100      Thu Sep 12 18:23:00 2019
+++ pkgsrc/pkgtools/url2pkg/Makefile    Thu Oct  3 15:23:02 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2019/09/12 18:23:00 rillig Exp $
+# $NetBSD: Makefile,v 1.100.2.1 2019/10/03 15:23:02 bsiegert Exp $
 
-PKGNAME=       url2pkg-2.36
+PKGNAME=       url2pkg-2.37
 CATEGORIES=    pkgtools
 
 MAINTAINER=    rillig%NetBSD.org@localhost

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.pl
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.73 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.73.2.1
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.73       Fri Sep 13 13:31:39 2019
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.pl    Thu Oct  3 15:23:02 2019
@@ -1,5 +1,5 @@
 #! @PERL5@
-# $NetBSD: url2pkg.pl,v 1.73 2019/09/13 13:31:39 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.73.2.1 2019/10/03 15:23:02 bsiegert Exp $
 #
 
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -838,7 +838,7 @@ sub adjust_package_from_extracted_distfi
        $lines->add(@bl3_lines);
        $lines->add(map { $_ = ".include \"$_\"" } @includes);
 
-       $lines->add($makefile_lines->[$marker_index + 1 .. $#$makefile_lines]);
+       $lines->add(@$makefile_lines[$marker_index + 1 .. $#$makefile_lines]);
 
        $lines->append("CATEGORIES", join(" ", @categories));