Attachment 192352 Details for Bug 226841 – sysutils/dupd: update to version 1.6, again

[patch] sysutils/dupd: update to version 1.6, again

patch-sysutils_dupd-1.6 (text/plain), 4.12 KB, created by Thomas Hurst on 2018-04-08 23:25:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Hurst

Created: 2018-04-08 23:25:03 UTC

Size: 4.12 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 466804)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	dupd
>-PORTVERSION=	1.4
>+PORTVERSION=	1.6
> CATEGORIES=	sysutils
> 
> MAINTAINER=	tom@hur.st
>@@ -11,24 +11,22 @@
> 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
> 
>-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
>Index: distinfo
>===================================================================
>--- distinfo	(revision 466804)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 466804)
>+++ files/patch-Makefile	(working copy)
>@@ -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
>  
>- $(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
>+-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
>  
>- clean:
>- 	rm -f dupd
>+ ifeq ($(BUILD_OS),SunOS)
>+ CC=gcc
>+@@ -92,7 +90,7 @@ endif
>+ ifeq ($(DEBUG),1)
>+ OPT=-g $(DEBUGOPT)
>+ else
>+-OPT=-O3
>++#OPT=-O3
>+ endif
>+ 
>+ 
>Index: files/patch-src_utils.h
>===================================================================
>--- files/patch-src_utils.h	(revision 466804)
>+++ files/patch-src_utils.h	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-src_utils.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 226841: 191731 | 192352 | 192363 | 195186