Fri May 18 09:42:33 2018 UTC ()
Fix Perl error

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


(hauke)
diff -r1.46 -r1.47 pkgsrc/pkgtools/port2pkg/Makefile
diff -r1.22 -r1.23 pkgsrc/pkgtools/port2pkg/files/port2pkg.pl
cvs diff -r1.46 -r1.47 pkgsrc/pkgtools/port2pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/port2pkg/Makefile 2016/07/09 06:38:49 1.46
+++ pkgsrc/pkgtools/port2pkg/Makefile 2018/05/18 09:42:33 1.47
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.46 2016/07/09 06:38:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.47 2018/05/18 09:42:33 hauke Exp $
2 2
3PKGNAME= port2pkg-1.15 3PKGNAME= port2pkg-1.15
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Convert from a FreeBSD port to a NetBSD package 8COMMENT= Convert from a FreeBSD port to a NetBSD package
9 9
10DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint 10DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint
11 11
12WRKSRC= ${WRKDIR} 12WRKSRC= ${WRKDIR}
13NO_BUILD= yes 13NO_BUILD= yes
14USE_TOOLS+= gtar perl:run 14USE_TOOLS+= gtar perl:run
15 15
16INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 16INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
17 17
cvs diff -r1.22 -r1.23 pkgsrc/pkgtools/port2pkg/files/port2pkg.pl (expand / switch to unified diff)

--- pkgsrc/pkgtools/port2pkg/files/port2pkg.pl 2014/02/17 10:32:02 1.22
+++ pkgsrc/pkgtools/port2pkg/files/port2pkg.pl 2018/05/18 09:42:33 1.23
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/usr/bin/env perl 1#!/usr/bin/env perl
2# 2#
3# $NetBSD: port2pkg.pl,v 1.22 2014/02/17 10:32:02 wiz Exp $ 3# $NetBSD: port2pkg.pl,v 1.23 2018/05/18 09:42:33 hauke Exp $
4# 4#
5 5
6use Getopt::Std; 6use Getopt::Std;
7 7
8$^W=1; 8$^W=1;
9use strict; 9use strict;
10use vars qw($opt_m); 10use vars qw($opt_m);
11my($maintainer) = "pkgsrc-users\@NetBSD.org"; 11my($maintainer) = "pkgsrc-users\@NetBSD.org";
12my($makefile, $master_site_subdir, $extract_cmd); 12my($makefile, $master_site_subdir, $extract_cmd);
13my($portsdir, $pkgdir); 13my($portsdir, $pkgdir);
14my($namespace, $portname, $portversion, $distname, 14my($namespace, $portname, $portversion, $distname,
15 $pkgname, $pkgnameprefix, $pkgnamesuffix); 15 $pkgname, $pkgnameprefix, $pkgnamesuffix);
16my(@man, @cat); 16my(@man, @cat);
@@ -116,28 +116,28 @@ sub read_Makefile { @@ -116,28 +116,28 @@ sub read_Makefile {
116 116
117 if (defined($extract_cmd) && $extract_cmd ne "") { 117 if (defined($extract_cmd) && $extract_cmd ne "") {
118 if ($extract_before_args ne "") { 118 if ($extract_before_args ne "") {
119 $extract_before_args = " $extract_before_args"; 119 $extract_before_args = " $extract_before_args";
120 } 120 }
121 if ($extract_after_args ne "") { 121 if ($extract_after_args ne "") {
122 $extract_after_args = " $extract_after_args"; 122 $extract_after_args = " $extract_after_args";
123 } 123 }
124 $extract_cmd = "$extract_cmd$extract_before_args" . 124 $extract_cmd = "$extract_cmd$extract_before_args" .
125 " \${DOWNLOADED_DISTFILE}$extract_after_args"; 125 " \${DOWNLOADED_DISTFILE}$extract_after_args";
126 } 126 }
127 127
128 if (defined($distname)) { 128 if (defined($distname)) {
129 $distname =~ s/\${PORTNAME}/$portname/; 129 $distname =~ s/\$\{PORTNAME}/$portname/;
130 $distname =~ s/\${PORTVERSION}/$portversion/; 130 $distname =~ s/\$\{PORTVERSION}/$portversion/;
131 131
132 if ($distname ne "$portname-$portversion") { 132 if ($distname ne "$portname-$portversion") {
133 $pkgname = "$portname-$portversion"; 133 $pkgname = "$portname-$portversion";
134 } 134 }
135 } else { 135 } else {
136 $distname = "$portname-$portversion"; 136 $distname = "$portname-$portversion";
137 } 137 }
138 if (defined($pkgnameprefix)) { 138 if (defined($pkgnameprefix)) {
139 $pkgname = $distname unless (defined($pkgname)); 139 $pkgname = $distname unless (defined($pkgname));
140 $pkgname = $pkgnameprefix . $pkgname; 140 $pkgname = $pkgnameprefix . $pkgname;
141 } 141 }
142 if (defined($pkgnamesuffix)) { 142 if (defined($pkgnamesuffix)) {
143 $pkgname = $distname unless (defined($pkgname)); 143 $pkgname = $distname unless (defined($pkgname));