Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgtools/pkgdiff/Makefile
View File

@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.87 2015/06/12 10:50:56 wiz Exp $
# $NetBSD: Makefile,v 1.89 2015/09/15 08:36:07 wiz Exp $
PKGNAME= pkgdiff-1.6
PKGREVISION= 1
PKGNAME= pkgdiff-1.7
CATEGORIES= pkgtools devel
MAINTAINER= wiz@NetBSD.org
@@ -39,11 +38,13 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/cat1
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
.endif
PKGDIFF_MAKE?= ${MAKE}
do-build:
.for f in mkpatches patchdiff
${SED} -e 's|@PREFIX@|${PREFIX}|g' \
-e 's|@PERL5@|${PERL5}|g' \
-e 's|@MAKE@|${MAKE}|g' \
-e 's|@MAKE@|${PKGDIFF_MAKE}|g' \
< ${FILESDIR}/${f}.pl \
> ${WRKSRC}/${f}
.endfor

28
pkgtools/pkgdiff/files/mkpatches.pl
View File

@@ -1,6 +1,6 @@
#!@PERL5@
#
# $NetBSD: mkpatches.pl,v 1.19 2015/02/03 22:50:27 abs Exp $
# $NetBSD: mkpatches.pl,v 1.20 2015/09/15 08:36:07 wiz Exp $
#
# mkpatches: creates a set of patches patch-aa, patch-ab, ...
# in work/.newpatches by looking for *.orig files in and below
@@ -13,7 +13,7 @@
# It retains the naming and header (RCS Id and comment) from the
# patches directory.
#
# Copyright (c) 2000, 2011 by Thomas Klausner <wiz@NetBSD.org>
# Copyright (c) 2000, 2011, 2015 by Thomas Klausner <wiz@NetBSD.org>
# 2004 by Dieter Baron <dillo@NetBSD.org>
# All rights reserved.
#
@@ -61,6 +61,18 @@ sub create_patchdir {
}
}
sub get_variable {
my ($variable) = shift;
my ($value);
$value = `@MAKE@ show-var VARNAME=$variable`;
if (${^CHILD_ERROR_NATIVE} == 0) {
chomp($value);
return $value;
}
die("error executing \"make show-var VARNAME=$variable\": returned with exit code " . (${^CHILD_ERROR_NATIVE} >> 8));
}
# read command line arguments
undef($opt_c);
@@ -95,15 +107,9 @@ if ($opt_d && $opt_D) {
# get some pkgsrc variables
$wrksrc=`@MAKE@ show-var VARNAME=WRKSRC` or
die ("can't find WRKSRC -- wrong dir?");
chomp($wrksrc);
$wrkdir=`@MAKE@ show-var VARNAME=WRKDIR` or
die ("can't find WRKDIR -- wrong dir?");
chomp($wrkdir);
$origpatchdir=`@MAKE@ show-var VARNAME=PATCHDIR` or
die ("can't find PATCHDIR -- wrong dir?");
chomp($origpatchdir);
$wrksrc = get_variable("WRKSRC");
$wrkdir = get_variable("WRKDIR");
$origpatchdir = get_variable("PATCHDIR");
if ($opt_D) {
$patchdir = "$wrkdir/.newpatches";