[78864] trunk/dports/sysutils/convmv

[ryandesign at macports.org]

Revision: 78864
          http://trac.macports.org/changeset/78864
Author:   ryandesign at macports.org
Date:     2011-05-24 09:55:41 -0700 (Tue, 24 May 2011)
Log Message:
-----------
convmv: don't delete user's files when doing case-only renames; see #29563

Modified Paths:
--------------
    trunk/dports/sysutils/convmv/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/convmv/files/
    trunk/dports/sysutils/convmv/files/patch-convmv.diff

Modified: trunk/dports/sysutils/convmv/Portfile
===================================================================
--- trunk/dports/sysutils/convmv/Portfile	2011-05-24 16:51:22 UTC (rev 78863)
+++ trunk/dports/sysutils/convmv/Portfile	2011-05-24 16:55:41 UTC (rev 78864)
@@ -4,6 +4,7 @@
 
 name			convmv
 version			1.14
+revision		1
 categories		sysutils perl
 platforms		darwin
 maintainers		nomaintainer
@@ -31,9 +32,7 @@
 
 depends_lib		bin:perl:perl5
 
-patch {
-	reinplace "s|/usr/bin/perl|/usr/bin/env perl|g" ${worksrcpath}/convmv
-}
+patchfiles		patch-convmv.diff
 
 use_configure	no
 

Added: trunk/dports/sysutils/convmv/files/patch-convmv.diff
===================================================================
--- trunk/dports/sysutils/convmv/files/patch-convmv.diff	                        (rev 0)
+++ trunk/dports/sysutils/convmv/files/patch-convmv.diff	2011-05-24 16:55:41 UTC (rev 78864)
@@ -0,0 +1,19 @@
+--- convmv.orig	2008-12-11 18:38:34.000000000 -0600
++++ convmv	2011-05-24 11:53:29.000000000 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ # convmv 1.14 - converts filenames from one encoding to another
+ # Copyright © 2003-2008 Bjoern JACKE <bjoern at j3e.de>
+ #
+@@ -577,10 +577,8 @@
+ 	if (-e $newname and !$opt_exec) {
+ 		if ($opt_replace and !&compare($oldfile,$newname)) {
+ 			if ($opt_notest) {
+-				unlink $newname or print $outerr "Error: $!\n";
+ 				rename ($oldfile, $newname) or print $outerr "Error: $!\n";
+ 			} elsif ($opt_parsable) {
+-				print "unlink".$del.$dir."/".$oldfile.$fin_del;
+ 				print "rename".$del.$dir."/".$oldfile.$del.$dir."/".$newname.$fin_del;
+ 			}
+ 		} else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110524/6f8f2b5a/attachment.html>