 @@ -1,49 +1,50 @@
-.\"	$NetBSD: mkpatches.1,v 1.6 2011/02/02 23:34:48 wiz Exp $
+.\"	$NetBSD: mkpatches.1,v 1.7 2011/03/04 15:57:07 wiz Exp $
 .\"
 .\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@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 AUTHOR
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 31, 2011
+.Dd February 20, 2011
 .Dt MKPATCHES 1
 .Os
 .Sh NAME
 .Nm mkpatches
 .Nd create patch files appropriate for pkgsrc
 .Sh SYNOPSIS
 .Nm
 .Oo Fl c | Fl r Oc
 .Op Fl hv
 .Oo Fl c | Fl r Oc
 .Op Fl D | Fl d Ar dir
 .Sh DESCRIPTION
 .Nm
 is a perl script that simplifies creating patches from a changed work
 tree if for each changed file the original was kept with an added
 extension
 .Dq .orig .
 .Pp
 .Nm
 must be called from the package's main directory, that is
 .Pa ${PKGSRC}/category/program .
 It then proceeds to find all files that
 match the pattern
 .Dq *.orig .
 @@ -57,25 +58,39 @@ The resulting patches are saved in the p
 (usually
 .Pa patches/ )
 and can be easily compared to the currently existing set using
 .Xr patchdiff 1
 or
 .Ic "cvs diff" .
 .Pp
 Supported options are:
 .Bl -tag -width 3n
 .It Fl c
 Clean up backup patches of previous runs.
 Use this after you're finished working on the patch set and committed
 it.
 .It Fl D
 Use
 .Pa $WRKDIR/.newpatches
 for patches.
 See
 .Fl d
 for more details.
 .It Fl d Ar dir
 Use
 .Ar dir
 for patches.
 Copies any existing patches there on the first run and then
 creates or updates patches only there.
 Use this e.g. if you have a read-only pkgsrc.
 .It Fl h
 Show a short usage.
 .It Fl r
 Revert the changes.
 Removes the new patches and puts the original patches back.
 .It Fl v
 More verbose output.
 .El
 .Sh SEE ALSO
 .Xr cvs 1 ,
 .Xr patchdiff 1 ,
 .Xr pkgdiff 1

 @@ -1,54 +1,71 @@
-.\"	$NetBSD: patchdiff.1,v 1.6 2011/02/02 23:34:48 wiz Exp $
+.\"	$NetBSD: patchdiff.1,v 1.7 2011/03/04 15:57:07 wiz Exp $
 .\"
 .\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@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 AUTHOR
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 31, 2011
+.Dd February 20, 2011
 .Dt PATCHDIFF 1
 .Os
 .Sh NAME
 .Nm patchdiff
 .Nd compare sets of patches
 .Sh SYNOPSIS
 .Nm
 .Op Fl D | Fl d Ar dir
 .Sh DESCRIPTION
 .Nm
 is a perl script that simplifies comparing a set of previously
 existing patches with a new one created with
 .Xr mkpatches 1 .
 .Pp
 .Nm
 must be called from the package's main directory, that is
 .Pa ${PKGSRC}/category/program .
 For each patch existing in either the
 .Pa patches
 directory, it is compared with its backup file
 .Pq Pa patch-foo.orig
 using
 .Xr diff 1 .
 If no relevant differences are found, the original patch is restored.
 .Pp
 If the
 .Fl d
 option is used,
 .Nm
 looks for patches in
 .Ar dir
 instead of the default
 .Pa patches
 directory.
 If the
 .Fl D
 option is used,
 .Nm
 looks in
 .Pa $WRKDIR/.newpatches .
 .Sh SEE ALSO
 .Xr diff 1 ,
-.Xr patchdiff 1 ,
+.Xr mkpatches 1 ,
 .Xr pkgdiff 1

 @@ -1,16 +1,16 @@
 #!@PERL5@
+#
-# $NetBSD: mkpatches.pl,v 1.15 2011/02/02 23:35:11 wiz Exp $
+# $NetBSD: mkpatches.pl,v 1.16 2011/03/04 15:57: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>
 @@ -36,66 +36,96 @@
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#
 use Getopt::Std;
 use Cwd;
 use File::Spec;
 my $patchdir;
 my $old_patchdir;
 my $wrkdir;
 my $wrksrc;
 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");
+	}
+    }
+}
 # read command line arguments
 undef($opt_c);
 undef($opt_D);
 undef($opt_d);
 undef($opt_h);
 undef($opt_r);
 undef($opt_v);
-getopts('chrv');
+getopts('cDd:hrv');
 if ($opt_h) {
 		($prog) = ($0 =~ /([^\/]+)$/);
 		print STDERR <<EOF;
-usage: $prog [-chv]
+usage: $prog [-hv] [-c | -r] [-D | -d dir]
     -c   	commit -- clean up old patches backups
     -d dir   	create patches in this directory
     -D   	create patches in \$WRKDIR/.newpatches
     -h   	show this help
     -r   	revert -- remove new patches, put old patches back
     -v   	verbose - list .orig files as processed
 EOF
 		exit 0;
 };
-# get WRKDIR
+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
     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);
-$patchdir=`@MAKE@ show-var VARNAME=PATCHDIR` or
+$origpatchdir=`@MAKE@ show-var VARNAME=PATCHDIR` or
     die ("can't find PATCHDIR -- wrong dir?");
-chomp($patchdir);
+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;
+}
 if ($opt_c) {
     open(HANDLE, "find ${patchdir} -type f -name \\\*.orig |");
     foreach (<HANDLE>) {
 	chomp;
 	unlink $_;
+    }
     exit 0;
+}
 if ($opt_r) {
     open(HANDLE, "find ${patchdir} -type f -name \\\*.orig |");
     foreach (<HANDLE>) {
 @@ -103,41 +133,36 @@ if ($opt_r) {
 	my $orig = $_;
 	my $new = $_;
 	$new =~ s/.orig$//;
 	rename $orig, $new;
 	if (! -s $new) {
 	    unlink $new;
+	}
+    }
     exit 0;
+}
 create_patchdir();
 # get WRKSRC
 $wrksrc=`@MAKE@ show-var VARNAME=WRKSRC` or
     die ("can't find WRKSRC -- wrong dir?");
 chomp($wrksrc);
 move_away_old_patches();
 analyze_old_patches();
 chdir $wrksrc or die ("can't cd to WRKSRC ($wrksrc)");
 # find files
-open(HANDLE, "find ${wrkdir} -type f -name \\\*.orig |");
+open(HANDLE, "find ${wrksrc} -type f -name \\\*.orig |");
 # create patches
 foreach (sort <HANDLE>) {
     my ($path, $complete);
     my ($new, $old);
     chomp();
     $path = $_;
     $complete = $path;
     $complete =~ s/.orig$//;
     $new = File::Spec->abs2rel($complete, $wrksrc);
     $old = File::Spec->abs2rel($path, $wrksrc);
     if (-f $complete) {

 @@ -1,16 +1,16 @@
 #!@PERL5@
+#
-# $NetBSD: patchdiff.pl,v 1.14 2011/02/02 23:35:11 wiz Exp $
+# $NetBSD: patchdiff.pl,v 1.15 2011/03/04 15:57:07 wiz Exp $
+#
 # patchdiff: compares a set of patches in the patch dir with their predecessors
+#
 # Copyright (c) 2000, 2011 by Dieter Baron <dillo@giga.or.at> and
 #                             Thomas Klausner <wiz@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
 @@ -59,43 +59,60 @@ sub putinhash {
     my $hash=shift;
     my $files=shift;
     my $temp;
     local *handle;
     open(handle, "ls $files|");
     while(<handle>) {
 	chomp;
 	$temp=getfilename($_);
 	$$hash{$temp}=File::Spec->abs2rel($_, $thisdir);
+     }
      close(handle);
+}
-getopts('h');
+getopts('Dd:h');
 if ($opt_h) {
 		($prog) = ($0 =~ /([^\/]+)$/);
 		print STDERR <<EOF;
-usage: $prog
+usage: $prog [-D | -d dir]
     -D		look at patches in \$WRKDIR/.newpatches
     -d dir	look at patches in this directory
 EOF
 		exit 0;
 };
 %orig=();
 %new=();
 $thisdir=cwd();
 chomp($thisdir);
-$patchdir=`@MAKE@ show-var VARNAME=PATCHDIR` or
+$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($patchdir);
+chomp($origpatchdir);
 if ($opt_D) {
     $patchdir = "$wrkdir/.newpatches";
 } elsif ($opt_d) {
     if (-d "/$opt_d") {
 	$patchdir = $opt_d;
     } else {
 	$patchdir = "$thisdir/$opt_d";
+    }
 } else {
     $patchdir = $origpatchdir;
+}
 if ( ! -d $patchdir) {
     print "No patches found (directory $patchdir not found)\n";
     exit(0);
+}
 open(HANDLE, "find ${patchdir} -type f -name \\\*.orig |");
 foreach (sort <HANDLE>) {
     $orig = $_;
     chomp($orig);
     $new = $orig;
     $new =~ s/.orig$//;

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.72 2011/02/02 23:35:51 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2011/03/04 15:57:07 wiz Exp $
+#
-DISTNAME=	pkgdiff-1.0
+DISTNAME=	pkgdiff-1.1
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 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
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 NO_CONFIGURE=	yes