summaryrefslogtreecommitdiff
path: root/pkgtools/port2pkg
diff options
context:
space:
mode:
authorwiz <wiz>2002-05-19 15:41:36 +0000
committerwiz <wiz>2002-05-19 15:41:36 +0000
commitb08dd32713cf4d1453d23c037a024f39d491d289 (patch)
tree8a0b8da8328285c333c86093312e8a477aec6d50 /pkgtools/port2pkg
parent58ae61fea77ac8622d6e4531f60f6c2fa7ec685f (diff)
downloadpkgsrc-b08dd32713cf4d1453d23c037a024f39d491d289.tar.gz
Convert ${PORTNAME} to ${PKGNAME}, from YAMAMOTO Takashi in pkg/16772.
Bump version to 1.11.
Diffstat (limited to 'pkgtools/port2pkg')
-rw-r--r--pkgtools/port2pkg/Makefile4
-rwxr-xr-xpkgtools/port2pkg/files/port2pkg.pl3
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile
index 0cd410ba600..6190363adc4 100644
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2002/01/01 17:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2002/05/19 15:41:36 wiz Exp $
#
-DISTNAME= port2pkg-1.10
+DISTNAME= port2pkg-1.11
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/port2pkg/files/port2pkg.pl b/pkgtools/port2pkg/files/port2pkg.pl
index d22215007a5..e5a690be63c 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.10 2002/01/01 17:01:01 wiz Exp $
+# $NetBSD: port2pkg.pl,v 1.11 2002/05/19 15:41:37 wiz Exp $
#
require 'getopts.pl';
@@ -180,6 +180,7 @@ sub conv_Makefile {
s|^\.include <bsd.port.mk>|.include \"../../mk/bsd.pkg.mk\"|;
s|^FETCH_(DEPENDS)|BUILD_$1|;
s|^LIB_(DEPENDS)|$1|;
+ s|\$\{PORTNAME\}|\${PKGNAME:C/-[^-]*\$//}|g;
s|\$\{PORTSDIR\}|../..|g;
s|PLIST_SUB|PLIST_SUBST|;