Mon Feb 17 10:32:02 2014 UTC ()
Do not keep FreeBSD Id, since imports are one-offs anyway.
Bump version.


(wiz)
diff -r1.41 -r1.42 pkgsrc/pkgtools/port2pkg/Makefile
diff -r1.21 -r1.22 pkgsrc/pkgtools/port2pkg/files/port2pkg.pl
cvs diff -r1.41 -r1.42 pkgsrc/pkgtools/port2pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/port2pkg/Makefile 2013/11/19 10:46:06 1.41
+++ pkgsrc/pkgtools/port2pkg/Makefile 2014/02/17 10:32:02 1.42
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.41 2013/11/19 10:46:06 tron Exp $ 1# $NetBSD: Makefile,v 1.42 2014/02/17 10:32:02 wiz Exp $
2 2
3DISTNAME= port2pkg-1.14 3DISTNAME= port2pkg-1.15
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Convert from a FreeBSD port to a NetBSD package 9COMMENT= Convert from a FreeBSD port to a NetBSD package
10 10
11DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint 11DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint
12 12
13WRKSRC= ${WRKDIR} 13WRKSRC= ${WRKDIR}
14NO_BUILD= yes 14NO_BUILD= yes
15USE_TOOLS+= gtar perl:run 15USE_TOOLS+= gtar perl:run
16 16
cvs diff -r1.21 -r1.22 pkgsrc/pkgtools/port2pkg/files/port2pkg.pl (expand / switch to unified diff)

--- pkgsrc/pkgtools/port2pkg/files/port2pkg.pl 2013/11/19 10:46:06 1.21
+++ pkgsrc/pkgtools/port2pkg/files/port2pkg.pl 2014/02/17 10:32:02 1.22
@@ -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.21 2013/11/19 10:46:06 tron Exp $ 3# $NetBSD: port2pkg.pl,v 1.22 2014/02/17 10:32:02 wiz 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);
@@ -147,31 +147,27 @@ sub read_Makefile { @@ -147,31 +147,27 @@ sub read_Makefile {
147 147
148sub conv_Makefile { 148sub conv_Makefile {
149 open(PORTS, "$portsdir/Makefile") 149 open(PORTS, "$portsdir/Makefile")
150 || die "$portsdir/Makefile: $!\n"; 150 || die "$portsdir/Makefile: $!\n";
151 open(PKG, ">$pkgdir/Makefile") 151 open(PKG, ">$pkgdir/Makefile")
152 || die "$pkgdir/Makefile: $!\n"; 152 || die "$pkgdir/Makefile: $!\n";
153 153
154 print PKG "# \$Net" . "BSD\$\n"; 154 print PKG "# \$Net" . "BSD\$\n";
155 155
156 # header 156 # header
157 while (<PORTS>) { 157 while (<PORTS>) {
158 last if (! /^\#/); 158 last if (! /^\#/);
159 159
160 if (/\$FreeBSD(: .*) \$/ || /\$Id(: .*) \$/) { 160 print;
161 print PKG "\# FreeBSD Id$1\n"; 
162 } else { 
163 print; 
164 } 
165 } 161 }
166 print PKG; 162 print PKG;
167 163
168 # body 164 # body
169 my ($nextline, $remove, $master_sites, $noportdocs); 165 my ($nextline, $remove, $master_sites, $noportdocs);
170 while (<PORTS>) { 166 while (<PORTS>) {
171 if (/\\$/) { 167 if (/\\$/) {
172 $nextline++; 168 $nextline++;
173 next if ($remove); 169 next if ($remove);
174 } else { 170 } else {
175 $nextline = 0; 171 $nextline = 0;
176 if ($remove) { 172 if ($remove) {
177 $remove = 0; 173 $remove = 0;