sysutils/dupd: Update to version 1.6

PR:		226841
Submitted by:	jyri@virkki.com
Reviewed by:	tom@hur.st (maintainer)

4 files changed, 44 insertions, 42 deletions

diff --git a/sysutils/dupd/Makefile b/sysutils/dupd/Makefile
index 562d097fcdc4..b1a6d2d1ba12 100644
--- a/sysutils/dupd/Makefile
+++ b/sysutils/dupd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dupd
-PORTVERSION=	1.4
+PORTVERSION=	1.6
 CATEGORIES=	sysutils
 
 MAINTAINER=	tom@hur.st
@@ -11,24 +11,22 @@ COMMENT=	File duplicate detection CLI utility
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+NOT_FOR_ARCHS=	arm armv6 armv7 i386 mips powerpc
+NOT_FOR_ARCHS_REASON=	test fails on large files on 32-bit
+
+USES=	gmake perl5 ssl sqlite:3
+USE_PERL5=	test
+
+TEST_DEPENDS+=	bash:shells/bash
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	jvirkki
-GH_PROJECT=	libbloom:libbloom
-GH_TAGNAME=	v1.4:libbloom
 
-USES=	gmake ssl sqlite:3
-LLD_UNSAFE=	yes
+ALL_TARGET=	dupd
+TEST_TARGET=	test
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
-MAKE_ARGS=	LIB="-L${PREFIX}/lib" INC="-I${WRKSRC_libbloom} -I${PREFIX}/include" \
-		LIBBLOOM_LIB="${WRKSRC_libbloom}/build" USAGE="${WRKSRC}/build/usage.o" \
-		DIRENT_HAS_TYPE=1 GITHASH=c25a635e1d27ebf5759875a7ff907d8eec7f5be9
-
-do-build:
-	(cd ${WRKSRC_libbloom} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${WRKSRC_libbloom}/build/libbloom.a MM=-DGRR)
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS})
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
diff --git a/sysutils/dupd/distinfo b/sysutils/dupd/distinfo
index 6ecb853d0e05..fd6f776458af 100644
--- a/sysutils/dupd/distinfo
+++ b/sysutils/dupd/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1491411043
-SHA256 (jvirkki-dupd-1.4_GH0.tar.gz) = be98c8fe60bdcc281898930b2604a1b97570de611fecc02732af4a81329438d3
-SIZE (jvirkki-dupd-1.4_GH0.tar.gz) = 953654
-SHA256 (jvirkki-libbloom-v1.4_GH0.tar.gz) = 3df57d14c56f4a16a26d04b83891df844caa4b06d9b19f822d10c3c26f31311b
-SIZE (jvirkki-libbloom-v1.4_GH0.tar.gz) = 1209355
+TIMESTAMP = 1523215351
+SHA256 (jvirkki-dupd-1.6_GH0.tar.gz) = 68bce4d5ac0b8a00ac50da65634950eb46fb11a571e546fb543fc6c6bf6b79da
+SIZE (jvirkki-dupd-1.6_GH0.tar.gz) = 973621
diff --git a/sysutils/dupd/files/patch-Makefile b/sysutils/dupd/files/patch-Makefile
index 3ba2537cc957..03c3ecd20ba3 100644
--- a/sysutils/dupd/files/patch-Makefile
+++ b/sysutils/dupd/files/patch-Makefile
@@ -1,19 +1,39 @@
---- Makefile.orig	2017-02-26 10:05:09 UTC
+--- Makefile.orig	2018-03-21 18:56:42 UTC
 +++ Makefile
-@@ -20,7 +20,6 @@
- TOP:=$(shell  pwd)
+@@ -21,7 +21,7 @@ TOP:=$(shell  pwd)
  BUILD_OS:=$(shell uname)
+ BUILD_MACHINE:=$(shell uname -m)
  VERSION:=$(shell cat version)
 -GITHASH:=$(shell git rev-parse HEAD)
++GITHASH:=
  OPTGEN:=$(shell which optgen | head -c1)
  
  ifeq ($(LCOV_OUTPUT_DIR),)
-@@ -98,7 +97,7 @@ $(BUILD)/%.o: src/%.c src/%.h
- 		 -c $< -o $@
+@@ -66,14 +66,12 @@ USAGE=$(BUILD)/usage.o
+ USAGE_ARCH=-O elf64-x86-64 -B i386
+ endif
+ 
+-ifeq ($(BUILD_OS),FreeBSD)
+-INC+=-I/usr/local/include
+-LIB+=-L/usr/local/lib
++INC+=-I${PREFIX}/include
++LIB+=-L${PREFIX}/lib
+ OBJCP=objcopy
+-CFLAGS=-m64 -DDIRENT_HAS_TYPE
+-USAGE=$(BUILD)/usage.o
++CFLAGS+=-DDIRENT_HAS_TYPE -D_FILE_OFFSET_BITS=64
++USAGE=
+ USAGE_ARCH=-O elf64-x86-64 -B i386
+-endif
+ 
+ ifeq ($(BUILD_OS),SunOS)
+ CC=gcc
+@@ -92,7 +90,7 @@ endif
+ ifeq ($(DEBUG),1)
+ OPT=-g $(DEBUGOPT)
+ else
+-OPT=-O3
++#OPT=-O3
+ endif
  
- $(BUILD)/usage.o: man/dupd
--	$(OBJCP) -I binary $(USAGE_ARCH) man/dupd $(BUILD)/usage.o
-+	ld -r -b binary -o $(BUILD)/usage.o man/dupd
  
- clean:
- 	rm -f dupd
diff --git a/sysutils/dupd/files/patch-src_utils.h b/sysutils/dupd/files/patch-src_utils.h
deleted file mode 100644
index 092cf33627a8..000000000000
--- a/sysutils/dupd/files/patch-src_utils.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/utils.h.orig	2017-02-26 10:05:09 UTC
-+++ src/utils.h
-@@ -37,6 +37,11 @@
- #define LSTAT lstat
- #endif
- 
-+#ifdef __FreeBSD__
-+#define STRUCT_STAT struct stat
-+#define LSTAT lstat
-+#endif
-+
- #ifdef sun
- #define STRUCT_STAT struct stat64
- #define LSTAT lstat64