git-core 1.6.0 fails for non-svn variant

[jcopenha@…]

Trying to install git-core without the svn variant I get

Error: Unable to upgrade port: 1

---> Staging git-core into destroot

Error: Target org.macports.destroot returned: shell command "rm /opt/local/var/macports/build
/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_git-core/work/destroot/opt/local
/bin/git-svn*" returned error 1

Command output: rm: /opt/local/var/macports/build
/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_git-core/work/destroot/opt/local/bin/git-svn*: No such file or directory

Between git 1.5.6.1 and git 1.6.0 they changed where git-svn and a bunch of other git-* files get installed (Makefile $gitexecdir). They are now in /opt/local/libexec/git-core instead of /opt/local/bin

This oneliner fixes it.

--- Portfile.orig	2008-08-18 20:13:31.000000000 -0400
+++ Portfile	2008-08-18 20:13:44.000000000 -0400
@@ -57,7 +57,7 @@
         }
     }
     if {![variant_isset svn]} {
-        system "rm ${destroot}${prefix}/bin/git-svn*"
+        system "rm ${destroot}${prefix}/libexec/git-core/git-svn*"
     }
     set docdestroot ${destroot}${prefix}/share/doc/${name}
     xinstall -d ${docdestroot}

[blb@…]

Assigning/Cc to maintainers.

[maccheck@…]

I can confirm that this patch fixes the issue. In version 1.6.0 the location from most of the git functions were moved to */libexec/git-core. I'm attaching an updated Portfile patch.

[pguyot (Paul Guyot)]

Committed in r39426.

[(none)]

Milestone Port Bugs deleted