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

File git-core.1.4.0-1.4.4.1.patch, 4.0 KB (added by bryan@…, 18 years ago)

patch from 1.4.0 to 1.4.4.1 for git-core

  • Portfile

    diff -r --unified ./Portfile /Users/blarsen/project/git-core/Portfile
    old new  
    22
    33PortSystem 1.0
    44name            git-core
    5 version         1.4.0
     5version         1.4.4.1
    66description     The stupid content tracker.
    77long_description        A stupid (but extremely fast) directory \
    88                        content manager. It doesn't do a whole lot, \
     
    1414homepage        http://kernel.org/git/
    1515use_bzip2       yes
    1616master_sites    http://www.kernel.org/pub/software/scm/git/
    17 checksums       md5 923fa60aca74db3ce175c9a2c665f240
     17checksums       md5 504521167df43146e1f5d69aa5c5e023
    1818distname        git-${version}
    1919depends_run     bin:curl:curl bin:diff:diffutils bin:merge:rcs bin:wish:tk \
    2020                bin:ssh:openssh bin:python:python24 bin:rsync:rsync \
     
    2626use_configure   no
    2727
    2828build.env       CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib"
    29 build.args      prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix}
     29build.args      prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} NO_FINK=1 NO_DARWIN_PORTS=1
    3030
    3131destroot.destdir DESTDIR=${destroot} prefix=${prefix}
    3232destroot.target install
  • files/patch-Makefiles

    diff -r --unified ./files/patch-Makefiles /Users/blarsen/project/git-core/files/patch-Makefiles
    old new  
    1 diff --recursive --unified ../git-1.4.0.orig/Documentation/Makefile ./Documentation/Makefile
    2 --- ../git-1.4.0.orig/Documentation/Makefile    2006-06-10 15:41:54.000000000 -0400
    3 +++ ./Documentation/Makefile    2006-06-29 22:48:15.000000000 -0400
     1--- Documentation/Makefile.orig 2006-11-22 21:38:07.000000000 -0500
     2+++ Documentation/Makefile      2006-11-28 15:42:24.000000000 -0500
    43@@ -26,7 +26,7 @@
    54 
    65 prefix?=$(HOME)
    7  bin=$(prefix)/bin
    8 -mandir=$(prefix)/man
    9 +mandir=$(prefix)/share/man
    10  man1=$(mandir)/man1
    11  man7=$(mandir)/man7
     6 bindir?=$(prefix)/bin
     7-mandir?=$(prefix)/man
     8+mandir?=$(prefix)/share/man
     9 man1dir=$(mandir)/man1
     10 man7dir=$(mandir)/man7
    1211 # DESTDIR=
    13 diff --recursive --unified ../git-1.4.0.orig/Makefile ./Makefile
    14 --- ../git-1.4.0.orig/Makefile  2006-06-10 15:41:54.000000000 -0400
    15 +++ ./Makefile  2006-06-29 22:50:34.000000000 -0400
    16 @@ -85,8 +85,6 @@
     12--- Makefile.orig       2006-11-22 21:38:07.000000000 -0500
     13+++ Makefile    2006-11-28 15:21:34.000000000 -0500
     14@@ -106,8 +106,6 @@
    1715 
    1816 # CFLAGS and LDFLAGS are for the users to override from the command line.
    1917 
     
    2220 ALL_CFLAGS = $(CFLAGS)
    2321 ALL_LDFLAGS = $(LDFLAGS)
    2422 STRIP ?= strip
    25 @@ -243,16 +241,6 @@
    26  ifeq ($(uname_S),Darwin)
    27         NEEDS_SSL_WITH_CRYPTO = YesPlease
    28         NEEDS_LIBICONV = YesPlease
    29 -       ## fink
    30 -       ifeq ($(shell test -d /sw/lib && echo y),y)
    31 -               ALL_CFLAGS += -I/sw/include
    32 -               ALL_LDFLAGS += -L/sw/lib
    33 -       endif
    34 -       ## darwinports
    35 -       ifeq ($(shell test -d /opt/local/lib && echo y),y)
    36 -               ALL_CFLAGS += -I/opt/local/include
    37 -               ALL_LDFLAGS += -L/opt/local/lib
    38 -       endif
    39  endif
    40  ifeq ($(uname_S),SunOS)
    41         NEEDS_SOCKET = YesPlease
    42 @@ -337,7 +325,7 @@
     23@@ -437,7 +435,7 @@
    4324        ifdef CURLDIR
    4425                # This is still problematic -- gcc does not always want -R.
    45                 ALL_CFLAGS += -I$(CURLDIR)/include
     26                BASIC_CFLAGS += -I$(CURLDIR)/include
    4627-               CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
    4728+               CURL_LIBCURL = -L$(CURLDIR)/lib -lcurl
    4829        else
    4930                CURL_LIBCURL = -lcurl
    5031        endif
    51 @@ -358,7 +346,7 @@
     32@@ -458,7 +456,7 @@
    5233        ifdef OPENSSLDIR
    5334                # Again this may be problematic -- gcc does not always want -R.
    54                 ALL_CFLAGS += -I$(OPENSSLDIR)/include
     35                BASIC_CFLAGS += -I$(OPENSSLDIR)/include
    5536-               OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
    5637+               OPENSSL_LINK = -L$(OPENSSLDIR)/lib
    5738        else
    5839                OPENSSL_LINK =
    5940        endif
    60 @@ -376,7 +364,7 @@
     41@@ -476,7 +474,7 @@
    6142        ifdef ICONVDIR
    6243                # Again this may be problematic -- gcc does not always want -R.
    63                 ALL_CFLAGS += -I$(ICONVDIR)/include
     44                BASIC_CFLAGS += -I$(ICONVDIR)/include
    6445-               ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
    6546+               ICONV_LINK = -L$(ICONVDIR)/lib
    6647        else