Ticket #10973: git-core.patch

File git-core.patch, 4.3 KB (added by jon.olsson@…, 18 years ago)

git-core port update

  • Portfile

    old new  
    22
    33PortSystem 1.0
    44name            git-core
    5 version         1.4.0
     5version         1.4.3.2
    66description     The stupid content tracker.
    77long_description        A stupid (but extremely fast) directory \
    88                        content manager. It doesn't do a whole lot, \
    … …  
    1111maintainers     darwinports@opendarwin.org
    1212categories      devel
    1313platforms       darwin
    14 homepage        http://kernel.org/git/
     14homepage        http://git.or.cz/
    1515use_bzip2       yes
    1616master_sites    http://www.kernel.org/pub/software/scm/git/
    17 checksums       md5 923fa60aca74db3ce175c9a2c665f240
     17checksums       md5 c13797079424790597d696972fffa7b4
    1818distname        git-${version}
    19 depends_run     bin:curl:curl bin:diff:diffutils bin:merge:rcs bin:wish:tk \
    20                 bin:ssh:openssh bin:python:python24 bin:rsync:rsync \
    21                 bin:sed:gsed
     19depends_run     port:curl port:diffutils port:tk \
     20                port:openssh port:python24 port:rsync \
     21                port:gsed port:expat
    2222depends_lib     port:curl port:zlib port:openssl port:expat port:libiconv
    2323
    2424patchfiles      patch-Makefiles

  • 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
    4 @@ -26,7 +26,7 @@
    5  
    6  prefix?=$(HOME)
    7  bin=$(prefix)/bin
    8 -mandir=$(prefix)/man
    9 +mandir=$(prefix)/share/man
    10  man1=$(mandir)/man1
    11  man7=$(mandir)/man7
    12  # 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 @@
     1--- ../git-1.4.3.2.orig/Makefile        2006-10-24 07:29:47.000000000 +0200
     2+++ Makefile    2006-11-02 13:48:47.000000000 +0100
     3@@ -106,8 +106,6 @@
    174 
    185 # CFLAGS and LDFLAGS are for the users to override from the command line.
    196 
    … …  
    229 ALL_CFLAGS = $(CFLAGS)
    2310 ALL_LDFLAGS = $(LDFLAGS)
    2411 STRIP ?= strip
    25 @@ -243,16 +241,6 @@
    26  ifeq ($(uname_S),Darwin)
     12@@ -152,7 +150,7 @@
     13 # Those must not be GNU-specific; they are shared with perl/ which may
     14 # be built by a different compiler. (Note that this is an artifact now
     15 # but it still might be nice to keep that distinction.)
     16-BASIC_CFLAGS =
     17+BASIC_CFLAGS = -I$(prefix)/include
     18 BASIC_LDFLAGS =
     19 
     20 SCRIPT_SH = \
     21@@ -329,18 +327,6 @@
    2722        NEEDS_SSL_WITH_CRYPTO = YesPlease
    2823        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
     24        NO_STRLCPY = YesPlease
     25-       ifndef NO_FINK
     26-               ifeq ($(shell test -d /sw/lib && echo y),y)
     27-                       BASIC_CFLAGS += -I/sw/include
     28-                       BASIC_LDFLAGS += -L/sw/lib
     29-               endif
    3330-       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
     31-       ifndef NO_DARWIN_PORTS
     32-               ifeq ($(shell test -d /opt/local/lib && echo y),y)
     33-                       BASIC_CFLAGS += -I/opt/local/include
     34-                       BASIC_LDFLAGS += -L/opt/local/lib
     35-               endif
    3836-       endif
    3937 endif
    4038 ifeq ($(uname_S),SunOS)
    4139        NEEDS_SOCKET = YesPlease
    42 @@ -337,7 +325,7 @@
     40@@ -432,7 +418,7 @@
    4341        ifdef CURLDIR
    4442                # This is still problematic -- gcc does not always want -R.
    45                 ALL_CFLAGS += -I$(CURLDIR)/include
     43                BASIC_CFLAGS += -I$(CURLDIR)/include
    4644-               CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
    4745+               CURL_LIBCURL = -L$(CURLDIR)/lib -lcurl
    4846        else
    4947                CURL_LIBCURL = -lcurl
    5048        endif
    51 @@ -358,7 +346,7 @@
     49@@ -444,7 +430,7 @@
     50                endif
     51        endif
     52        ifndef NO_EXPAT
     53-               EXPAT_LIBEXPAT = -lexpat
     54+               EXPAT_LIBEXPAT = -L$(prefix)/lib  -lexpat
     55        endif
     56 endif
     57 
     58@@ -453,7 +439,7 @@
    5259        ifdef OPENSSLDIR
    5360                # Again this may be problematic -- gcc does not always want -R.
    54                 ALL_CFLAGS += -I$(OPENSSLDIR)/include
     61                BASIC_CFLAGS += -I$(OPENSSLDIR)/include
    5562-               OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
    5663+               OPENSSL_LINK = -L$(OPENSSLDIR)/lib
    5764        else
    5865                OPENSSL_LINK =
    5966        endif
    60 @@ -376,7 +364,7 @@
     67@@ -471,7 +457,7 @@
    6168        ifdef ICONVDIR
    6269                # Again this may be problematic -- gcc does not always want -R.
    63                 ALL_CFLAGS += -I$(ICONVDIR)/include
     70                BASIC_CFLAGS += -I$(ICONVDIR)/include
    6471-               ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
    6572+               ICONV_LINK = -L$(ICONVDIR)/lib
    6673        else