Mon Jan 2 12:15:48 2012 UTC ()
Make sure that only the real RCS ID gets embedded into the output.
Bump version, remove revision.


(joerg)
diff -r1.35 -r1.36 pkgsrc/pkgtools/port2pkg/Makefile
diff -r1.19 -r1.20 pkgsrc/pkgtools/port2pkg/files/port2pkg.pl
cvs diff -r1.35 -r1.36 pkgsrc/pkgtools/port2pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/port2pkg/Makefile 2011/06/06 01:39:59 1.35
+++ pkgsrc/pkgtools/port2pkg/Makefile 2012/01/02 12:15:48 1.36
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.35 2011/06/06 01:39:59 obache Exp $ 1# $NetBSD: Makefile,v 1.36 2012/01/02 12:15:48 joerg Exp $
2# 2#
3 3
4DISTNAME= port2pkg-1.11 4DISTNAME= port2pkg-1.12
5PKGREVISION= 8 
6CATEGORIES= pkgtools 5CATEGORIES= pkgtools
7MASTER_SITES= # empty 6MASTER_SITES= # empty
8DISTFILES= # empty 7DISTFILES= # empty
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= Convert from a FreeBSD port to a NetBSD package 10COMMENT= Convert from a FreeBSD port to a NetBSD package
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint 14DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint
16 15
17WRKSRC= ${WRKDIR} 16WRKSRC= ${WRKDIR}
18NO_BUILD= yes 17NO_BUILD= yes
cvs diff -r1.19 -r1.20 pkgsrc/pkgtools/port2pkg/files/port2pkg.pl (expand / switch to unified diff)

--- pkgsrc/pkgtools/port2pkg/files/port2pkg.pl 2007/07/10 15:27:57 1.19
+++ pkgsrc/pkgtools/port2pkg/files/port2pkg.pl 2012/01/02 12:15:48 1.20
@@ -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.19 2007/07/10 15:27:57 joerg Exp $ 3# $NetBSD: port2pkg.pl,v 1.20 2012/01/02 12:15:48 joerg Exp $
4# 4#
5 5
6require 'getopts.pl'; 6require 'getopts.pl';
7$^W=1; 7$^W=1;
8use strict; 8use strict;
9use vars qw($opt_m); 9use vars qw($opt_m);
10my($maintainer) = "pkgsrc-users\@NetBSD.org"; 10my($maintainer) = "pkgsrc-users\@NetBSD.org";
11my($makefile, $master_site_subdir, $extract_cmd); 11my($makefile, $master_site_subdir, $extract_cmd);
12my($portsdir, $pkgdir); 12my($portsdir, $pkgdir);
13my($namespace, $portname, $portversion, $distname, 13my($namespace, $portname, $portversion, $distname,
14 $pkgname, $pkgnameprefix, $pkgnamesuffix); 14 $pkgname, $pkgnameprefix, $pkgnamesuffix);
15my(@man, @cat); 15my(@man, @cat);
16 16
@@ -279,27 +279,27 @@ sub add_manual { @@ -279,27 +279,27 @@ sub add_manual {
279} 279}
280 280
281sub conv_PLIST { 281sub conv_PLIST {
282 my ($file, $plist); 282 my ($file, $plist);
283 return 0 if (!opendir(PKGDIR, "$pkgdir")); 283 return 0 if (!opendir(PKGDIR, "$pkgdir"));
284 while ($plist = readdir(PKGDIR)) { 284 while ($plist = readdir(PKGDIR)) {
285 next if (!($plist =~ /^PLIST/)); 285 next if (!($plist =~ /^PLIST/));
286 286
287 open(OLDPLIST, "$pkgdir/$plist") 287 open(OLDPLIST, "$pkgdir/$plist")
288 || die "$pkgdir/$plist: $!\n"; 288 || die "$pkgdir/$plist: $!\n";
289 open(NEWPLIST, ">$pkgdir/new.$plist") 289 open(NEWPLIST, ">$pkgdir/new.$plist")
290 || die "$pkgdir/new.$plist: $!\n"; 290 || die "$pkgdir/new.$plist: $!\n";
291 291
292 print NEWPLIST "\@comment \$NetBSD\$\n"; 292 print NEWPLIST "\@comment \$"."NetBSD\$\n";
293 my ($cat_added, $man_added); 293 my ($cat_added, $man_added);
294 while (<OLDPLIST>) { 294 while (<OLDPLIST>) {
295 s|\%\%([^\%]+)\%\%|\${$1}|g; 295 s|\%\%([^\%]+)\%\%|\${$1}|g;
296 next if (/^\@.*ldconfig/); 296 next if (/^\@.*ldconfig/);
297 if (defined($cat_added) && $cat_added == 0 && /^[d-z]/){ 297 if (defined($cat_added) && $cat_added == 0 && /^[d-z]/){
298 &add_manual(*NEWPLIST, "cat"); 298 &add_manual(*NEWPLIST, "cat");
299 $cat_added++; 299 $cat_added++;
300 } 300 }
301 if (defined($man_added) && $man_added == 0 && /^[n-z]/){ 301 if (defined($man_added) && $man_added == 0 && /^[n-z]/){
302 &add_manual(*NEWPLIST, "man"); 302 &add_manual(*NEWPLIST, "man");
303 $man_added++; 303 $man_added++;
304 } 304 }
305 305
@@ -313,45 +313,45 @@ sub conv_PLIST { @@ -313,45 +313,45 @@ sub conv_PLIST {
313 close(NEWPLIST); 313 close(NEWPLIST);
314 close(OLDPLIST); 314 close(OLDPLIST);
315 rename("$pkgdir/new.$plist", "$pkgdir/$plist"); 315 rename("$pkgdir/new.$plist", "$pkgdir/$plist");
316 } 316 }
317 closedir(PKGDIR); 317 closedir(PKGDIR);
318} 318}
319 319
320sub add_NetBSD_ID { 320sub add_NetBSD_ID {
321 my ($patch); 321 my ($patch);
322 if (open(MD5, "$portsdir/files/md5") 322 if (open(MD5, "$portsdir/files/md5")
323 || open(MD5, "$portsdir/distinfo")) { 323 || open(MD5, "$portsdir/distinfo")) {
324 open(NMD5, ">$pkgdir/distinfo") 324 open(NMD5, ">$pkgdir/distinfo")
325 || die "$pkgdir/distinfo: $!\n"; 325 || die "$pkgdir/distinfo: $!\n";
326 print NMD5 "\$NetBSD\$\n\n"; 326 print NMD5 "\$"."NetBSD\$\n\n";
327 while (<MD5>) { 327 while (<MD5>) {
328 print NMD5 $_; 328 print NMD5 $_;
329 } 329 }
330 close(NMD5); 330 close(NMD5);
331 close(MD5); 331 close(MD5);
332 } 332 }
333 333
334 opendir(PATCHDIR, "$portsdir/patches") || 334 opendir(PATCHDIR, "$portsdir/patches") ||
335 opendir(PATCHDIR, "$portsdir/files") || 335 opendir(PATCHDIR, "$portsdir/files") ||
336 return 0; 336 return 0;
337 while ($patch = readdir(PATCHDIR)) { 337 while ($patch = readdir(PATCHDIR)) {
338 if ($patch eq "\." || $patch eq "\.." 338 if ($patch eq "\." || $patch eq "\.."
339 || $patch eq "CVS") {next;} 339 || $patch eq "CVS") {next;}
340 if (open(PATCH, "$portsdir/patches/$patch") 340 if (open(PATCH, "$portsdir/patches/$patch")
341 || open(PATCH, "$portsdir/files/$patch")) { 341 || open(PATCH, "$portsdir/files/$patch")) {
342 open(NPATCH, ">$pkgdir/patches/$patch") 342 open(NPATCH, ">$pkgdir/patches/$patch")
343 || die "$pkgdir/patches/$patch: $!\n"; 343 || die "$pkgdir/patches/$patch: $!\n";
344 print NPATCH "\$NetBSD\$\n\n"; 344 print NPATCH "\$"."NetBSD\$\n\n";
345 while (<PATCH>) { 345 while (<PATCH>) {
346 if (/(FreeBSD)/i || 346 if (/(FreeBSD)/i ||
347 /(#!.*perl)/) { 347 /(#!.*perl)/) {
348 print "WARN: $pkgdir/patches/" . 348 print "WARN: $pkgdir/patches/" .
349 "$patch includes \"$1\".\n"; 349 "$patch includes \"$1\".\n";
350 } 350 }
351 print NPATCH $_; 351 print NPATCH $_;
352 } 352 }
353 close(NPATCH); 353 close(NPATCH);
354 close(PATCH); 354 close(PATCH);
355 } 355 }
356 } 356 }
357 closedir(PATCHDIR); 357 closedir(PATCHDIR);