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

[ryandesign at macports.org]

Revision: 83517
          http://trac.macports.org/changeset/83517
Author:   ryandesign at macports.org
Date:     2011-09-04 02:51:35 -0700 (Sun, 04 Sep 2011)
Log Message:
-----------
git-core: update to 1.7.6.1 (#31088); simplify setting archflags

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	2011-09-04 09:50:47 UTC (rev 83516)
+++ trunk/dports/devel/git-core/Portfile	2011-09-04 09:51:35 UTC (rev 83517)
@@ -4,8 +4,7 @@
 PortSystem        1.0
 
 name              git-core
-version           1.7.6
-revision          1
+version           1.7.6.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.
@@ -21,11 +20,11 @@
                   git-manpages-${version}${extract.suffix}
 
 checksums           git-${version}${extract.suffix} \
-                    sha1    c519b0765c419c84b561bb4a2a86526b16d95cde \
-                    rmd160  9ba5daa7bf56b6a242b3302e12c8ced7d3abc77a \
+                    rmd160  ec85ee434e51fbb3144b5336921922afc97ba709 \
+                    sha256  856d4197ef7172938b0b44e55174c7d7ddfaf5e844e04960322c49eda9f3a246 \
                     git-manpages-${version}${extract.suffix} \
-                    sha1    45e0759597d649b13f684f55a186d46dafb7d414 \
-                    rmd160  9534cf6540c3be85c6f3b5dfca8ca0cf3f2f366f
+                    rmd160  16fdba0c70f0998dd08bf0d1b1b47ba5f1834849 \
+                    sha256  faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44
 
 depends_run  port:rsync port:p5.12-error
 depends_lib  port:perl5.12 port:curl port:zlib port:openssl port:expat port:libiconv
@@ -37,18 +36,11 @@
 
 use_configure  no
 
-set CFLAGS     "-Wall -O2 -I${prefix}/include"
-set LDFLAGS    "-L${prefix}/lib"
-
 variant universal {}
-if {[variant_isset universal]} {
-    set CFLAGS "${CFLAGS} ${configure.universal_cflags}"
-    set LDFLAGS "${LDFLAGS} ${configure.universal_ldflags}"
-} else {
-    set CFLAGS "${CFLAGS} ${configure.cc_archflags}"
-    set LDFLAGS "${LDFLAGS} ${configure.ld_archflags}"
-}
 
+set CFLAGS     "-Wall -O2 -I${prefix}/include [get_canonical_archflags cc]"
+set LDFLAGS    "-L${prefix}/lib [get_canonical_archflags ld]"
+
 build.args     CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
                CC=${configure.cc} \
                prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
@@ -119,8 +111,8 @@
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append    git-htmldocs-${version}${extract.suffix}
     checksums-append    git-htmldocs-${version}${extract.suffix} \
-                    sha1    926168673669d7568b94af6dec35b9ef10ecaedc \
-                    rmd160  0c396a95126670a67c3e61ea69196508b88ef195
+                    rmd160  357cda7d4df61db43cafae0c4b3d42bc84f02f13 \
+                    sha256  6f03a7ed0c2db4d47c22bb27c27249be9bc3c50b72e108d7dca5227917b2de7a
 }
 
 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	2011-09-04 09:50:47 UTC (rev 83516)
+++ trunk/dports/devel/git-core/files/patch-Makefile.diff	2011-09-04 09:51:35 UTC (rev 83517)
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-06-02 00:36:22.000000000 +0200
-+++ Makefile	2011-06-03 13:30:10.000000000 +0200
-@@ -289,7 +289,7 @@
+--- Makefile.orig	2011-09-02 21:46:23.000000000 -0400
++++ Makefile	2011-09-02 21:46:23.000000000 -0400
+@@ -298,7 +298,7 @@
  sharedir = $(prefix)/share
  gitwebdir = $(sharedir)/gitweb
  template_dir = share/git-core/templates
@@ -9,7 +9,7 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -1237,7 +1237,7 @@
+@@ -1253,7 +1253,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/20110904/3ff60d5e/attachment.html>