Revision: 72033 http://trac.macports.org/changeset/72033 Author: jeremyhu@macports.org Date: 2010-09-30 17:50:11 -0700 (Thu, 30 Sep 2010) Log Message: ----------- git-core: Bump to 1.7.3.1 to fix git-stash Modified Paths: -------------- trunk/dports/devel/git-core/Portfile trunk/dports/devel/git-core/files/patch-Makefile.diff Modified: trunk/dports/devel/git-core/Portfile =================================================================== --- trunk/dports/devel/git-core/Portfile 2010-09-30 21:55:32 UTC (rev 72032) +++ trunk/dports/devel/git-core/Portfile 2010-10-01 00:50:11 UTC (rev 72033) @@ -4,7 +4,7 @@ PortSystem 1.0 name git-core -version 1.7.3 +version 1.7.3.1 description A fast version control system long_description Git is a fast, scalable, distributed open source version \ control system focusing on speed and efficiency. @@ -19,13 +19,13 @@ git-manpages-${version}${extract.suffix} checksums git-${version}${extract.suffix} \ - md5 c18eb252ce63a688071f10c3f7bc28e1 \ - sha1 32e231fd10b85265487f0c2cc50d6d889b71de78 \ - rmd160 4b0f95b4d114f5b7a4eb61c0f73b2f9a533637a0 \ + md5 77e1611498919965fb65fd1f229ee155 \ + sha1 372db7c9bb93bb133a92c16e0f4cd5b553c05ed7 \ + rmd160 678826c88fe3c99d318e37bf7180c5b07423007d \ git-manpages-${version}${extract.suffix} \ - md5 d18d8f686fde24d1262ccbe61ad00ae0 \ - sha1 725ff48e7de80fe56556af3f5162be4e0648db61 \ - rmd160 97a8ae1ef8297e12ece2a3307547d0e73237920c + md5 41a164c1ad025e0970b2365e27209a11 \ + sha1 2cf45f492ab38aad2010d789b649862eb11faf0e \ + rmd160 e720e8a59cd824114dc8a23e613985dd93fdad52 depends_run port:rsync port:p5-error depends_lib path:bin/perl:perl5 port:curl port:zlib port:openssl port:expat port:libiconv port:python26 @@ -89,9 +89,9 @@ variant doc description {Install HTML and plaintext documentation} { distfiles-append git-htmldocs-${version}${extract.suffix} checksums-append git-htmldocs-${version}${extract.suffix} \ - md5 0a90e969db9a4e6b73b395cf19255b0b \ - sha1 3dcfe85ad9f711404c3989bb3280f92635c75946 \ - rmd160 cf391a7a6afcf249e7254d2f2aad8ea1be722bab + md5 f9c9669fb00df38f1486763ace135666 \ + sha1 5d929edc8ebef8564c9879dfae3289ea0ecb97fb \ + rmd160 f1c79685c943823a4200e91bbb5eafebab8e10d2 } variant gitweb description {Install gitweb.cgi} { Modified: trunk/dports/devel/git-core/files/patch-Makefile.diff =================================================================== --- trunk/dports/devel/git-core/files/patch-Makefile.diff 2010-09-30 21:55:32 UTC (rev 72032) +++ trunk/dports/devel/git-core/files/patch-Makefile.diff 2010-10-01 00:50:11 UTC (rev 72033) @@ -1,14 +1,5 @@ --- Makefile.orig 2010-09-19 01:43:54.000000000 +0200 +++ Makefile 2010-09-21 08:32:22.000000000 +0200 -@@ -142,7 +142,7 @@ - # - # Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib" - # that tells runtime paths to dynamic libraries; --# "-Wl,-rpath=/path/lib" is used instead. -+# "-Wl,-rpath,/path/lib" is used instead. - # - # Define USE_NSEC below if you want git to care about sub-second file mtimes - # and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and @@ -284,7 +284,7 @@ sharedir = $(prefix)/share gitwebdir = $(sharedir)/gitweb @@ -27,12 +18,3 @@ else CC_LD_DYNPATH = -R endif -@@ -1207,7 +1207,7 @@ - REMOTE_CURL_NAMES = - else - ifdef CURLDIR -- # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case. -+ # Try "-Wl,-rpath,$(CURLDIR)/$(lib)" in such a case. - BASIC_CFLAGS += -I$(CURLDIR)/include - CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl - else