renameutils 0.12.0

Upgrade renameutils to version 0.12.0.
Adjust one of the three patches for the new file structure.
Add a fourth patch to fix a Makefile syntax error that would cause
`make install` to fail.  Reported upstream via email and fixed in
HEAD.  Taken from HEAD but not applied directly to `Makefile.am`.
Apply it to `Makefile.in` so there's no need for new deps on
autotools.

Tested on Lion using clang and llvm from XCode-4.3.3.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 58 insertions, 7 deletions

diff --git a/Library/Formula/renameutils.rb b/Library/Formula/renameutils.rb
index 49684d6de..d1c142c2c 100644
--- a/Library/Formula/renameutils.rb
+++ b/Library/Formula/renameutils.rb
@@ -2,19 +2,19 @@ require 'formula'
 
 class Renameutils < Formula
   homepage 'http://www.nongnu.org/renameutils/'
-  url 'http://nongnu.uib.no/renameutils/renameutils-0.11.0.tar.gz'
-  md5 'a3258f875d6077a06b6889de3a317dce'
+  url 'http://download.savannah.gnu.org/releases/renameutils/renameutils-0.12.0.tar.gz'
+  sha1 '8c6edae4ee374330a01a95257fd552b5cb7540bc'
 
   depends_on 'readline' # Use instead of system libedit
   depends_on 'coreutils'
 
   # Use the GNU versions of certain system utilities. See:
   # https://trac.macports.org/ticket/24525
-  def patches
-    { :p0 =>
-      "https://trac.macports.org/export/91404/trunk/dports/sysutils/renameutils/files/patch-use_coreutils.diff"
-    }
-  end
+  # Patches rewritten at version 0.12.0 to handle file changes.
+  # The fourth patch is new and fixes a Makefile syntax error that causes
+  # make install to fail.  Reported upstream via email and fixed in HEAD.
+  # Remove patch #4 at version > 0.12.0.  The first three should persist.
+  def patches; DATA; end
 
   def install
     system "./configure", "--disable-dependency-tracking",
@@ -25,3 +25,54 @@ class Renameutils < Formula
     system "make install"
   end
 end
+
+__END__
+--- a/src/apply.c
++++ b/src/apply.c
+@@ -72,9 +72,9 @@ perform_command(FileSpec *spec)
+     if (force_command != NULL)
+         command = force_command;
+     else if (strcmp(program, "qmv") == 0)
+-        command = "mv";
++        command = "gmv";
+     else
+-        command = "cp";
++        command = "gcp";
+ 
+     child = fork();
+     if (child < 0) {
+--- a/src/icmd.c
++++ b/src/icmd.c
+@@ -45,8 +45,8 @@
+ #include "common/string-utils.h"
+ #include "common/common.h"
+ 
+-#define MV_COMMAND "mv"
+-#define CP_COMMAND "cp"
++#define MV_COMMAND "gmv"
++#define CP_COMMAND "gcp"
+ /* This list should be up to date with mv and cp!
+  * It was last updated on 2007-11-30 for
+  * Debian coreutils 5.97-5.4 in unstable.
+--- a/src/qcmd.c	2011-08-21 10:15:51.000000000 -0700
++++ b/src/qcmd.c	2012-06-28 15:51:48.000000000 -0700
+@@ -239,7 +239,7 @@
+     editor_program = xstrdup(editor_program);
+ 
+     if (ls_program == NULL)
+-        ls_program = xstrdup("ls");
++        ls_program = xstrdup("gls");
+ 
+     /* Parse format options */
+     if (format_options != NULL && !format->parse_options(format_options))
+--- a/src/Makefile.in	2012-04-23 04:24:10.000000000 -0700
++++ b/src/Makefile.in	2012-06-29 00:42:45.000000000 -0700
+@@ -1577,7 +1577,7 @@
+ 	@[ -f icp ] || (echo $(LN_S) icmd icp ; $(LN_S) icmd icp)
+ 
+ install-exec-local:
+-	$(mkdir_p) $(DESTDIR)($bindir)
++	$(mkdir_p) $(DESTDIR)$(bindir)
+ 	@[ -f $(DESTDIR)$(bindir)/qmv ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv)
+ 	@[ -f $(DESTDIR)$(bindir)/qcp ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp)
+ 	@[ -f $(DESTDIR)$(bindir)/imv ] || (echo $(LN_S) icmd $(DESTDIR)$(bindir)/imv ; $(LN_S) icmd $(DESTDIR)$(bindir)/imv)