 @@ -1,60 +1,81 @@
-.\"	$NetBSD: mkpatches.1,v 1.4 2011/02/02 10:23:02 wiz Exp $
+.\"	$NetBSD: mkpatches.1,v 1.5 2011/02/02 10:36:20 wiz Exp $
 .\"
 .\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@NetBSD.org>
-.\" All Rights Reserved.  Absolutely no warranty.
+.\" 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``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 FOUNDATION OR CONTRIBUTORS
 .\" 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
 .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
 .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 .
 Each of these is then compared to the
 changed file of the same name (with no
 .Dq .orig
 extension) using
 .Xr pkgdiff 1 .
 .Pp
 The resulting patches are saved in the package's patches directory
 (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 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,33 +1,54 @@
-.\"	$NetBSD: patchdiff.1,v 1.4 2011/02/02 10:23:02 wiz Exp $
+.\"	$NetBSD: patchdiff.1,v 1.5 2011/02/02 10:36:20 wiz Exp $
 .\"
 .\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@NetBSD.org>
-.\" All Rights Reserved.  Absolutely no warranty.
+.\" 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``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 FOUNDATION OR CONTRIBUTORS
 .\" 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
 .Dt PATCHDIFF 1
 .Os
 .Sh NAME
 .Nm patchdiff
 .Nd compare sets of patches
 .Sh SYNOPSIS
 .Nm
 .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.
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr patchdiff 1 ,
 .Xr pkgdiff 1

 @@ -1,72 +1,95 @@
 #!@SH@
+#
-# $NetBSD: pkgdiff,v 1.18 2011/02/02 10:23:02 wiz Exp $
+# $NetBSD: pkgdiff,v 1.19 2011/02/02 10:36:20 wiz Exp $
+#
 # Usage: pkgdiff newfile
 #        pkgdiff oldfile newfile
+#
 # Will output a patch ready for the NetBSD Pkgs Collection (unified
 # diff, plus no RCS IDs if possible). If only newfile is given,
 # oldfile is assumed as newfile.orig.
+#
 # Copyright (c) 2000 by Hubert Feyrer <hubertf@netbsd.org>
 # Copyright (c) 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``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 FOUNDATION OR CONTRIBUTORS
 # 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.
+#
 # Copyright (c) 2000 by Hubert Feyrer <hubertf@netbsd.org>
 # All Rights Reserved.  Absolutely no warranty.
+#
 # Ensure we always use the same timezone to avoid spurious metadata diffs
 export TZ=UTC
 if [ $# -le 1 ]
 then
 	if [ -f "$1.orig" ]; then
 		old="$1.orig"
 		new="$1"
 	else
 		echo $0: need at least one argument >&2
 		exit 1;
 	fi
 else
 	old="$1"
 	new="$2"
 fi
 basename_new="`basename $new`"
 dodiff() {
 	case x"$basename_new" in
 		xconfigure)
 		@DIFF@ -I '\(echo .*as_me:[0-9][0-9]*:\|echo .*configure:[0-9][0-9]*:\|line [0-9][0-9]* "configure\)' -I '\(Avoid regenerating within pkgsrc\|exit 0\)' $*
 		;;
                 xMakefile*)
                 @DIFF@ -I '\(localedir.*=.*localedir\|localedir.*=.*share/locale\)' $*
 		;;
 		*)
 		@DIFF@ $*
 	esac
+}
 case x"$PKGDIFF_FMT" in x)
 lines=3
 PKGDIFF_FMT="-p"
 while [ `dodiff "$PKGDIFF_FMT" -U $lines "$old" "$new" | egrep -c '\\$(NetBSD|Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State)(:.*)?\\$'`  !=  0 ]
 do
 	lines=`expr $lines - 1`
 	if [ $lines = 0 ]; then
 		echo "Cannot strip away RCS IDs, please handle manually!" >&2
 		exit 1
 	fi
 done
 PKGDIFF_FMT="${PKGDIFF_FMT} -U $lines"
 ;;
 esac # PKGDIFF_FMT unset or null
 if dodiff -q "$PKGDIFF_FMT" "$old" "$new" > /dev/null
 then
+	:
 else
     echo '$'NetBSD'$'
     echo ''
     # Strip out the date on the +++ line to reduce needless
     # differences in regenerated patches
     dodiff "$PKGDIFF_FMT" "$old" "$new" | sed -e 's:^\(+++ [^	]*\)	.*:\1:'
 fi