Attachment 189138 Details for Bug 224620 – v1

[patch] v1

duff.diff (text/plain), 1.83 KB, created by Mathieu Arnold on 2017-12-27 17:02:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2017-12-27 17:02:14 UTC

Size: 1.83 KB

patch

obsolete

>base commit: r457377
>diff --git sysutils/duff/Makefile sysutils/duff/Makefile
>index cb7829f..41dd1e0 100644
>--- sysutils/duff/Makefile
>+++ sysutils/duff/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	duff
> PORTVERSION=	0.5.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> 
>@@ -12,18 +12,25 @@ COMMENT=	Duplicate file finder
> LICENSE=	ZLIB
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		tar:bzip2
>+USES=		tar:bzip2 shebangfix
> GNU_CONFIGURE=	yes
>+bash_OLD_CMD=	/bin/sh
>+SHEBANG_FILES=	join-duplicates.sh
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> PORTDOCS=	README.SHA
> 
>-OPTIONS_DEFINE=	NLS
>+OPTIONS_DEFINE=	NLS JOIN
> OPTIONS_SUB=	yes
> 
>+JOIN_DESC=	Add run-dependencies for join-duplicates.sh
>+
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
> 
>+JOIN_RUN_DEPENDS=	bash:shells/bash \
>+			gtouch:sysutils/coreutils
>+
> .include <bsd.port.mk>
>diff --git sysutils/duff/files/patch-join-duplicates.sh sysutils/duff/files/patch-join-duplicates.sh
>new file mode 100644
>index 0000000..a90ca85
>--- /dev/null
>+++ sysutils/duff/files/patch-join-duplicates.sh
>@@ -0,0 +1,26 @@
>+--- join-duplicates.sh.orig	2011-04-10 13:17:26 UTC
>++++ join-duplicates.sh
>+@@ -25,16 +25,19 @@ duff -r '-f#' -z -p -P "$1" |
>+       if [ "$first" == '' ]; then
>+         first="$file"
>+       else
>+-	temp=`mktemp -p \`dirname $file\``
>++	dir=`dirname "$file"`
>++	temp=`gmktemp -p "$dir"`
>+ 
>+ 	mv "$file" "$temp" && \
>+ 	ln "$first" "$file" && \
>+-	touch --reference="$temp" "$file" && \
>++	gtouch --reference="$temp" "$file" && \
>+ 	rm "$temp"
>+ 
>++	echo "$first <- $file"
>++
>+ 	if [ $? != 0 ]; then
>+-	  echo "`basename $0`: $file: failed to join with $first"
>+-	  echo "`basename $0`: $file: may exist as $temp"
>++	  echo "`basename "$0"`: $file: failed to join with $first"
>++	  echo "`basename "$0"`: $file: may exist as $temp"
>+ 	  exit 1
>+ 	fi
>+       fi

Actions: View | Diff

Attachments on bug 224620: 189138