sysutils/dupd: update to version 1.7

PR:		229773
Submitted by:	jyri@virkki.com (original patch)
Submitted by:	Nathan <ndowens@yahoo.com> (final patch)
Approved by:	jyri@virkki.com (maintainer)

5 files changed, 27 insertions, 76 deletions

diff --git a/sysutils/dupd/Makefile b/sysutils/dupd/Makefile
index b1a6d2d1ba12..6ab322e79ace 100644
--- a/sysutils/dupd/Makefile
+++ b/sysutils/dupd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dupd
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	sysutils
 
 MAINTAINER=	tom@hur.st
@@ -11,24 +11,30 @@ 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
+TEST_DEPENDS+=	bash:shells/bash
 
-USES=	gmake perl5 ssl sqlite:3
+USES=		gmake localbase perl5 sqlite:3 ssl
 USE_PERL5=	test
 
-TEST_DEPENDS+=	bash:shells/bash
+ALL_TARGET=	dupd
+TEST_TARGET=	test
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jvirkki
 
-ALL_TARGET=	dupd
-TEST_TARGET=	test
+OPTIONS_DEFINE=	DOCS OPTIMIZED_CFLAGS
+
+OPTIMIZED_CFLAGS_MAKE_ARGS=	CFLAGS="${CFLAGS:S/O2/O3/g}"
+
+# This gets rid of extra optimization caused by opt?
+post-extract:
+	${REINPLACE_CMD} -e '/OPT?=/d' ${WRKSRC}/Makefile
 
-PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs ; ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/sysutils/dupd/distinfo b/sysutils/dupd/distinfo
index fd6f776458af..630d7d4b9f7d 100644
--- a/sysutils/dupd/distinfo
+++ b/sysutils/dupd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523215351
-SHA256 (jvirkki-dupd-1.6_GH0.tar.gz) = 68bce4d5ac0b8a00ac50da65634950eb46fb11a571e546fb543fc6c6bf6b79da
-SIZE (jvirkki-dupd-1.6_GH0.tar.gz) = 973621
+TIMESTAMP = 1536527596
+SHA256 (jvirkki-dupd-1.7_GH0.tar.gz) = 547eb62931ca524e9966db0bb84cdc806c6a7fa8cbdcf9ac52b043df88ca222d
+SIZE (jvirkki-dupd-1.7_GH0.tar.gz) = 983762
diff --git a/sysutils/dupd/files/patch-Makefile b/sysutils/dupd/files/patch-Makefile
deleted file mode 100644
index 03c3ecd20ba3..000000000000
--- a/sysutils/dupd/files/patch-Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.orig	2018-03-21 18:56:42 UTC
-+++ Makefile
-@@ -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),)
-@@ -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
- 
- 
diff --git a/sysutils/dupd/files/patch-src_main.c b/sysutils/dupd/files/patch-src_main.c
deleted file mode 100644
index 00ad0f426a3e..000000000000
--- a/sysutils/dupd/files/patch-src_main.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/main.c.orig	2018-04-08 20:02:52 UTC
-+++ src/main.c
-@@ -141,19 +141,8 @@ static void show_help()
-  */
- static void show_usage()
- {
-+  system("/usr/bin/man dupd");
-   show_banner();
--
--#ifndef __APPLE__
--  char * p = &_binary_man_dupd_start;
--  while (p != &_binary_man_dupd_end) {
--    putchar(*p++);
--  }
--#else
--  printf("Usage documentation not available on Darwin!\n");
--  printf("\n");
--  printf("Alternatively, refer to the document here:\n");
--  printf("https://github.com/jvirkki/dupd\n");
--#endif
- }
- 
- 
diff --git a/sysutils/dupd/pkg-plist b/sysutils/dupd/pkg-plist
new file mode 100644
index 000000000000..0927dfa4f808
--- /dev/null
+++ b/sysutils/dupd/pkg-plist
@@ -0,0 +1,7 @@
+bin/dupd
+man/man1/dupd.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
+%%PORTDOCS%%%%DOCSDIR%%/design.md
+%%PORTDOCS%%%%DOCSDIR%%/examples.md
+%%PORTDOCS%%%%DOCSDIR%%/index.md
+%%PORTDOCS%%%%DOCSDIR%%/performance.md