Ticket #8800: patch

Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name            git-core
-version         1.2.4
+version         1.4.0
 description     The stupid content tracker.
 long_description        A stupid (but extremely fast) directory \
                         content manager. It doesn't do a whole lot, \
@@ -14 +14 @@
 homepage        http://kernel.org/git/
 use_bzip2       yes
 master_sites    http://www.kernel.org/pub/software/scm/git/
-checksums       md5 4ddb476031d76614a0a5ab625c516972
+checksums       md5 923fa60aca74db3ce175c9a2c665f240
 distname        git-${version}
 depends_run     bin:curl:curl bin:diff:diffutils bin:merge:rcs bin:wish:tk \
                 bin:ssh:openssh bin:python:python24 bin:rsync:rsync \

files/patch-Makefiles

@@ -1 @@
-diff -Nru ../git-1.2.1.orig/Documentation/Makefile ./Documentation/Makefile
---- ../git-1.2.1.orig/Documentation/Makefile    2006-02-16 05:14:04.000000000 +0200
-+++ ./Documentation/Makefile    2006-02-18 10:55:41.000000000 +0200
-@@ -21,7 +21,7 @@
+diff --recursive --unified ../git-1.4.0.orig/Documentation/Makefile ./Documentation/Makefile
+--- ../git-1.4.0.orig/Documentation/Makefile    2006-06-10 15:41:54.000000000 -0400
++++ ./Documentation/Makefile    2006-06-29 22:48:15.000000000 -0400
+@@ -26,7 +26,7 @@
  
  prefix?=$(HOME)
  bin=$(prefix)/bin
@@ -10 +10 @@
  man1=$(mandir)/man1
  man7=$(mandir)/man7
  # DESTDIR=
-diff -Nru ../git-1.2.1.orig/Makefile ./Makefile
---- ../git-1.2.1.orig/Makefile  2006-02-16 05:14:04.000000000 +0200
-+++ ./Makefile  2006-02-18 10:55:37.000000000 +0200
-@@ -72,8 +72,6 @@
+diff --recursive --unified ../git-1.4.0.orig/Makefile ./Makefile
+--- ../git-1.4.0.orig/Makefile  2006-06-10 15:41:54.000000000 -0400
++++ ./Makefile  2006-06-29 22:50:34.000000000 -0400
+@@ -85,8 +85,6 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -22 +22 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -218,12 +216,6 @@
+@@ -243,16 +241,6 @@
  ifeq ($(uname_S),Darwin)
         NEEDS_SSL_WITH_CRYPTO = YesPlease
         NEEDS_LIBICONV = YesPlease
 -       ## fink
--       ALL_CFLAGS += -I/sw/include
--       ALL_LDFLAGS += -L/sw/lib
+-       ifeq ($(shell test -d /sw/lib && echo y),y)
+-               ALL_CFLAGS += -I/sw/include
+-               ALL_LDFLAGS += -L/sw/lib
+-       endif
 -       ## darwinports
--       ALL_CFLAGS += -I/opt/local/include
--       ALL_LDFLAGS += -L/opt/local/lib
+-       ifeq ($(shell test -d /opt/local/lib && echo y),y)
+-               ALL_CFLAGS += -I/opt/local/include
+-               ALL_LDFLAGS += -L/opt/local/lib
+-       endif
  endif
  ifeq ($(uname_S),SunOS)
         NEEDS_SOCKET = YesPlease
-@@ -293,7 +285,7 @@
+@@ -337,7 +325,7 @@
         ifdef CURLDIR
                 # This is still problematic -- gcc does not always want -R.
                 ALL_CFLAGS += -I$(CURLDIR)/include
@@ -44 +48 @@
         else
                 CURL_LIBCURL = -lcurl
         endif
-@@ -313,7 +305,7 @@
+@@ -358,7 +346,7 @@
         ifdef OPENSSLDIR
                 # Again this may be problematic -- gcc does not always want -R.
                 ALL_CFLAGS += -I$(OPENSSLDIR)/include
@@ -53 +57 @@
         else
                 OPENSSL_LINK =
         endif
-@@ -331,7 +323,7 @@
+@@ -376,7 +364,7 @@
         ifdef ICONVDIR
                 # Again this may be problematic -- gcc does not always want -R.
                 ALL_CFLAGS += -I$(ICONVDIR)/include