Ticket #11962: mp_git1514.patch

dports/devel/git-core/files/patch-curl

@@ -1 @@
---- http.h.orig   2007-02-18 13:08:46.000000000 -0500
-+++ http.h 2007-02-18 13:08:54.000000000 -0500
+diff --git http.h http.h
+index 69b6b66..b33fe7b 100644
+--- http.h
++++ http.h
 @@ -7,7 +7,6 @@
  #include <curl/easy.h>
- 
- #if LIBCURL_VERSION_NUM >= 0x070908
+
+ #if LIBCURL_VERSION_NUM >= 0x071000
 -#define USE_CURL_MULTI
  #define DEFAULT_MAX_REQUESTS 5
  #endif
- 
+

dports/devel/git-core/files/patch-t4200

@@ -1 @@
-diff --git t/t4200-rerere.sh t/t4200-rerere.sh
-index 6ba63d7..300e90e 100755
---- t/t4200-rerere.sh
-+++ t/t4200-rerere.sh
-@@ -44,7 +44,7 @@ mkdir .git/rr-cache
- 
- test_expect_failure 'conflicting merge' 'git pull . first'
- 
--sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
-+sha1=$(sed -e 's/[[:space:]].*//' .git/rr-cache/MERGE_RR)
- rr=.git/rr-cache/$sha1
- test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
- 

dports/devel/git-core/files/patch-perl-path

@@ -1 @@
-diff --git perl/Makefile perl/Makefile
-index 17d004e..2832cb4 100644
---- perl/Makefile
-+++ perl/Makefile
-@@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile
-        echo '  echo $(instdir_SQ)' >> $@
- else
- $(makfile): Makefile.PL ../GIT-CFLAGS
--       '$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
-+       $(PERL_PATH_SQ) $< PREFIX='$(prefix_SQ)'
- endif
- 
- # this is just added comfort for calling make directly in perl dir

dports/devel/git-core/Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name            git-core
-version         1.5.1.3
+version         1.5.1.4
 description     The stupid content tracker.
 long_description        A stupid (but extremely fast) directory \
                         content manager. It doesn't do a whole lot, \
                         but what it _does_ do is track directory contents \
-                        efficiently. 
+                        efficiently.
 maintainers     bryan@larsen.st
 categories      devel
 platforms       darwin
@@ -17 +17 @@
 distname        git-${version}
 distfiles       git-${version}${extract.suffix} \
                 git-manpages-${version}${extract.suffix}
- 
-checksums       git-${version}${extract.suffix} sha1 673bbd457e713251a7fbf54369150dd760c5606d \
-                git-manpages-${version}${extract.suffix} sha1 3a5ecaa36fb5b7c3dba9a96240016fcccac6cfc0
+
+checksums       git-${version}${extract.suffix} sha1 6ab0e784ca9ab499718103179576fb890e61c06e \
+                git-manpages-${version}${extract.suffix} sha1 c112ddccf99b22088959a5b3c7b9edae23fef6c2
 depends_run     port:curl port:diffutils \
                 port:openssh port:rsync port:gsed
 depends_lib     port:curl port:zlib port:openssl port:expat port:libiconv
 
-patchfiles      patch-Makefiles patch-curl patch-t4200 patch-ld-R patch-perl-path
+patchfiles      patch-Makefiles patch-curl patch-ld-R
 
 use_configure   no
 
@@ -49 +49 @@
                         xinstall ${m} ${destroot}${prefix}/share/man/man${f}
                 }
         }
-        if {[variant_isset no_svn]} {
+        if {![variant_isset svn]} {
                 system "rm ${destroot}${prefix}/bin/git-svn*"
         }
 }
@@ -60 +60 @@
         destroot.target-append  install-doc
 }
 
-variant svn conflicts no_svn {
+variant svn {
         depends_run             port:p5-svn-simple port:subversion port:perl port:p5-libwww-perl
 }
-
-variant no_svn conflicts svn {
-}
-
-default_variants +no_svn