Skip to content
Permalink
Browse files

Bug: https://trac.macports.org/ticket/6023

Submitted by:   namely_void@yahoo.co.uk
Reviewed by:    mww@

update to 0.99.99i

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@15392 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
Markus W. Weißmann
Markus W. Weißmann committed Dec 9, 2005
1 parent 17cdb49 commit 757e3994bdf5fbe29a0c37c6f252bfb780149be0
Showing with 62 additions and 4 deletions.
  1. +11 −4 devel/git-core/Portfile
  2. +51 −0 devel/git-core/files/patch-Makefile
@@ -1,8 +1,8 @@
# $Id: Portfile,v 1.1 2005/11/05 17:07:53 mww Exp $
# $Id: Portfile,v 1.2 2005/12/09 16:59:15 mww Exp $

PortSystem 1.0
name git-core
version 0.99.9b
version 0.99.9l
description The stupid content tracker.
long_description A stupid (but extremely fast) directory \
content manager. It doesn't do a whole lot, \
@@ -14,12 +14,19 @@ platforms darwin
homepage http://kernel.org/git/
use_bzip2 yes
master_sites http://www.kernel.org/pub/software/scm/git/
checksums md5 193af5610ac025f17bd6ff35a666a735
checksums md5 ae19d301de6c447866f1c50df4ea6073
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
depends_lib port:curl port:zlib port:openssl
depends_lib port:curl port:zlib port:openssl port:expat port:libiconv

patchfiles patch-Makefile

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}

destroot.destdir DESTDIR=${destroot} prefix=${prefix}
destroot.target install

@@ -0,0 +1,51 @@
--- Makefile.old 2005-12-09 11:42:12.000000000 +0200
+++ Makefile 2005-12-09 12:29:37.000000000 +0200
@@ -59,8 +59,6 @@

# CFLAGS and LDFLAGS are for the users to override from the command line.

-CFLAGS = -g -O2 -Wall
-LDFLAGS =
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)

@@ -201,12 +199,6 @@
ifeq ($(uname_S),Darwin)
NEEDS_SSL_WITH_CRYPTO = YesPlease
NEEDS_LIBICONV = YesPlease
- ## fink
- ALL_CFLAGS += -I/sw/include
- ALL_LDFLAGS += -L/sw/lib
- ## darwinports
- ALL_CFLAGS += -I/opt/local/include
- ALL_LDFLAGS += -L/opt/local/lib
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
@@ -265,7 +257,7 @@
ifdef CURLDIR
# This is still problematic -- gcc does not always want -R.
ALL_CFLAGS += -I$(CURLDIR)/include
- CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
+ CURL_LIBCURL = -L$(CURLDIR)/lib -lcurl
else
CURL_LIBCURL = -lcurl
endif
@@ -285,7 +277,7 @@
ifdef OPENSSLDIR
# Again this may be problematic -- gcc does not always want -R.
ALL_CFLAGS += -I$(OPENSSLDIR)/include
- OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
+ OPENSSL_LINK = -L$(OPENSSLDIR)/lib
else
OPENSSL_LINK =
endif
@@ -303,7 +295,7 @@
ifdef ICONVDIR
# Again this may be problematic -- gcc does not always want -R.
ALL_CFLAGS += -I$(ICONVDIR)/include
- ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
+ ICONV_LINK = -L$(ICONVDIR)/lib
else
ICONV_LINK =
endif

0 comments on commit 757e399

Please sign in to comment.
You can’t perform that action at this time.