Ticket #11962: patch-11962-7333

diff --git a/git-core/Portfile b/git-core/Portfile
index bdbe78b..095e41c 100644
--- a/git-core/Portfile
+++ b/git-core/Portfile
@@ -2,12 +2,12 @@
 
 PortSystem 1.0
 name           git-core
-version         1.5.1.3
+version         1.5.2
 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
@@ -18,13 +18,12 @@ 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
-depends_run    port:curl port:diffutils \
-               port:openssh port:rsync port:gsed
+checksums       git-${version}${extract.suffix} sha1 f60d8dbf0926a3c12a1658bac177b383939d8e54 \
+                git-manpages-${version}${extract.suffix} sha1 025a4a65e6a1c9aa1abfd64007ba3559655bb629
+depends_run    port:curl port:openssh port:rsync
 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
 
@@ -43,28 +42,24 @@ destroot.args       prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=$
 
 post-destroot {
        cd ${workpath}
-       foreach f {1 7} {
+       foreach f {1 5 7} {
                xinstall -d ${destroot}${prefix}/share/man/man${f}
                foreach m [glob man${f}/*.${f}] {
                        xinstall ${m} ${destroot}${prefix}/share/man/man${f}
                }
        }
-       if {[variant_isset no_svn]} {
+       if {![variant_isset svn]} {
                system "rm ${destroot}${prefix}/bin/git-svn*"
        }
 }
 
 variant doc {
-       depends_build           port:asciidoc port:xmlto
+       depends_build-append            port:asciidoc port:xmlto
+       build.args-append       XML_CATALOG_FILES=${prefix}/etc/xml/catalog
        build.target-append     doc
        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
diff --git a/git-core/files/patch-curl b/git-core/files/patch-curl
index b407ca3..6390305 100644
--- a/git-core/files/patch-curl
+++ b/git-core/files/patch-curl
@@ -1,10 +1,12 @@
---- 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
- 
+
diff --git a/git-core/files/patch-perl-path b/git-core/files/patch-perl-path
deleted file mode 100644
index 7039257..0000000
--- a/git-core/files/patch-perl-path
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/git-core/files/patch-t4200 b/git-core/files/patch-t4200
deleted file mode 100644
index f4aad47..0000000
--- a/git-core/files/patch-t4200
+++ /dev/null
@@ -1,13 +0,0 @@
-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"
-