Received: by mail.netbsd.org (Postfix, from userid 605) id AB9A784DD0; Fri, 18 May 2018 09:42:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2FCBF84DCE for ; Fri, 18 May 2018 09:42:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ss2TCrOEXY3M for ; Fri, 18 May 2018 09:42:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B233E84DBB for ; Fri, 18 May 2018 09:42:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A8791FBEC; Fri, 18 May 2018 09:42:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1526636553131280" MIME-Version: 1.0 Date: Fri, 18 May 2018 09:42:33 +0000 From: "Hauke Fath" Subject: CVS commit: pkgsrc/pkgtools/port2pkg To: pkgsrc-changes@NetBSD.org Reply-To: hauke@netbsd.org X-Mailer: log_accum Message-Id: <20180518094233.A8791FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1526636553131280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1526636553131280 Content-Disposition: inline Content-Length: 1371 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 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"; --_----------=_1526636553131280--