Ticket #27583: Portfile.patch

File Portfile.patch, 3.1 KB (added by maccheck@…, 14 years ago)
  • Portfile

    diff --git a/Portfile b/Portfile
    index 9151aca..642f67f 100644
    a b PortSystem 1.0 
    55
    66name              git-core
    77version           1.7.3.3
     8revision          1
    89description       A fast version control system
    910long_description  Git is a fast, scalable, distributed open source version \
    1011                  control system focusing on speed and efficiency.
    checksums git-${version}${extract.suffix} \ 
    2829                    rmd160  402ce22ba5c3b13e1562feb5f94f4dd0cca7753f
    2930
    3031depends_run  port:rsync port:p5-error
    31 depends_lib  path:bin/perl:perl5 port:curl port:zlib port:openssl port:expat port:libiconv port:python26
     32depends_lib  path:bin/perl:perl5 port:curl port:zlib port:openssl port:expat port:libiconv
    3233
    3334patchfiles   patch-Makefile.diff
    3435
    if {[variant_isset universal]} { 
    5253build.args     CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
    5354               CC=${configure.cc} \
    5455               prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
    55                PERL_PATH="${prefix}/bin/perl" PYTHON_PATH="${prefix}/bin/python2.6" NO_FINK=1 NO_DARWIN_PORTS=1 \
     56               PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1 \
    5657               NO_R_TO_GCC_LINKER=1
    5758
    5859test.run       yes
    test.cmd make 
    6061test.target    test
    6162test.dir       ${worksrcpath}
    6263test.args      prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
    63                PERL_PATH="${prefix}/bin/perl" PYTHON_PATH="${prefix}/bin/python2.6" NO_FINK=1 NO_DARWIN_PORTS=1
     64               PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1
    6465
    6566destroot.destdir  DESTDIR=${destroot} prefix=${prefix}
    6667destroot.target   install
    6768destroot.args     CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
    6869                  prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
    69                   PERL_PATH="${prefix}/bin/perl" PYTHON_PATH="${prefix}/bin/python2.6" NO_FINK=1 NO_DARWIN_PORTS=1 \
     70                  PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1 \
    7071                  NO_R_TO_GCC_LINKER=1
    7172
    7273post-destroot {
    post-destroot { 
    9596    }
    9697}
    9798
     99if {![variant_isset python26] && ![variant_isset python27]} {
     100    default_variants    +python26
     101}
     102
     103variant python26 conflicts python27 description {Use Python 2.6} {
     104    build.args-append       PYTHON_PATH="${prefix}/bin/python2.6"
     105    destroot.args-append    PYTHON_PATH="${prefix}/bin/python2.6"
     106    test.args-append        PYTHON_PATH="${prefix}/bin/python2.6"
     107    depends_lib-append      port:python26
     108}
     109
     110variant python27 conflicts python26 description {Use Python 2.7} {
     111    build.args-append       PYTHON_PATH="${prefix}/bin/python2.7"
     112    destroot.args-append    PYTHON_PATH="${prefix}/bin/python2.7"
     113    test.args-append        PYTHON_PATH="${prefix}/bin/python2.7"
     114    depends_lib-append      port:python27
     115}
     116
    98117variant doc description {Install HTML and plaintext documentation} {
    99118    distfiles-append    git-htmldocs-${version}${extract.suffix}
    100119    checksums-append    git-htmldocs-${version}${extract.suffix} \