[90918] trunk/dports/devel/git-core

[ryandesign at macports.org]

Revision: 90918
          https://trac.macports.org/changeset/90918
Author:   ryandesign at macports.org
Date:     2012-03-18 02:34:43 -0700 (Sun, 18 Mar 2012)
Log Message:
-----------
git-core: update to 1.7.9.4, and always depend on p5.12-term-readkey (#28130)

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	2012-03-18 09:22:35 UTC (rev 90917)
+++ trunk/dports/devel/git-core/Portfile	2012-03-18 09:34:43 UTC (rev 90918)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                git-core
-version             1.7.9.2
-revision            1
+version             1.7.9.4
 description         A fast version control system
 long_description    Git is a fast, scalable, distributed open source version \
                     control system focusing on speed and efficiency.
@@ -14,22 +13,22 @@
 license             GPL-2 LGPL-2.1+
 platforms           darwin
 homepage            http://git-scm.com/
-#use_bzip2           yes
-#master_sites        http://www.kernel.org/pub/software/scm/git/
 master_sites        googlecode
 distname            git-${version}
 distfiles           git-${version}${extract.suffix} \
                     git-manpages-${version}${extract.suffix}
 
 checksums           git-${version}${extract.suffix} \
-                    rmd160  af5a35d1630c2ea2472665f461953baaf3a42dfc \
-                    sha256  bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75 \
+                    rmd160  2932d258de1fcebc8e83151f016fe963672b7d42 \
+                    sha256  c59f4c1e37a99f00022b491a6674f633a00164513efdc269e74ed20537f71c39 \
                     git-manpages-${version}${extract.suffix} \
-                    rmd160  229aee67eb986f81d8e2d511df18dfd8adc0ae41 \
-                    sha256  c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede
+                    rmd160  a3c8d42d2be8356a27f0e74160acf169fc29d542 \
+                    sha256  570586dff6cacf56c3a43cdd2103640819d40f05a71df5ec49dfa463974c6fbb
 
 depends_run         port:rsync \
-                    port:p5.12-error
+                    port:p5.12-error \
+                    port:p5.12-term-readkey
+
 depends_lib         port:perl5.12 \
                     port:curl \
                     port:zlib \
@@ -124,8 +123,8 @@
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append        git-htmldocs-${version}${extract.suffix}
     checksums-append        git-htmldocs-${version}${extract.suffix} \
-                            rmd160  296cd29ff0a3f464760c8c30efa1123f17174222 \
-                            sha256  da9c90e9e175448cf7940acbd287bc927294b3fd8ddf8d9a1e10266eff872b3b
+                            rmd160  c1f43162c41d481cb8c62cb6fe183bd70a0a8b90 \
+                            sha256  018e6222dd5d9c480009d0b1a8c5d63d9a97c90c623ca912745a19f8b2923461
 }
 
 variant gitweb description {Install gitweb.cgi} {
@@ -151,8 +150,7 @@
 variant svn description {Bi-directional subversion repository support} {
     depends_run-append  port:subversion \
                         port:p5.12-libwww-perl \
-                        port:p5.12-svn-simple \
-                        port:p5.12-term-readkey
+                        port:p5.12-svn-simple
 }
 
 variant bash_completion {

Modified: trunk/dports/devel/git-core/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/git-core/files/patch-Makefile.diff	2012-03-18 09:22:35 UTC (rev 90917)
+++ trunk/dports/devel/git-core/files/patch-Makefile.diff	2012-03-18 09:34:43 UTC (rev 90918)
@@ -1,6 +1,6 @@
---- a/Makefile.orig	2012-01-27 14:51:04.000000000 -0600
-+++ b/Makefile	2012-02-04 19:38:26.000000000 -0600
-@@ -330,7 +330,7 @@
+--- a/Makefile.orig	2012-03-12 18:30:26.000000000 -0500
++++ b/Makefile	2012-03-18 04:27:52.000000000 -0500
+@@ -334,7 +334,7 @@
  gitwebdir = $(sharedir)/gitweb
  localedir = $(sharedir)/locale
  template_dir = share/git-core/templates
@@ -9,7 +9,7 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -1309,7 +1309,7 @@
+@@ -1317,7 +1317,7 @@
  
  ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto)
  dep_check = $(shell $(CC) $(ALL_CFLAGS) \
@@ -18,7 +18,7 @@
  	echo $$?)
  ifeq ($(dep_check),0)
  override COMPUTE_HEADER_DEPENDENCIES = yes
-@@ -1363,7 +1363,7 @@
+@@ -1371,7 +1371,7 @@
  	ifdef NO_R_TO_GCC_LINKER
  		# Some gcc does not accept and pass -R to the linker to specify
  		# the runtime dynamic library path.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120318/2974547f/attachment.html>