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

blb at macports.org blb at macports.org
Thu Nov 13 00:05:17 PST 2008 

Revision: 41984
          http://trac.macports.org/changeset/41984
Author:   blb at macports.org
Date:     2008-11-13 00:05:13 -0800 (Thu, 13 Nov 2008)
Log Message:
-----------
devel/git-core - version update to 1.6.0.4 (ticket #16955), remove openssh dep (#16911)

Modified Paths:
--------------
    trunk/dports/devel/git-core/Portfile
    trunk/dports/devel/git-core/files/patch-Makefile.diff
    trunk/dports/devel/git-core/files/patch-http.h.diff

Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile	2008-11-13 05:07:38 UTC (rev 41983)
+++ trunk/dports/devel/git-core/Portfile	2008-11-13 08:05:13 UTC (rev 41984)
@@ -3,8 +3,7 @@
 PortSystem        1.0
 
 name              git-core
-version           1.6.0.2
-revision          2
+version           1.6.0.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.
@@ -20,10 +19,10 @@
 distfiles         git-${version}${extract.suffix} \
                   git-manpages-${version}${extract.suffix}
 
-checksums    git-${version}${extract.suffix} sha1 4a1d78604d1fb6c0deb43a498feb454970fb6704 \
-             git-manpages-${version}${extract.suffix} sha1 aab4cfc70a03ca447bbb86422226c892d9be1e4e
+checksums    git-${version}${extract.suffix} sha1 6e9471519d482894ffd7ecc10cf2c09506971e3d \
+             git-manpages-${version}${extract.suffix} sha1 26e713ef11449187f9762fb603cca43b2b5b80b8
 
-depends_run  port:openssh port:rsync port:perl5.8 port:p5-error
+depends_run  port:rsync port:perl5.8 port:p5-error
 depends_lib  port:curl port:zlib port:openssl port:expat port:libiconv
 
 patchfiles   patch-Makefile.diff patch-http.h.diff
@@ -33,9 +32,10 @@
 
 use_configure  no
 
-build.env      CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib"
-build.args     prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
-               PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1
+build.args     CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib" \
+               prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
+               PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1 \
+               NO_R_TO_GCC_LINKER=1
 
 test.run       yes
 test.cmd       make
@@ -46,9 +46,10 @@
 
 destroot.destdir  DESTDIR=${destroot} prefix=${prefix}
 destroot.target   install
-destroot.env      CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib"
-destroot.args     prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
-                  PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1
+destroot.args     CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib" \
+                  prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
+                  PERL_PATH="${prefix}/bin/perl" NO_FINK=1 NO_DARWIN_PORTS=1 \
+                  NO_R_TO_GCC_LINKER=1
 
 post-destroot {
     foreach f {1 5 7} {
@@ -78,7 +79,7 @@
 
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append    git-htmldocs-${version}${extract.suffix}
-    checksums-append    git-htmldocs-${version}${extract.suffix} sha1 ba96fbe8b938df9084e962c70a3a5076b2230371
+    checksums-append    git-htmldocs-${version}${extract.suffix} sha1 2ce03c496bc6d332cfaed4bd58ddb0a0bce3adea
 }
 
 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	2008-11-13 05:07:38 UTC (rev 41983)
+++ trunk/dports/devel/git-core/files/patch-Makefile.diff	2008-11-13 08:05:13 UTC (rev 41984)
@@ -1,15 +1,15 @@
---- Makefile.orig	2008-10-17 16:10:07.000000000 +0200
-+++ Makefile	2008-10-17 16:13:08.000000000 +0200
-@@ -164,8 +164,6 @@
- 
- # CFLAGS and LDFLAGS are for the users to override from the command line.
- 
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-@@ -187,7 +185,7 @@
+--- Makefile.orig	2008-10-22 11:12:25.000000000 +0200
++++ Makefile	2008-10-22 11:13:23.000000000 +0200
+@@ -113,7 +113,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
+@@ -187,7 +187,7 @@
  gitexecdir = $(prefix)/libexec/git-core
  sharedir = $(prefix)/share
  template_dir = $(sharedir)/git-core/templates
@@ -18,12 +18,21 @@
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
  else
-@@ -793,7 +791,7 @@
+@@ -791,7 +791,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.
- 	CC_LD_DYNPATH = -Wl,-rpath=
+-	CC_LD_DYNPATH = -Wl,-rpath=
++	CC_LD_DYNPATH = -Wl,-rpath,
  else
--	CC_LD_DYNPATH = -R
-+	CC_LD_DYNPATH = -L
+ 	CC_LD_DYNPATH = -R
  endif
- 
- ifdef NO_CURL
+@@ -800,7 +800,7 @@
+ 	BASIC_CFLAGS += -DNO_CURL
+ 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

Modified: trunk/dports/devel/git-core/files/patch-http.h.diff
===================================================================
--- trunk/dports/devel/git-core/files/patch-http.h.diff	2008-11-13 05:07:38 UTC (rev 41983)
+++ trunk/dports/devel/git-core/files/patch-http.h.diff	2008-11-13 08:05:13 UTC (rev 41984)
@@ -1,7 +1,7 @@
---- http.h.orig	2007-07-03 02:08:49.000000000 -0700
-+++ http.h	2007-07-03 02:09:00.000000000 -0700
-@@ -7,7 +7,6 @@
- #include <curl/easy.h>
+--- http.h.orig	2008-10-22 06:19:18.000000000 +0200
++++ http.h	2008-11-03 20:41:03.000000000 +0100
+@@ -18,7 +18,6 @@
+ #undef USE_CURL_MULTI
  
  #if LIBCURL_VERSION_NUM >= 0x071000
 -#define USE_CURL_MULTI
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081113/82e3f107/attachment-0001.html>

More information about the macports-changes mailing list