 @@ -1,29 +1,29 @@
 #!@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
 #   WRKDIR and comparing them to the corresponding changed file. All
 #   files are then referrenced relative to WRKSRC.
+#
 #   It should be called from the packages directory,
 #   e.g. /usr/pkgsrc/example/test
+#
 #   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.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHORS
 @@ -51,26 +51,38 @@ my %old_filename;
 my %old_header;
 # create patchdir, or empty it if already existing
 sub create_patchdir {
     if (! -d $patchdir) {
 	mkdir($patchdir, 0755);
 	if (-d $origpatchdir && "$origpatchdir" != "$patchdir") {
 	    system("cp", "$origpatchdir/p*", "$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);
 undef($opt_D);
 undef($opt_d);
 undef($opt_h);
 undef($opt_r);
 undef($opt_v);
 undef($opt_w);
 getopts('cDd:hrvw');
 if ($opt_h) {
 @@ -85,35 +97,29 @@ usage: $prog [-hvw] [-c | -r] [-D | -d d
     -v   	verbose - list .orig files as processed
     -w   	look for changes in \$WRKDIR instead of \$WRKSRC
 EOF
 		exit 0;
 };
 if ($opt_d && $opt_D) {
     print STDERR "-D and -d conflict, choose one\n";
     exit 1;
+}
 # get some pkgsrc variables
-$wrksrc=`@MAKE@ show-var VARNAME=WRKSRC` or
+$wrksrc = get_variable("WRKSRC");
-    die ("can't find WRKSRC -- wrong dir?");
+$wrkdir = get_variable("WRKDIR");
-chomp($wrksrc);
+$origpatchdir = get_variable("PATCHDIR");
 $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);
 if ($opt_D) {
     $patchdir = "$wrkdir/.newpatches";
 } elsif ($opt_d) {
     if (-d "/$opt_d") {
 	$patchdir = $opt_d;
     } else {
 	my $pwd = cwd();
 	chomp($pwd);
 	$patchdir = "$pwd/$opt_d";
+    }
 } else {
     $patchdir = $origpatchdir;

 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.88 2015/09/08 18:47:01 joerg Exp $
+# $NetBSD: Makefile,v 1.89 2015/09/15 08:36:07 wiz Exp $
-PKGNAME=	pkgdiff-1.6
+PKGNAME=	pkgdiff-1.7
 PKGREVISION=	1
 CATEGORIES=	pkgtools devel
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=	Tools to create, maintain, and send back patches for pkgsrc
 LICENSE=	2-clause-bsd AND original-bsd
 NO_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# empty
 USE_TOOLS+=	perl:run