Ticket #8800: patch-git-core-port

File patch-git-core-port, 3.3 KB (added by namely_void@…, 18 years ago)

Update Portfile and patches to 1.3.2 (patch to current CVS)

Line 
1--- /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports/devel/git-core/Portfile        2006-03-21 06:50:02.000000000 +0200
2+++ Portfile    2006-05-09 15:19:43.000000000 +0300
3@@ -2,7 +2,7 @@
4 
5 PortSystem 1.0
6 name           git-core
7-version                1.2.4
8+version                1.3.2
9 description    The stupid content tracker.
10 long_description       A stupid (but extremely fast) directory \
11                        content manager. It doesn't do a whole lot, \
12@@ -14,7 +14,7 @@
13 homepage       http://kernel.org/git/
14 use_bzip2      yes
15 master_sites    http://www.kernel.org/pub/software/scm/git/
16-checksums      md5 4ddb476031d76614a0a5ab625c516972
17+checksums      md5 66418fc2ad8cd36d0f48e517e0af057f
18 distname       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--- /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports/devel/git-core/files/patch-Makefiles   2006-02-18 16:49:07.000000000 +0200
22+++ files/patch-Makefiles       2006-05-09 15:08:10.000000000 +0300
23@@ -1,7 +1,7 @@
24-diff -Nru ../git-1.2.1.orig/Documentation/Makefile ./Documentation/Makefile
25---- ../git-1.2.1.orig/Documentation/Makefile   2006-02-16 05:14:04.000000000 +0200
26-+++ ./Documentation/Makefile   2006-02-18 10:55:41.000000000 +0200
27-@@ -21,7 +21,7 @@
28+diff -Nru ../git-1.3.2.orig/Documentation/Makefile ./Documentation/Makefile
29+--- ../git-1.3.2.orig/Documentation/Makefile   2006-05-04 08:59:30.000000000 +0300
30++++ ./Documentation/Makefile   2006-05-09 15:04:50.000000000 +0300
31+@@ -25,7 +25,7 @@
32 
33  prefix?=$(HOME)
34  bin=$(prefix)/bin
35@@ -10,10 +10,10 @@
36  man1=$(mandir)/man1
37  man7=$(mandir)/man7
38  # DESTDIR=
39-diff -Nru ../git-1.2.1.orig/Makefile ./Makefile
40---- ../git-1.2.1.orig/Makefile 2006-02-16 05:14:04.000000000 +0200
41-+++ ./Makefile 2006-02-18 10:55:37.000000000 +0200
42-@@ -72,8 +72,6 @@
43+diff -Nru ../git-1.3.2.orig/Makefile ./Makefile
44+--- ../git-1.3.2.orig/Makefile 2006-05-04 08:59:30.000000000 +0300
45++++ ./Makefile 2006-05-09 15:06:42.000000000 +0300
46+@@ -85,8 +85,6 @@
47 
48  # CFLAGS and LDFLAGS are for the users to override from the command line.
49 
50@@ -22,20 +22,24 @@
51  ALL_CFLAGS = $(CFLAGS)
52  ALL_LDFLAGS = $(LDFLAGS)
53  STRIP ?= strip
54-@@ -218,12 +216,6 @@
55+@@ -227,16 +225,6 @@
56  ifeq ($(uname_S),Darwin)
57        NEEDS_SSL_WITH_CRYPTO = YesPlease
58        NEEDS_LIBICONV = YesPlease
59 -      ## fink
60--      ALL_CFLAGS += -I/sw/include
61--      ALL_LDFLAGS += -L/sw/lib
62+-      ifeq ($(shell test -d /sw/lib && echo y),y)
63+-              ALL_CFLAGS += -I/sw/include
64+-              ALL_LDFLAGS += -L/sw/lib
65+-      endif
66 -      ## darwinports
67--      ALL_CFLAGS += -I/opt/local/include
68--      ALL_LDFLAGS += -L/opt/local/lib
69+-      ifeq ($(shell test -d /opt/local/lib && echo y),y)
70+-              ALL_CFLAGS += -I/opt/local/include
71+-              ALL_LDFLAGS += -L/opt/local/lib
72+-      endif
73  endif
74  ifeq ($(uname_S),SunOS)
75        NEEDS_SOCKET = YesPlease
76-@@ -293,7 +285,7 @@
77+@@ -322,7 +310,7 @@
78        ifdef CURLDIR
79                # This is still problematic -- gcc does not always want -R.
80                ALL_CFLAGS += -I$(CURLDIR)/include
81@@ -44,7 +48,7 @@
82        else
83                CURL_LIBCURL = -lcurl
84        endif
85-@@ -313,7 +305,7 @@
86+@@ -343,7 +331,7 @@
87        ifdef OPENSSLDIR
88                # Again this may be problematic -- gcc does not always want -R.
89                ALL_CFLAGS += -I$(OPENSSLDIR)/include
90@@ -53,7 +57,7 @@
91        else
92                OPENSSL_LINK =
93        endif
94-@@ -331,7 +323,7 @@
95+@@ -361,7 +349,7 @@
96        ifdef ICONVDIR
97                # Again this may be problematic -- gcc does not always want -R.
98                ALL_CFLAGS += -I$(ICONVDIR)/include