Attachment #192352 for bug #226841




# $FreeBSD$

PORTNAME=	dupd
PORTVERSION=	1.6
CATEGORIES=	sysutils

MAINTAINER=	tom@hur.st

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

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

Lines 1-5 Link Here

(-)distinfo (-5 / +3 lines)
1	TIMESTAMP = 1491411043	1	TIMESTAMP = 1523215351
2	SHA256 (jvirkki-dupd-1.4_GH0.tar.gz) = be98c8fe60bdcc281898930b2604a1b97570de611fecc02732af4a81329438d3	2	SHA256 (jvirkki-dupd-1.6_GH0.tar.gz) = 68bce4d5ac0b8a00ac50da65634950eb46fb11a571e546fb543fc6c6bf6b79da
3	SIZE (jvirkki-dupd-1.4_GH0.tar.gz) = 953654	3	SIZE (jvirkki-dupd-1.6_GH0.tar.gz) = 973621
4	SHA256 (jvirkki-libbloom-v1.4_GH0.tar.gz) = 3df57d14c56f4a16a26d04b83891df844caa4b06d9b19f822d10c3c26f31311b
5	SIZE (jvirkki-libbloom-v1.4_GH0.tar.gz) = 1209355




--- Makefile.orig	2018-03-21 18:56:42 UTC
+++ Makefile
@@ -21,7 +21,7 @@ TOP:=$(shell  pwd)
 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/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

Return to bug 226841

Lines 2-8 Link Here

(-)Makefile (-13 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dupd	4	PORTNAME= dupd
5	PORTVERSION= 1.4	5	PORTVERSION= 1.6
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
		15	NOT_FOR_ARCHS_REASON= test fails on large files on 32-bit
		16
		17	USES= gmake ssl sqlite:3
		18	USE_PERL5= test
		19
		20	TEST_DEPENDS+= bash:shells/bash
		21
14	USE_GITHUB= yes	22	USE_GITHUB= yes
15	GH_ACCOUNT= jvirkki	23	GH_ACCOUNT= jvirkki
16	GH_PROJECT= libbloom:libbloom
17	GH_TAGNAME= v1.4:libbloom
18		24
19	USES= gmake ssl sqlite:3	25	ALL_TARGET= dupd
20	LLD_UNSAFE= yes	26	TEST_TARGET= test
21		27
22	PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz	28	PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
23		29
24	MAKE_ARGS= LIB="-L${PREFIX}/lib" INC="-I${WRKSRC_libbloom} -I${PREFIX}/include" \
25	LIBBLOOM_LIB="${WRKSRC_libbloom}/build" USAGE="${WRKSRC}/build/usage.o" \
26	DIRENT_HAS_TYPE=1 GITHASH=c25a635e1d27ebf5759875a7ff907d8eec7f5be9
27
28	do-build:
29	(cd ${WRKSRC_libbloom} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${WRKSRC_libbloom}/build/libbloom.a MM=-DGRR)
30	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS})
31
32	do-install:	30	do-install:
33	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	31	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
34	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1	32	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1

Lines 1-19 Link Here

(-)files/patch-Makefile (-10 / +30 lines)
1	--- Makefile.orig 2017-02-26 10:05:09 UTC	1	--- Makefile.orig 2018-03-21 18:56:42 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -20,7 +20,6 @@	3	@@ -21,7 +21,7 @@ TOP:=$(shell pwd)
4	TOP:=$(shell pwd)
5	BUILD_OS:=$(shell uname)	4	BUILD_OS:=$(shell uname)
		5	BUILD_MACHINE:=$(shell uname -m)
6	VERSION:=$(shell cat version)	6	VERSION:=$(shell cat version)
7	-GITHASH:=$(shell git rev-parse HEAD)	7	-GITHASH:=$(shell git rev-parse HEAD)
		8	+GITHASH:=
8	OPTGEN:=$(shell which optgen \| head -c1)	9	OPTGEN:=$(shell which optgen \| head -c1)
9		10
10	ifeq ($(LCOV_OUTPUT_DIR),)	11	ifeq ($(LCOV_OUTPUT_DIR),)
11	@@ -98,7 +97,7 @@ $(BUILD)/%.o: src/%.c src/%.h	12	@@ -66,14 +66,12 @@ USAGE=$(BUILD)/usage.o
12	-c $< -o $@	13	USAGE_ARCH=-O elf64-x86-64 -B i386
		14	endif
13		15
14	$(BUILD)/usage.o: man/dupd	16	-ifeq ($(BUILD_OS),FreeBSD)
15	- $(OBJCP) -I binary $(USAGE_ARCH) man/dupd $(BUILD)/usage.o	17	-INC+=-I/usr/local/include
16	+ ld -r -b binary -o $(BUILD)/usage.o man/dupd	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
17		28
18	clean:	29	ifeq ($(BUILD_OS),SunOS)
19	rm -f dupd	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-14 Link Here

(-)files/patch-src_utils.h (-14 lines)
1	--- src/utils.h.orig 2017-02-26 10:05:09 UTC
2	+++ src/utils.h
3	@@ -37,6 +37,11 @@
4	#define LSTAT lstat
5	#endif
6
7	+#ifdef __FreeBSD__
8	+#define STRUCT_STAT struct stat
9	+#define LSTAT lstat
10	+#endif
11	+
12	#ifdef sun
13	#define STRUCT_STAT struct stat64
14	#define LSTAT lstat64