Attachment #196992 for bug #229773




# $FreeBSD$

PORTNAME=	dupd
PORTVERSION=	1.7
CATEGORIES=	sysutils

MAINTAINER=	tom@hur.st

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

TEST_DEPENDS+=	bash:shells/bash
NOT_FOR_ARCHS_REASON=	test fails on large files on 32-bit

USES=		gmake localbase perl5 sqlite:3 ssl
USE_PERL5=	test

ALL_TARGET=	dupd
TEST_TARGET=	test

USE_GITHUB=	yes
GH_ACCOUNT=	jvirkki

OPTIONS_DEFINE=	DOCS OPTIMIZED_CFLAGS
TEST_TARGET=	test

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

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC}/docs ; ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)sysutils/dupd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1523215351	1	TIMESTAMP = 1536527596
2	SHA256 (jvirkki-dupd-1.6_GH0.tar.gz) = 68bce4d5ac0b8a00ac50da65634950eb46fb11a571e546fb543fc6c6bf6b79da	2	SHA256 (jvirkki-dupd-1.7_GH0.tar.gz) = 547eb62931ca524e9966db0bb84cdc806c6a7fa8cbdcf9ac52b043df88ca222d
3	SIZE (jvirkki-dupd-1.6_GH0.tar.gz) = 973621	3	SIZE (jvirkki-dupd-1.7_GH0.tar.gz) = 983762




--- 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
 
 




--- 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
 }
 
 

Line 0 Link Here

(-)sysutils/dupd/pkg-plist (+7 lines)
	1	bin/dupd
	2	man/man1/dupd.1.gz
	3	%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
	4	%%PORTDOCS%%%%DOCSDIR%%/design.md
	5	%%PORTDOCS%%%%DOCSDIR%%/examples.md
	6	%%PORTDOCS%%%%DOCSDIR%%/index.md
	7	%%PORTDOCS%%%%DOCSDIR%%/performance.md

Return to bug 229773

Lines 2-8 Link Here

(-)sysutils/dupd/Makefile (-11 / +17 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dupd	4	PORTNAME= dupd
5	PORTVERSION= 1.6	5	PORTVERSION= 1.7
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7		7
8	MAINTAINER= tom@hur.st	8	MAINTAINER= tom@hur.st
Lines 11-34 Link Here
11	LICENSE= GPLv3	11	LICENSE= GPLv3
12	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
13		13
14	NOT_FOR_ARCHS= arm armv6 armv7 i386 mips powerpc	14	TEST_DEPENDS+= bash:shells/bash
15	NOT_FOR_ARCHS_REASON= test fails on large files on 32-bit
16		15
17	USES= gmake perl5 ssl sqlite:3	16	USES= gmake localbase perl5 sqlite:3 ssl
18	USE_PERL5= test	17	USE_PERL5= test
19		18
20	TEST_DEPENDS+= bash:shells/bash	19	ALL_TARGET= dupd
		20	TEST_TARGET= test
21		21
22	USE_GITHUB= yes	22	USE_GITHUB= yes
23	GH_ACCOUNT= jvirkki	23	GH_ACCOUNT= jvirkki
24		24
25	ALL_TARGET= dupd	25	OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS
26	TEST_TARGET= test
27		26
28	PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz	27	OPTIMIZED_CFLAGS_MAKE_ARGS= CFLAGS="${CFLAGS:S/O2/O3/g}"
29		28
30	do-install:	29	# This gets rid of extra optimization caused by opt?
31	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	30	post-extract:
32	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1	31	${REINPLACE_CMD} -e '/OPT?=/d' ${WRKSRC}/Makefile
33		32
		33	post-install:
		34	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
		35
		36	do-install-DOCS-on:
		37	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		38	(cd ${WRKSRC}/docs ; ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
		39
34	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-39 Link Here

(-)sysutils/dupd/files/patch-Makefile (-39 lines)
1	--- Makefile.orig 2018-03-21 18:56:42 UTC
2	+++ Makefile
3	@@ -21,7 +21,7 @@ TOP:=$(shell pwd)
4	BUILD_OS:=$(shell uname)
5	BUILD_MACHINE:=$(shell uname -m)
6	VERSION:=$(shell cat version)
7	-GITHASH:=$(shell git rev-parse HEAD)
8	+GITHASH:=
9	OPTGEN:=$(shell which optgen \| head -c1)
10
11	ifeq ($(LCOV_OUTPUT_DIR),)
12	@@ -66,14 +66,12 @@ USAGE=$(BUILD)/usage.o
13	USAGE_ARCH=-O elf64-x86-64 -B i386
14	endif
15
16	-ifeq ($(BUILD_OS),FreeBSD)
17	-INC+=-I/usr/local/include
18	-LIB+=-L/usr/local/lib
19	+INC+=-I${PREFIX}/include
20	+LIB+=-L${PREFIX}/lib
21	OBJCP=objcopy
22	-CFLAGS=-m64 -DDIRENT_HAS_TYPE
23	-USAGE=$(BUILD)/usage.o
24	+CFLAGS+=-DDIRENT_HAS_TYPE -D_FILE_OFFSET_BITS=64
25	+USAGE=
26	USAGE_ARCH=-O elf64-x86-64 -B i386
27	-endif
28
29	ifeq ($(BUILD_OS),SunOS)
30	CC=gcc
31	@@ -92,7 +90,7 @@ endif
32	ifeq ($(DEBUG),1)
33	OPT=-g $(DEBUGOPT)
34	else
35	-OPT=-O3
36	+#OPT=-O3
37	endif
38
39

Lines 1-23 Link Here

(-)sysutils/dupd/files/patch-src_main.c (-23 lines)
1	--- src/main.c.orig 2018-04-08 20:02:52 UTC
2	+++ src/main.c
3	@@ -141,19 +141,8 @@ static void show_help()
4	*/
5	static void show_usage()
6	{
7	+ system("/usr/bin/man dupd");
8	show_banner();
9	-
10	-#ifndef __APPLE__
11	- char * p = &_binary_man_dupd_start;
12	- while (p != &_binary_man_dupd_end) {
13	- putchar(*p++);
14	- }
15	-#else
16	- printf("Usage documentation not available on Darwin!\n");
17	- printf("\n");
18	- printf("Alternatively, refer to the document here:\n");
19	- printf("https://github.com/jvirkki/dupd\n");
20	-#endif
21	}
22
23