From c6da43c864a9777b85233db4062be6a956b99a6e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 13 Oct 2008 00:40:57 +0200 Subject: [PATCH] git: remove hardcoded /usr/pkg stuff from Makefile for NetBSD! That means that the correct rpath dir is used now even if /usr/pkg is there. --HG-- extra : convert_revision : a1e1417bb9349274805426fd12676810f38a2c2e --- templates/git-fix-install.diff | 15 +++++++++++++++ templates/git.tmpl | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 templates/git-fix-install.diff diff --git a/templates/git-fix-install.diff b/templates/git-fix-install.diff new file mode 100644 index 00000000000..c3ad8e1cd53 --- /dev/null +++ b/templates/git-fix-install.diff @@ -0,0 +1,15 @@ +--- 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 f77abc725d6..09fce9a9adf 100755 --- a/templates/git.tmpl +++ b/templates/git.tmpl @@ -1,6 +1,7 @@ # Template build file for 'git". pkgname=git version=1.6.0.2 +patch_files="$pkgname-fix-install.diff" extract_sufx=".tar.bz2" url=http://www.kernel.org/pub/software/scm/git build_style=gnu_configure @@ -8,6 +9,7 @@ configure_env="CURLDIR=$PKGFS_MASTERDIR" configure_args="--with-shell=/bin/sh --with-perl=$PKGFS_MASTERDIR/bin/perl --with-curl --without-tcltk --with-expat" make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_env="CURLDIR=$PKGFS_MASTERDIR" short_desc="GIT Tree History Storage Tool" maintainer="Daniel Horecki " checksum=eb91ca256d0fbcc956f91ad02da659d9b322261d