diff options
author | joerg <joerg@pkgsrc.org> | 2012-01-02 12:15:48 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2012-01-02 12:15:48 +0000 |
commit | 68b23d850176bea71c4af09bfcec2d8e4aa9e938 (patch) | |
tree | d79a29f6093380bd6518e016ec26465705b7af47 | |
parent | 91bb58304f27315f5b3e90a86fdd1d392f1838fd (diff) | |
download | pkgsrc-68b23d850176bea71c4af09bfcec2d8e4aa9e938.tar.gz |
Make sure that only the real RCS ID gets embedded into the output.
Bump version, remove revision.
-rw-r--r-- | pkgtools/port2pkg/Makefile | 5 | ||||
-rwxr-xr-x | pkgtools/port2pkg/files/port2pkg.pl | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile index c139925c886..8f76b77b145 100644 --- a/pkgtools/port2pkg/Makefile +++ b/pkgtools/port2pkg/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2011/06/06 01:39:59 obache Exp $ +# $NetBSD: Makefile,v 1.36 2012/01/02 12:15:48 joerg Exp $ # -DISTNAME= port2pkg-1.11 -PKGREVISION= 8 +DISTNAME= port2pkg-1.12 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/port2pkg/files/port2pkg.pl b/pkgtools/port2pkg/files/port2pkg.pl index e826d503ac4..6ea47fb0c29 100755 --- a/pkgtools/port2pkg/files/port2pkg.pl +++ b/pkgtools/port2pkg/files/port2pkg.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# $NetBSD: port2pkg.pl,v 1.19 2007/07/10 15:27:57 joerg Exp $ +# $NetBSD: port2pkg.pl,v 1.20 2012/01/02 12:15:48 joerg Exp $ # require 'getopts.pl'; @@ -289,7 +289,7 @@ sub conv_PLIST { open(NEWPLIST, ">$pkgdir/new.$plist") || die "$pkgdir/new.$plist: $!\n"; - print NEWPLIST "\@comment \$NetBSD\$\n"; + print NEWPLIST "\@comment \$"."NetBSD\$\n"; my ($cat_added, $man_added); while (<OLDPLIST>) { s|\%\%([^\%]+)\%\%|\${$1}|g; @@ -323,7 +323,7 @@ sub add_NetBSD_ID { || open(MD5, "$portsdir/distinfo")) { open(NMD5, ">$pkgdir/distinfo") || die "$pkgdir/distinfo: $!\n"; - print NMD5 "\$NetBSD\$\n\n"; + print NMD5 "\$"."NetBSD\$\n\n"; while (<MD5>) { print NMD5 $_; } @@ -341,7 +341,7 @@ sub add_NetBSD_ID { || open(PATCH, "$portsdir/files/$patch")) { open(NPATCH, ">$pkgdir/patches/$patch") || die "$pkgdir/patches/$patch: $!\n"; - print NPATCH "\$NetBSD\$\n\n"; + print NPATCH "\$"."NetBSD\$\n\n"; while (<PATCH>) { if (/(FreeBSD)/i || /(#!.*perl)/) { |