Ticket #11079: git-core.1.4.0-1.4.4.1.patch

Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name            git-core
-version         1.4.0
+version         1.4.4.1
 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 923fa60aca74db3ce175c9a2c665f240
+checksums       md5 504521167df43146e1f5d69aa5c5e023
 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 \
@@ -26 +26 @@
 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}
+build.args      prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} NO_FINK=1 NO_DARWIN_PORTS=1
 
 destroot.destdir DESTDIR=${destroot} prefix=${prefix}
 destroot.target install

files/patch-Makefiles

@@ -1 @@
-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
+--- Documentation/Makefile.orig 2006-11-22 21:38:07.000000000 -0500
++++ Documentation/Makefile      2006-11-28 15:42:24.000000000 -0500
 @@ -26,7 +26,7 @@
  
  prefix?=$(HOME)
- bin=$(prefix)/bin
--mandir=$(prefix)/man
-+mandir=$(prefix)/share/man
- man1=$(mandir)/man1
- man7=$(mandir)/man7
+ bindir?=$(prefix)/bin
+-mandir?=$(prefix)/man
++mandir?=$(prefix)/share/man
+ man1dir=$(mandir)/man1
+ man7dir=$(mandir)/man7
  # DESTDIR=
-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 @@
+--- Makefile.orig       2006-11-22 21:38:07.000000000 -0500
++++ Makefile    2006-11-28 15:21:34.000000000 -0500
+@@ -106,8 +106,6 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -22 +20 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -243,16 +241,6 @@
- ifeq ($(uname_S),Darwin)
-        NEEDS_SSL_WITH_CRYPTO = YesPlease
-        NEEDS_LIBICONV = YesPlease
--       ## fink
--       ifeq ($(shell test -d /sw/lib && echo y),y)
--               ALL_CFLAGS += -I/sw/include
--               ALL_LDFLAGS += -L/sw/lib
--       endif
--       ## darwinports
--       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
-@@ -337,7 +325,7 @@
+@@ -437,7 +435,7 @@
         ifdef CURLDIR
                 # This is still problematic -- gcc does not always want -R.
-                ALL_CFLAGS += -I$(CURLDIR)/include
+                BASIC_CFLAGS += -I$(CURLDIR)/include
 -               CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
 +               CURL_LIBCURL = -L$(CURLDIR)/lib -lcurl
         else
                 CURL_LIBCURL = -lcurl
         endif
-@@ -358,7 +346,7 @@
+@@ -458,7 +456,7 @@
         ifdef OPENSSLDIR
                 # Again this may be problematic -- gcc does not always want -R.
-                ALL_CFLAGS += -I$(OPENSSLDIR)/include
+                BASIC_CFLAGS += -I$(OPENSSLDIR)/include
 -               OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
 +               OPENSSL_LINK = -L$(OPENSSLDIR)/lib
         else
                 OPENSSL_LINK =
         endif
-@@ -376,7 +364,7 @@
+@@ -476,7 +474,7 @@
         ifdef ICONVDIR
                 # Again this may be problematic -- gcc does not always want -R.
-                ALL_CFLAGS += -I$(ICONVDIR)/include
+                BASIC_CFLAGS += -I$(ICONVDIR)/include
 -               ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
 +               ICONV_LINK = -L$(ICONVDIR)/lib
         else