From 27a678cc5f8a21e714f42c3ba5e86b1643e7ccda Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 24 Oct 2008 05:28:44 +0200 Subject: [PATCH] git: updated for linux. --HG-- extra : convert_revision : 551a1fd2288036ac4ac068c465a54d5d54d5268d --- templates/git-fix-install.diff | 15 --------------- templates/git.tmpl | 5 +---- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 templates/git-fix-install.diff diff --git a/templates/git-fix-install.diff b/templates/git-fix-install.diff deleted file mode 100644 index c3ad8e1cd53..00000000000 --- a/templates/git-fix-install.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.orig 2008-10-13 00:36:54.000000000 +0200 -+++ Makefile 2008-10-13 00:37:03.000000000 +0200 -@@ -691,9 +691,9 @@ ifeq ($(uname_S),NetBSD) - ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) - NEEDS_LIBICONV = YesPlease - endif -- BASIC_CFLAGS += -I/usr/pkg/include -- BASIC_LDFLAGS += -L/usr/pkg/lib -- ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib -+ #BASIC_CFLAGS += -I/usr/pkg/include -+ #BASIC_LDFLAGS += -L/usr/pkg/lib -+ #ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib - endif - ifeq ($(uname_S),AIX) - NO_STRCASESTR=YesPlease diff --git a/templates/git.tmpl b/templates/git.tmpl index 3c8e4299630..7a02f8e7abe 100644 --- a/templates/git.tmpl +++ b/templates/git.tmpl @@ -1,15 +1,12 @@ # Template build file for 'git". pkgname=git version=1.6.0.2 -patch_files="$pkgname-fix-install.diff" distfiles=" http://www.kernel.org/pub/software/scm/git/$pkgname-$version@.tar.bz2" build_style=gnu_configure -configure_env="CURLDIR=$XBPS_MASTERDIR" make_env="CURLDIR=$XBPS_MASTERDIR THREADED_DELTA_SEARCH=1" -configure_args="--with-shell=/bin/sh --with-perl=$XBPS_MASTERDIR/bin/perl +configure_args="--with-shell=/bin/sh --with-perl=$XBPS_MASTERDIR/usr/bin/perl --with-curl --without-tcltk --with-expat" -make_env="CURLDIR=$XBPS_MASTERDIR" short_desc="GIT Tree History Storage Tool" maintainer="Daniel Horecki " checksum=a332fbcb1c9cf8b1dc224135d5b14e99da4720fc8b082e595b4f20eaf640dad8