From d2052bc34dcd7032ffa9bb740d7a554032cf5eca Mon Sep 17 00:00:00 2001 From: rillig Date: Sat, 5 Nov 2005 17:23:35 +0000 Subject: Replaced ${PKGNAME:C...} with the equivalent ${PKGBASE}. --- pkgtools/port2pkg/files/port2pkg.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgtools/port2pkg/files') diff --git a/pkgtools/port2pkg/files/port2pkg.pl b/pkgtools/port2pkg/files/port2pkg.pl index 98b7a0dd970..8d0e84a8aa8 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.13 2004/01/10 16:27:06 cjep Exp $ +# $NetBSD: port2pkg.pl,v 1.14 2005/11/05 17:23:35 rillig Exp $ # require 'getopts.pl'; @@ -180,7 +180,7 @@ sub conv_Makefile { s|^\.include |.include \"../../mk/bsd.pkg.mk\"|; s|^FETCH_(DEPENDS)|BUILD_$1|; s|^LIB_(DEPENDS)|$1|; - s|\$\{PORTNAME\}|\${PKGNAME:C/-[^-]*\$//}|g; + s|\$\{PORTNAME\}|\${PKGBASE}|g; s|\$\{PORTSDIR\}|../..|g; s|PLIST_SUB|PLIST_SUBST|; -- cgit v1.2.3