CVS commit: pkgsrc/pkgtools/port2pkg

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri May 18 09:42:33 UTC 2018

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

Log Message:
Fix Perl error

Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE PORTNAME}/


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/pkgtools/port2pkg/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/pkgtools/port2pkg/files/port2pkg.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/port2pkg/Makefile
diff -u pkgsrc/pkgtools/port2pkg/Makefile:1.46 pkgsrc/pkgtools/port2pkg/Makefile:1.47
--- pkgsrc/pkgtools/port2pkg/Makefile:1.46      Sat Jul  9 06:38:49 2016
+++ pkgsrc/pkgtools/port2pkg/Makefile   Fri May 18 09:42:33 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2016/07/09 06:38:49 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2018/05/18 09:42:33 hauke Exp $
 
 PKGNAME=       port2pkg-1.15
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/pkgtools/port2pkg/files/port2pkg.pl
diff -u pkgsrc/pkgtools/port2pkg/files/port2pkg.pl:1.22 pkgsrc/pkgtools/port2pkg/files/port2pkg.pl:1.23
--- pkgsrc/pkgtools/port2pkg/files/port2pkg.pl:1.22     Mon Feb 17 10:32:02 2014
+++ pkgsrc/pkgtools/port2pkg/files/port2pkg.pl  Fri May 18 09:42:33 2018
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: port2pkg.pl,v 1.22 2014/02/17 10:32:02 wiz Exp $
+# $NetBSD: port2pkg.pl,v 1.23 2018/05/18 09:42:33 hauke Exp $
 #
 
 use Getopt::Std;
@@ -126,8 +126,8 @@ sub read_Makefile {
        }
 
        if (defined($distname)) {
-               $distname =~ s/\${PORTNAME}/$portname/;
-               $distname =~ s/\${PORTVERSION}/$portversion/;
+               $distname =~ s/\$\{PORTNAME}/$portname/;
+               $distname =~ s/\$\{PORTVERSION}/$portversion/;
 
                if ($distname ne "$portname-$portversion") {
                        $pkgname = "$portname-$portversion";