summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-09-14 22:40:57 +0000
committerwiz <wiz@pkgsrc.org>2001-09-14 22:40:57 +0000
commitf6b217ba973bd61734591b10e54d69a2ddac7c37 (patch)
tree824ea50787ccf849341bd09333f8d4701ef04fe0 /pkgtools
parent08f17368d4cc1644f4ab60cc150d8f4ddbd03787 (diff)
downloadpkgsrc-f6b217ba973bd61734591b10e54d69a2ddac7c37.tar.gz
Update to 0.101: Fixes for Solaris by Stoned Elipot from pkg/13877.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkgdiff/Makefile6
-rwxr-xr-xpkgtools/pkgdiff/files/mkpatches.pl6
-rwxr-xr-xpkgtools/pkgdiff/files/patchdiff.pl4
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 22fc546d463..d149c2a6925 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:42 agc Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/14 22:40:57 wiz Exp $
#
-DISTNAME= pkgdiff-0.100
+DISTNAME= pkgdiff-0.101
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
@@ -24,6 +24,7 @@ MAKE_ENV= PKGSRCDIR=${PKGSRCDIR}
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
+BUILD_DEPENDS+= groff-*:../../textproc/groff
NROFF= gnroff
.else
NROFF= nroff
@@ -32,6 +33,7 @@ NROFF= nroff
do-build:
.for FILE in mkpatches patchdiff
${SED} -e 's|@PREFIX@|${PREFIX}|g' \
+ -e 's|@MAKE@|${MAKE}|g' \
< ${FILESDIR}/${FILE}.pl \
> ${WRKSRC}/${FILE}
.endfor
diff --git a/pkgtools/pkgdiff/files/mkpatches.pl b/pkgtools/pkgdiff/files/mkpatches.pl
index 4214d34b322..107b7314799 100755
--- a/pkgtools/pkgdiff/files/mkpatches.pl
+++ b/pkgtools/pkgdiff/files/mkpatches.pl
@@ -1,6 +1,6 @@
#!@PREFIX@/bin/perl
#
-# $NetBSD: mkpatches.pl,v 1.5 2001/05/24 17:02:44 abs Exp $
+# $NetBSD: mkpatches.pl,v 1.6 2001/09/14 22:40:57 wiz Exp $
#
# mkpatches: creates a set of patches patch-aa, patch-ab, ...
# in work/.newpatches by looking for *.orig files in and below
@@ -49,7 +49,7 @@ EOF
# get WRKDIR
-$wrkdir=`make show-var VARNAME=WRKDIR` or
+$wrkdir=`@MAKE@ show-var VARNAME=WRKDIR` or
die ("can't find WRKDIR -- wrong dir?");
chomp($wrkdir);
@@ -64,7 +64,7 @@ create_patchdir();
# get WRKSRC
-$wrksrc=`make show-var VARNAME=WRKSRC` or
+$wrksrc=`@MAKE@ show-var VARNAME=WRKSRC` or
die ("can't find WRKSRC -- wrong dir?");
chomp($wrksrc);
diff --git a/pkgtools/pkgdiff/files/patchdiff.pl b/pkgtools/pkgdiff/files/patchdiff.pl
index fd0714faf9a..08b4f4fd912 100755
--- a/pkgtools/pkgdiff/files/patchdiff.pl
+++ b/pkgtools/pkgdiff/files/patchdiff.pl
@@ -1,6 +1,6 @@
#!@PREFIX@/bin/perl
#
-# $NetBSD: patchdiff.pl,v 1.3 2001/03/31 20:19:04 skrll Exp $
+# $NetBSD: patchdiff.pl,v 1.4 2001/09/14 22:40:57 wiz Exp $
#
# patchdiff: compares a set of patches patch-aa, patch-ab, ... in
# $WRKDIR/.newpatches in the with another set in patches.
@@ -65,7 +65,7 @@ $thisdir=cwd();
chomp($thisdir);
$oldpatchdir=$thisdir."/patches";
-$wrkdir=`make show-var VARNAME=WRKDIR` or
+$wrkdir=`@MAKE@ show-var VARNAME=WRKDIR` or
die ("can't find WRKDIR -- wrong dir?");
chomp($wrkdir);