[90452] trunk/dports/devel/git-core

[ryandesign at macports.org]

Revision: 90452
          http://trac.macports.org/changeset/90452
Author:   ryandesign at macports.org
Date:     2012-03-05 22:54:31 -0800 (Mon, 05 Mar 2012)
Log Message:
-----------
git-core: build git-credential-osxkeychain for the right archs, and avoid installing the build artifacts

Modified Paths:
--------------
    trunk/dports/devel/git-core/Portfile

Added Paths:
-----------
    trunk/dports/devel/git-core/files/patch-contrib-credential-osxkeychain-Makefile.diff

Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile	2012-03-06 06:20:00 UTC (rev 90451)
+++ trunk/dports/devel/git-core/Portfile	2012-03-06 06:54:31 UTC (rev 90452)
@@ -5,6 +5,7 @@
 
 name                git-core
 version             1.7.9.2
+revision            1
 description         A fast version control system
 long_description    Git is a fast, scalable, distributed open source version \
                     control system focusing on speed and efficiency.
@@ -166,13 +167,16 @@
 
 
 variant credential_osxkeychain description {Install git credential-osxkeychain utility from contrib} {
+    patchfiles-append   patch-contrib-credential-osxkeychain-Makefile.diff
+
     post-build {
-        system -W "${worksrcpath}/contrib/credential/osxkeychain" "make CC='${configure.cc}' CFLAGS='${configure.cflags}'"
+        system -W "${worksrcpath}/contrib/credential/osxkeychain" "make [join ${build.args}]"
     }
 
-    post-destroot {
+    pre-destroot {
         xinstall -m 755 "${worksrcpath}/contrib/credential/osxkeychain/git-credential-osxkeychain" \
             "${destroot}${prefix}/bin/"
+        system -W "${worksrcpath}/contrib/credential/osxkeychain" "make clean"
     }
 }
 

Added: trunk/dports/devel/git-core/files/patch-contrib-credential-osxkeychain-Makefile.diff
===================================================================
--- trunk/dports/devel/git-core/files/patch-contrib-credential-osxkeychain-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/git-core/files/patch-contrib-credential-osxkeychain-Makefile.diff	2012-03-06 06:54:31 UTC (rev 90452)
@@ -0,0 +1,11 @@
+--- a/contrib/credential/osxkeychain/Makefile.orig	2012-02-22 20:04:18.000000000 -0600
++++ b/contrib/credential/osxkeychain/Makefile	2012-03-06 00:41:11.000000000 -0600
+@@ -5,7 +5,7 @@
+ CFLAGS = -g -Wall
+ 
+ git-credential-osxkeychain: git-credential-osxkeychain.o
+-	$(CC) -o $@ $< -Wl,-framework -Wl,Security
++	$(CC) $(LDFLAGS) -o $@ $< -Wl,-framework -Wl,Security
+ 
+ git-credential-osxkeychain.o: git-credential-osxkeychain.c
+ 	$(CC) -c $(CFLAGS) $<
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120305/d0140683/attachment.html>