[133895] trunk/dports/devel/quilt

[ionic at macports.org]

Revision: 133895
          https://trac.macports.org/changeset/133895
Author:   ionic at macports.org
Date:     2015-03-14 19:56:18 -0700 (Sat, 14 Mar 2015)
Log Message:
-----------
quilt: add patch to make stat *really* configurable and use it. Force ${prefix}/bin/gstat. Revbump. Fixes run time errors of trace mode builds.

Modified Paths:
--------------
    trunk/dports/devel/quilt/Portfile

Added Paths:
-----------
    trunk/dports/devel/quilt/files/
    trunk/dports/devel/quilt/files/patch-Makefile.in-quilt_scripts_backup-files.in-make-stat-configurable.diff

Modified: trunk/dports/devel/quilt/Portfile
===================================================================
--- trunk/dports/devel/quilt/Portfile	2015-03-15 02:44:57 UTC (rev 133894)
+++ trunk/dports/devel/quilt/Portfile	2015-03-15 02:56:18 UTC (rev 133895)
@@ -5,6 +5,7 @@
 
 name                quilt
 version             0.64
+revision            1
 categories          devel
 platforms           darwin
 supported_archs     noarch
@@ -25,7 +26,11 @@
                     port:getopt \
                     port:coreutils
 
-configure.args      --with-sed=${prefix}/bin/gsed
+patchfiles          patch-Makefile.in-quilt_scripts_backup-files.in-make-stat-configurable.diff
+
+configure.args      --with-sed=${prefix}/bin/gsed \
+                    --with-stat=${prefix}/bin/gstat
+
 destroot.destdir    BUILD_ROOT=${destroot}
 
 livecheck.type      regex

Added: trunk/dports/devel/quilt/files/patch-Makefile.in-quilt_scripts_backup-files.in-make-stat-configurable.diff
===================================================================
--- trunk/dports/devel/quilt/files/patch-Makefile.in-quilt_scripts_backup-files.in-make-stat-configurable.diff	                        (rev 0)
+++ trunk/dports/devel/quilt/files/patch-Makefile.in-quilt_scripts_backup-files.in-make-stat-configurable.diff	2015-03-15 02:56:18 UTC (rev 133895)
@@ -0,0 +1,47 @@
+--- Makefile.in.old	2015-03-15 03:34:07.000000000 +0100
++++ Makefile.in	2015-03-15 03:35:32.000000000 +0100
+@@ -27,6 +27,7 @@
+ GREP :=		@GREP@
+ TAIL :=		@TAIL@
+ TR :=		@TR@
++STAT :=		@STAT@
+ SED :=		@SED@
+ AWK :=		@AWK@
+ FIND :=		@FIND@
+@@ -262,6 +263,7 @@
+ 		-e 's:@PERL''@:$(PERL):g'				\
+ 		-e 's:@BASH''@:$(BASH):g'				\
+ 		-e 's:@PATCH''@:$(PATCH):g'				\
++		-e 's:@STAT''@:$(STAT):g'				\
+ 		-e 's:@STAT_HARDLINK''@:$(STAT_HARDLINK):g'		\
+ 		-e 's:@VERSION''@:$(VERSION):g'				\
+ 		-e 's:@ETCDIR''@:$(etcdir):g'				\
+--- quilt/scripts/backup-files.in.old	2015-03-15 03:34:07.000000000 +0100
++++ quilt/scripts/backup-files.in	2015-03-15 03:37:19.000000000 +0100
+@@ -61,7 +61,7 @@
+ 	local filename=$1
+ 	local link_count tmpname
+ 
+-	link_count=$(stat @STAT_HARDLINK@ "$filename")
++	link_count=$(@STAT@ @STAT_HARDLINK@ "$filename")
+ 	if [ $link_count -gt 1 ]; then
+ 		tmpname=$(mktemp "$filename.XXXXXX")
+ 		cp -p "$filename" "$tmpname"
+@@ -91,7 +91,7 @@
+ 
+ 	if [ -e "$file" ]; then
+ 		$ECHO "Copying $file"
+-		if [ -n "$OPT_NOLINKS" -a "$(stat @STAT_HARDLINK@ "$file")" = 1 ]; then
++		if [ -n "$OPT_NOLINKS" -a "$(@STAT@ @STAT_HARDLINK@ "$file")" = 1 ]; then
+ 			cp -p "$file" "$backup"
+ 		else
+ 			ln "$file" "$backup" 2>&4 || cp -p "$file" "$backup"
+@@ -264,7 +264,7 @@
+ some_files_have_links()
+ {
+ 	(cd "$OPT_PREFIX" && find . -type f -print0) \
+-	| xargs -0 stat @STAT_HARDLINK@ 2>&4 | grep -qv '^1$'
++	| xargs -0 @STAT@ @STAT_HARDLINK@ 2>&4 | grep -qv '^1$'
+ }
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150314/223292e0/attachment-0001.html>