[90450] trunk/dports/devel/git-core/Portfile

[ryandesign at macports.org]

Revision: 90450
          http://trac.macports.org/changeset/90450
Author:   ryandesign at macports.org
Date:     2012-03-05 22:19:44 -0800 (Mon, 05 Mar 2012)
Log Message:
-----------
git-core: reference the build.args in test.args and destroot.args, instead of defining them anew each time

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

Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile	2012-03-06 05:16:13 UTC (rev 90449)
+++ trunk/dports/devel/git-core/Portfile	2012-03-06 06:19:44 UTC (rev 90450)
@@ -65,30 +65,14 @@
 test.cmd            make
 test.target         test
 test.dir            ${worksrcpath}
-test.args           CFLAGS="${CFLAGS}" \
-                    LDFLAGS="${LDFLAGS}" \
-                    CC=${configure.cc} \
-                    prefix=${prefix} \
-                    CURLDIR=${prefix} \
-                    OPENSSLDIR=${prefix} \
-                    ICONVDIR=${prefix} \
-                    PERL_PATH="${prefix}/bin/perl5.12" \
-                    NO_FINK=1 \
-                    NO_DARWIN_PORTS=1 \
-                    NO_R_TO_GCC_LINKER=1
+pre-test {
+    eval test.args  ${build.args}
+}
 
 destroot.target     install
-destroot.args       CFLAGS="${CFLAGS}" \
-                    LDFLAGS="${LDFLAGS}" \
-                    CC=${configure.cc} \
-                    prefix=${prefix} \
-                    CURLDIR=${prefix} \
-                    OPENSSLDIR=${prefix} \
-                    ICONVDIR=${prefix} \
-                    PERL_PATH="${prefix}/bin/perl5.12" \
-                    NO_FINK=1 \
-                    NO_DARWIN_PORTS=1 \
-                    NO_R_TO_GCC_LINKER=1
+pre-destroot {
+    eval destroot.args  ${build.args}
+}
 
 post-destroot {
     foreach f {1 5 7} {
@@ -122,22 +106,16 @@
 
 variant python26 conflicts python27 description {Use Python 2.6} {
     build.args-append       PYTHON_PATH="${prefix}/bin/python2.6"
-    destroot.args-append    PYTHON_PATH="${prefix}/bin/python2.6"
-    test.args-append        PYTHON_PATH="${prefix}/bin/python2.6"
     depends_lib-append      port:python26
 }
 
 variant python27 conflicts python26 description {Use Python 2.7} {
     build.args-append       PYTHON_PATH="${prefix}/bin/python2.7"
-    destroot.args-append    PYTHON_PATH="${prefix}/bin/python2.7"
-    test.args-append        PYTHON_PATH="${prefix}/bin/python2.7"
     depends_lib-append      port:python27
 }
 
 variant pcre {
     build.args-append       LIBPCREDIR=${prefix} USE_LIBPCRE=1
-    destroot.args-append    LIBPCREDIR=${prefix} USE_LIBPCRE=1
-    test.args-append        LIBPCREDIR=${prefix} USE_LIBPCRE=1
     depends_lib-append      port:pcre
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120305/42f3fff5/attachment-0001.html>