Index: files/patch-t4200
===================================================================
--- files/patch-t4200	(revision 25859)
+++ files/patch-t4200	(working copy)
@@ -6,7 +6,7 @@
  
  test_expect_failure 'conflicting merge' 'git pull . first'
  
--sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
+-sha1=$(sed -e 's/ .*//' .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"
Index: Portfile
===================================================================
--- Portfile	(revision 25859)
+++ Portfile	(working copy)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		git-core
-version         1.5.1.3
+version         1.5.2.1
 description	The stupid content tracker.
 long_description	A stupid (but extremely fast) directory \
 			content manager. It doesn't do a whole lot, \
@@ -18,13 +18,14 @@
 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 3905cb325520fc8a52a8c77ee95dd0de8e13a5d5 \
+                git-manpages-${version}${extract.suffix} sha1 6e9d153df8d51dd943faff0eda33e18c974210c4
 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-t4200 patch-ld-R patch-perl-path
+patchfiles	patch-Makefiles patch-ld-R
 
 use_configure	no