Ticket #11962: git-core-1.5.2.patch

File git-core-1.5.2.patch, 3.9 KB (added by bryan@…, 17 years ago)

  • git-core/Portfile 

    diff --git a/git-core/Portfile b/git-core/Portfile
index bdbe78b..ad87b31 100644
    a b  
    22
    33PortSystem 1.0
    44name            git-core
    5 version         1.5.1.3
     5version         1.5.2
    66description     The stupid content tracker.
    77long_description        A stupid (but extremely fast) directory \
    88                        content manager. It doesn't do a whole lot, \
    99                        but what it _does_ do is track directory contents \
    10                         efficiently. 
     10                        efficiently.
    1111maintainers     bryan@larsen.st
    1212categories      devel
    1313platforms       darwin
    … … distname git-${version} 
    1818distfiles       git-${version}${extract.suffix} \
    1919                git-manpages-${version}${extract.suffix}
    2020 
    21 checksums       git-${version}${extract.suffix} sha1 673bbd457e713251a7fbf54369150dd760c5606d \
    22                 git-manpages-${version}${extract.suffix} sha1 3a5ecaa36fb5b7c3dba9a96240016fcccac6cfc0
    23 depends_run     port:curl port:diffutils \
    24                 port:openssh port:rsync port:gsed
     21checksums       git-${version}${extract.suffix} sha1 f60d8dbf0926a3c12a1658bac177b383939d8e54 \
     22                git-manpages-${version}${extract.suffix} sha1 025a4a65e6a1c9aa1abfd64007ba3559655bb629
     23depends_run     port:curl port:openssh port:rsync
    2524depends_lib     port:curl port:zlib port:openssl port:expat port:libiconv
    2625
    27 patchfiles      patch-Makefiles patch-curl patch-t4200 patch-ld-R patch-perl-path
     26patchfiles      patch-Makefiles patch-curl patch-ld-R
    2827
    2928use_configure   no
    3029
    … … destroot.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=$ 
    4342
    4443post-destroot {
    4544        cd ${workpath}
    46         foreach f {1 7} {
     45        foreach f {1 5 7} {
    4746                xinstall -d ${destroot}${prefix}/share/man/man${f}
    4847                foreach m [glob man${f}/*.${f}] {
    4948                        xinstall ${m} ${destroot}${prefix}/share/man/man${f}
    5049                }
    5150        }
    52         if {[variant_isset no_svn]} {
     51        if {![variant_isset svn]} {
    5352                system "rm ${destroot}${prefix}/bin/git-svn*"
    5453        }
    5554}
    … … variant doc { 
    6059        destroot.target-append  install-doc
    6160}
    6261
    63 variant svn conflicts no_svn {
     62variant svn {
    6463        depends_run             port:p5-svn-simple port:subversion port:perl port:p5-libwww-perl
    6564}
    66 
    67 variant no_svn conflicts svn {
    68 }
    69 
    70 default_variants +no_svn

  • git-core/files/patch-curl 

    diff --git a/git-core/files/patch-curl b/git-core/files/patch-curl
index b407ca3..6390305 100644
    a b  
    1 --- http.h.orig   2007-02-18 13:08:46.000000000 -0500
    2 +++ http.h 2007-02-18 13:08:54.000000000 -0500
     1diff --git http.h http.h
     2index 69b6b66..b33fe7b 100644
     3--- http.h
     4+++ http.h
    35@@ -7,7 +7,6 @@
    46 #include <curl/easy.h>
    5  
    6  #if LIBCURL_VERSION_NUM >= 0x070908
     7
     8 #if LIBCURL_VERSION_NUM >= 0x071000
    79-#define USE_CURL_MULTI
    810 #define DEFAULT_MAX_REQUESTS 5
    911 #endif
    10  
     12

  • deleted file git-core/files/patch-perl-path 

    diff --git a/git-core/files/patch-perl-path b/git-core/files/patch-perl-path
deleted file mode 100644
index defbc62..0000000
    + -  
    1 diff --git perl/Makefile perl/Makefile
    2 index 17d004e..2832cb4 100644
    3 --- perl/Makefile
    4 +++ perl/Makefile
    5 @@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile
    6         echo '  echo $(instdir_SQ)' >> $@
    7  else
    8  $(makfile): Makefile.PL ../GIT-CFLAGS
    9 -       '$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
    10 +       $(PERL_PATH) $< PREFIX='$(prefix_SQ)'
    11  endif
    12  
    13  # this is just added comfort for calling make directly in perl dir

  • deleted file git-core/files/patch-t4200 

    diff --git a/git-core/files/patch-t4200 b/git-core/files/patch-t4200
deleted file mode 100644
index f4aad47..0000000
    + -  
    1 diff --git t/t4200-rerere.sh t/t4200-rerere.sh
    2 index 6ba63d7..300e90e 100755
    3 --- t/t4200-rerere.sh
    4 +++ t/t4200-rerere.sh
    5 @@ -44,7 +44,7 @@ mkdir .git/rr-cache
    6  
    7  test_expect_failure 'conflicting merge' 'git pull . first'
    8  
    9 -sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
    10 +sha1=$(sed -e 's/[[:space:]].*//' .git/rr-cache/MERGE_RR)
    11  rr=.git/rr-cache/$sha1
    12  test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
    13