From 318ed8449838c59aef4d8296bdd8f52805e776db Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Wed, 17 Dec 2008 11:56:26 +0000
Subject: [PATCH] Add files from parent branch HEAD: 	sysutils/fdupes/DESCR 
 sysutils/fdupes/Makefile 	sysutils/fdupes/PLIST 
 sysutils/fdupes/distinfo 	sysutils/fdupes/patches/patch-aa 
 sysutils/fdupes/patches/patch-ab 	sysutils/fdupes/patches/patch-ac

---
 sysutils/fdupes/DESCR            |  2 ++
 sysutils/fdupes/Makefile         | 22 ++++++++++++++++++++++
 sysutils/fdupes/PLIST            |  3 +++
 sysutils/fdupes/distinfo         |  8 ++++++++
 sysutils/fdupes/patches/patch-aa | 22 ++++++++++++++++++++++
 sysutils/fdupes/patches/patch-ab | 21 +++++++++++++++++++++
 sysutils/fdupes/patches/patch-ac | 15 +++++++++++++++
 7 files changed, 93 insertions(+)
 create mode 100644 sysutils/fdupes/DESCR
 create mode 100644 sysutils/fdupes/Makefile
 create mode 100644 sysutils/fdupes/PLIST
 create mode 100644 sysutils/fdupes/distinfo
 create mode 100644 sysutils/fdupes/patches/patch-aa
 create mode 100644 sysutils/fdupes/patches/patch-ab
 create mode 100644 sysutils/fdupes/patches/patch-ac

diff --git a/sysutils/fdupes/DESCR b/sysutils/fdupes/DESCR
new file mode 100644
index 000000000000..ad2b1c4d06fd
--- /dev/null
+++ b/sysutils/fdupes/DESCR
@@ -0,0 +1,2 @@
+FDUPES is a program for identifying or deleting duplicate files residing
+within specified directories.
diff --git a/sysutils/fdupes/Makefile b/sysutils/fdupes/Makefile
new file mode 100644
index 000000000000..1ff36505c41c
--- /dev/null
+++ b/sysutils/fdupes/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD$
+
+DISTNAME=	fdupes-1.40
+CATEGORIES=	sysutils
+MASTER_SITES=	http://netdial.caribe.net/~adrian2/programs/
+
+MAINTAINER=	ef@math.uni-bonn.de
+HOMEPAGE=	http://netdial.caribe.net/~adrian2/fdupes.html
+COMMENT=	Program for identifying or deleting duplicate files
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_LANGUAGES=	c
+NO_CONFIGURE=	yes
+
+MAKE_FLAGS=	INSTALLDIR=${PREFIX}/bin MANPAGEDIR=${PREFIX}/${PKGMANDIR}
+
+BUILD_TARGET=		fdupes
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fdupes/PLIST b/sysutils/fdupes/PLIST
new file mode 100644
index 000000000000..118261b11a47
--- /dev/null
+++ b/sysutils/fdupes/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+bin/fdupes
+man/man1/fdupes.1
diff --git a/sysutils/fdupes/distinfo b/sysutils/fdupes/distinfo
new file mode 100644
index 000000000000..63f1ec079231
--- /dev/null
+++ b/sysutils/fdupes/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (fdupes-1.40.tar.gz) = e1bce9bdf50d7bf700dda3eb8a3d218b181b3931
+RMD160 (fdupes-1.40.tar.gz) = 0abd2f0dfee38cb333c1069363a65f8ab37e18dd
+Size (fdupes-1.40.tar.gz) = 16026 bytes
+SHA1 (patch-aa) = c84138d46bef74db226e3ea1226de874e5a7e01a
+SHA1 (patch-ab) = 8e988a6f42682b0393454b8564b6068e1fc70df9
+SHA1 (patch-ac) = 833aaa5903efb59acaa1f3f505090f7b018903f8
diff --git a/sysutils/fdupes/patches/patch-aa b/sysutils/fdupes/patches/patch-aa
new file mode 100644
index 000000000000..292cdb3a4189
--- /dev/null
+++ b/sysutils/fdupes/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- fdupes.c.orig	2001-03-15 02:16:09.000000000 +0000
++++ fdupes.c
+@@ -588,7 +588,7 @@ void printmatches(file_t *files)
+   while (files != NULL) {
+     if (files->hasdupes) {
+       if (!ISFLAG(flags, F_OMITFIRST)) {
+-	if (ISFLAG(flags, F_SHOWSIZE)) printf("%ld byte%seach:\n", files->size,
++	if (ISFLAG(flags, F_SHOWSIZE)) printf("%ld byte%seach:\n", (long)files->size,
+ 	 (files->size != 1) ? "s " : " ");
+ 	if (ISFLAG(flags, F_DSAMELINE)) escapefilename("\\ ", &files->d_name);
+ 	printf("%s%c", files->d_name, ISFLAG(flags, F_DSAMELINE)?' ':'\n');
+@@ -676,7 +676,7 @@ void autodelete(file_t *files)
+       do {
+ 	printf("Set %d of %d, preserve files [1 - %d, all]", 
+           curgroup, groups, counter);
+-	if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%ld byte%seach)", files->size,
++	if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%ld byte%seach)", (long)files->size,
+ 	  (files->size != 1) ? "s " : " ");
+ 	printf(": ");
+ 	fflush(stdout);
diff --git a/sysutils/fdupes/patches/patch-ab b/sysutils/fdupes/patches/patch-ab
new file mode 100644
index 000000000000..91798067c5fb
--- /dev/null
+++ b/sysutils/fdupes/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- md5/md5.c.orig	1999-11-05 01:04:36.000000000 +0000
++++ md5/md5.c
+@@ -38,6 +38,8 @@
+   1999-05-03 lpd Original version.
+  */
+ 
++#include <string.h>
++
+ #include "md5.h"
+ 
+ #ifdef TEST
+@@ -46,7 +48,6 @@
+  * The test program should print out the same values as given in section
+  * A.5 of RFC 1321, reproduced below.
+  */
+-#include <string.h>
+ main()
+ {
+     static const char *const test[7] = {
diff --git a/sysutils/fdupes/patches/patch-ac b/sysutils/fdupes/patches/patch-ac
new file mode 100644
index 000000000000..2e16e67e3514
--- /dev/null
+++ b/sysutils/fdupes/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- Makefile.orig	2001-03-15 02:49:11.000000000 +0000
++++ Makefile
+@@ -38,8 +38,8 @@ fdupes: fdupes.c md5/md5.c	
+ 	gcc fdupes.c md5/md5.c -Wall -o fdupes -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE)
+ 
+ install: fdupes
+-	cp fdupes $(INSTALLDIR)
+-	cp fdupes.1 $(MANPAGEDIR)/man1
++	${BSD_INSTALL_PROGRAM} fdupes ${DESTDIR}$(INSTALLDIR)
++	${BSD_INSTALL_MAN} fdupes.1 ${DESTDIR}$(MANPAGEDIR)/man1
+ 
+ tarball: clean
+ 	tar --directory=.. -c -z -v -f ../fdupes-$(VERSION).tar.gz fdupes-$(VERSION)
-- 
2.41.0