Revision: 74216 http://trac.macports.org/changeset/74216 Author: ryandesign@macports.org Date: 2010-12-07 12:25:43 -0800 (Tue, 07 Dec 2010) Log Message: ----------- git-core: maintainer update to 1.7.3.3 (#27590) and add python26 and python27 variants (python26 is still the default) (#27583) Modified Paths: -------------- trunk/dports/devel/git-core/Portfile Modified: trunk/dports/devel/git-core/Portfile =================================================================== --- trunk/dports/devel/git-core/Portfile 2010-12-07 20:24:38 UTC (rev 74215) +++ trunk/dports/devel/git-core/Portfile 2010-12-07 20:25:43 UTC (rev 74216) @@ -4,8 +4,7 @@ PortSystem 1.0 name git-core -version 1.7.3.2 -revision 1 +version 1.7.3.3 description A fast version control system long_description Git is a fast, scalable, distributed open source version \ control system focusing on speed and efficiency. @@ -20,16 +19,16 @@ git-manpages-${version}${extract.suffix} checksums git-${version}${extract.suffix} \ - md5 902f7f07a789fedc0d2ac03656b85969 \ - sha1 cd8d806752aa6f5716cf193585024a002e098bf4 \ - rmd160 b645fc9e82eff3e186398280bc0a4ad72089b457 \ + md5 0430440eeb7c037afd4254bc6fd2cce8 \ + sha1 8d8f6bbfa176ff9dc9c646a5341e58b35c09ae02 \ + rmd160 ca39f8988c0eff1b63f81ef405ae75cbc0be6540 \ git-manpages-${version}${extract.suffix} \ - md5 80bbef2adeaae852f04a9f143aaa5204 \ - sha1 0be6fabbca523085e185711f2b80c99330f1e4ac \ - rmd160 2a3e82a28bc955ffadfa91c5459f992ed17fa9f2 + md5 554b648ee9859c73955978e65d9a8c94 \ + sha1 52dbc6093bce00e659c92c0a52a4770fc3fd5ee8 \ + rmd160 402ce22ba5c3b13e1562feb5f94f4dd0cca7753f depends_run port:rsync port:p5-error -depends_lib path:bin/perl:perl5 port:curl port:zlib port:openssl port:expat port:libiconv port:python26 +depends_lib path:bin/perl:perl5 port:curl port:zlib port:openssl port:expat port:libiconv patchfiles patch-Makefile.diff @@ -53,7 +52,7 @@ build.args CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ CC=${configure.cc} \ prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \ - PERL_PATH="${prefix}/bin/perl" PYTHON_PATH="${prefix}/bin/python2.6" NO_FINK=1 NO_DARWIN_PORTS=1 \ + PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1 \ NO_R_TO_GCC_LINKER=1 test.run yes @@ -61,13 +60,13 @@ test.target test test.dir ${worksrcpath} test.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \ - PERL_PATH="${prefix}/bin/perl" PYTHON_PATH="${prefix}/bin/python2.6" NO_FINK=1 NO_DARWIN_PORTS=1 + PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1 destroot.destdir DESTDIR=${destroot} prefix=${prefix} destroot.target install destroot.args CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \ - PERL_PATH="${prefix}/bin/perl" PYTHON_PATH="${prefix}/bin/python2.6" NO_FINK=1 NO_DARWIN_PORTS=1 \ + PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1 \ NO_R_TO_GCC_LINKER=1 post-destroot { @@ -96,12 +95,30 @@ } } +if {![variant_isset python26] && ![variant_isset python27]} { + default_variants +python26 +} + +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 doc description {Install HTML and plaintext documentation} { distfiles-append git-htmldocs-${version}${extract.suffix} checksums-append git-htmldocs-${version}${extract.suffix} \ - md5 0f25e3ebfb98dfa9cee6d81315051d63 \ - sha1 4be705c67a4c7954591c642437c2733b902b080d \ - rmd160 3a30ca0bdda0a2db9d99ad23857e55b376ee1ec5 + md5 f88d5054e4aa4b3f6f7769e4784e6bd9 \ + sha1 50ef88b8f0d502abb87a1b8c24a4ac7dbeb460c9 \ + rmd160 fc39efc86b35bda0f6034cafe19a8ff58b464cc3 } variant gitweb description {Install gitweb.cgi} {