Import of pkgsrc-2014Q1

pkgtools/port2pkg/Makefile

@@ -1,11 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2013/05/31 12:41:46 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.43 2014/03/03 03:30:55 obache Exp $
 
-DISTNAME=	port2pkg-1.13
-PKGREVISION=	2
+PKGNAME=	port2pkg-1.15
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Convert from a FreeBSD port to a NetBSD package

pkgtools/port2pkg/files/port2pkg.1

@@ -1,4 +1,4 @@
-.\"	$NetBSD: port2pkg.1,v 1.7 2006/09/16 06:37:40 wiz Exp $
+.\"	$NetBSD: port2pkg.1,v 1.8 2013/07/20 21:50:54 wiz Exp $
 .\"
 .\" Copyright (c) 1999 by Kazuki Sakamoto (sakamoto@NetBSD.org)
 .\" Absolutely no warranty.
@@ -50,7 +50,7 @@ Read
 in
 .Pa pkgsrc/doc/pkgsrc.txt .
 .Sh AUTHORS
-.An Kazuki Sakamoto Aq sakamoto@NetBSD.org
+.An Kazuki Sakamoto Aq Mt sakamoto@NetBSD.org
 .Sh BUGS
 .Nm
 is not a magic wand, please double-check converted pkgsrc.

pkgtools/port2pkg/files/port2pkg.pl

@@ -1,9 +1,10 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: port2pkg.pl,v 1.20 2012/01/02 12:15:48 joerg Exp $
+# $NetBSD: port2pkg.pl,v 1.22 2014/02/17 10:32:02 wiz Exp $
 #
 
-require 'getopts.pl';
+use Getopt::Std;
+
 $^W=1;
 use strict;
 use vars qw($opt_m);
@@ -14,7 +15,7 @@ my($namespace, $portname, $portversion, $distname,
    $pkgname, $pkgnameprefix, $pkgnamesuffix);
 my(@man, @cat);
 
-&usage_and_exit() if (! &Getopts('m:'));
+&usage_and_exit() if (! &getopts('m:'));
 $|=1;
 
 $portsdir = shift;
@@ -156,11 +157,7 @@ sub conv_Makefile {
 	while (<PORTS>) {
 		last if (! /^\#/);
 
-		if (/\$FreeBSD(: .*) \$/ || /\$Id(: .*) \$/) {
-			print PKG "\# FreeBSD Id$1\n";
-		} else {
-			print;
-		}
+		print;
 	}
 	print PKG;