From 56c44db256410de4722779fce49ea0829d42bd6c Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Wed, 14 Aug 2002 16:30:07 +0000
Subject: [PATCH] Add files from parent branch HEAD: 
 pkgtools/pkgdiff/Makefile 	pkgtools/pkgdiff/files/patchdiff.pl

---
 pkgtools/pkgdiff/Makefile           |  61 ++++++++++++++++
 pkgtools/pkgdiff/files/patchdiff.pl | 106 ++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 pkgtools/pkgdiff/Makefile
 create mode 100755 pkgtools/pkgdiff/files/patchdiff.pl

diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
new file mode 100644
index 00000000000..5aebf4f8dea
--- /dev/null
+++ b/pkgtools/pkgdiff/Makefile
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile,v 1.24 2002/04/02 10:56:47 seb Exp $
+#
+
+DISTNAME=	pkgdiff-0.106
+CATEGORIES=	pkgtools devel
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+
+MAINTAINER=	wiz@netbsd.org
+HOMEPAGE=	ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/Packages.txt
+COMMENT=	Tools to ease creating and maintaining patches for pkgsrc
+
+PERL5_REQD=	5.6.0
+USE_PERL5=	YES
+
+EXTRACT_ONLY=	# empty
+WRKSRC=		${WRKDIR}
+NO_CHECKSUM=	yes
+NO_PATCH=	yes
+NO_CONFIGURE=	yes
+
+MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+DEPENDS+=	diffutils-[0-9]*:../../devel/diffutils
+BUILD_DEPENDS+=	groff-[0-9]*:../../textproc/groff
+NROFF=		gnroff
+DIFF?=		gdiff
+.else
+NROFF=		nroff
+DIFF?=		diff
+.endif
+
+do-build:
+.for FILE in mkpatches patchdiff
+	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
+		-e 's|@MAKE@|${MAKE}|g'			\
+		< ${FILESDIR}/${FILE}.pl 		\
+		> ${WRKSRC}/${FILE}
+.endfor
+	${SED} -e 's|@DIFF@|${DIFF}|g'			\
+		< ${FILESDIR}/pkgdiff			\
+		> ${WRKSRC}/pkgdiff
+	${CP} ${FILESDIR}/pkgvi ${WRKSRC}
+.for FILE in mkpatches patchdiff pkgdiff pkgvi
+	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
+		< ${FILESDIR}/${FILE}.1			\
+		> ${WRKSRC}/${FILE}.1
+	${NROFF} -mandoc ${WRKSRC}/${FILE}.1 >${WRKSRC}/${FILE}.0
+.endfor
+
+do-install:
+.for FILE in mkpatches patchdiff pkgdiff pkgvi
+	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${FILE}.0 ${PREFIX}/man/cat1
+	${INSTALL_MAN} ${WRKSRC}/${FILE}.1 ${PREFIX}/man/man1
+.endfor
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkgdiff/files/patchdiff.pl b/pkgtools/pkgdiff/files/patchdiff.pl
new file mode 100755
index 00000000000..d8d55cadaf3
--- /dev/null
+++ b/pkgtools/pkgdiff/files/patchdiff.pl
@@ -0,0 +1,106 @@
+#!@PREFIX@/bin/perl
+#
+# $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.
+#
+# Copyright (c) 2000 by Dieter Baron <dillo@giga.or.at> and
+#                       Thomas Klausner <wiz@netbsd.org>  
+# All Rights Reserved.  Absolutely no warranty.  
+
+use Getopt::Std;
+use Cwd;
+use File::Spec;
+
+my $oldpatchdir, $newpatchdir;
+my $wrkdir, $thisdir;
+my %orig, %new;
+
+sub getfilename {
+    my $fname=shift;
+    local $_;
+    local *handle;
+    open(handle, $fname);
+    while (<handle>) {
+	next unless m/^\+\+\+[	 ]([^	]*)/;
+	close(handle);
+	$_ = $1;
+	chomp();
+	return $_;
+     }
+     close(handle);
+     return undef;
+}
+
+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('d:h');
+
+if ($opt_h) {
+		($prog) = ($0 =~ /([^\/]+)$/);
+		print STDERR <<EOF;
+usage: $prog [-d output-directory]
+    -d dirname	directory to compare the patches in patches/ to;
+		defaults to \$WRKDIR/.newpatches
+EOF
+		exit 0;
+};
+
+%orig=();
+%new=();
+$thisdir=cwd();
+chomp($thisdir);
+$oldpatchdir=`@MAKE@ show-var VARNAME=PATCHDIR` or
+    die ("can't find PATCHDIR -- wrong dir?");
+chomp($oldpatchdir);
+
+$wrkdir=`@MAKE@ show-var VARNAME=WRKDIR` or 
+    die ("can't find WRKDIR -- wrong dir?");
+chomp($wrkdir);
+
+if ($opt_d) {
+    $newpatchdir = cwd()."/$opt_d";
+} 
+else {
+    $newpatchdir="$wrkdir"."/.newpatches";
+}
+
+if ( ! -d $oldpatchdir) {
+    print "No old patches found (directory $oldpatchdir not found)\n";
+    exit(0);
+}
+if ( ! -d $newpatchdir ) {
+    print "No new patches found (directory $newpatchdir not found)\n";
+    exit(0);
+}
+putinhash(\%orig,"$oldpatchdir/patch-*");
+putinhash(\%new,"$newpatchdir/patch-*");
+foreach $patch (keys%orig) {
+    print "Only in old: $orig{$patch} ($patch)\n" unless defined($new{$patch});
+}
+foreach $patch (keys%new) {
+    if (defined($orig{$patch})) {
+#	system("diff",$orig{$patch},$new{$patch});
+	$diff=`diff $orig{$patch} $new{$patch}`;
+	$diff=~s/^\dc\d\n..\$NetBSD.*\$\n---\n..\$NetBSD.*\$\n//m;
+	$diff=~s/^\dc\d\n..\+\+\+.*\n---\n..\+\+\+.*\n//m;
+	if ($diff) {
+	     print "Comparing $orig{$patch} to $new{$patch}\n$diff";
+	}
+     } else {
+	print "Only in new: $new{$patch} ($patch)\n" 
+     }
+}
-- 
2.41.0