diff options
| author | tonio <tonio@pkgsrc.org> | 2005-09-10 11:26:47 +0000 |
|---|---|---|
| committer | tonio <tonio@pkgsrc.org> | 2005-09-10 11:26:47 +0000 |
| commit | 59b9997886c0e2cdc5470e5b2b5f6bff781a2a12 (patch) | |
| tree | c389f33581c2e8426f5875c167b0e0f48a2c2b36 | |
| parent | d2c2820b4345ce62fa124c95082f50953a9684d3 (diff) | |
| download | pkgsrc-59b9997886c0e2cdc5470e5b2b5f6bff781a2a12.tar.gz | |
Force lbdb to use TOOLS_SH and TOOLS_AWK when building scripts
so prevent interactions with bash and gawk packages or tools wrappers
Update maintainer address, and bump PKGREVISION, binary packages may contain references to bash or gawk
| -rw-r--r-- | databases/lbdb/Makefile | 9 | ||||
| -rw-r--r-- | databases/lbdb/distinfo | 4 | ||||
| -rw-r--r-- | databases/lbdb/patches/patch-ab | 30 |
3 files changed, 33 insertions, 10 deletions
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile index 08492b10a93..6abaaca0d18 100644 --- a/databases/lbdb/Makefile +++ b/databases/lbdb/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2005/09/03 12:51:10 tonio Exp $ +# $NetBSD: Makefile,v 1.8 2005/09/10 11:26:47 tonio Exp $ DISTNAME= lbdb_0.30 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.spinnaker.de/debian/ -MAINTAINER= reilles@loria.fr +MAINTAINER= tonio@NetBSD.org HOMEPAGE= http://www.spinnaker.de/lbdb/ COMMENT= The little brother's database @@ -24,6 +24,9 @@ CONFIGURE_ARGS+= --without-evolution-addressbook-export CONFIGURE_ARGS+= --without-pgp CONFIGURE_ARGS+= --without-pgpk +CONFIGURE_ENV+= SH=${TOOLS_SH} +CONFIGURE_ENV+= AWK=${TOOLS_AWK} + .include "options.mk" WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/databases/lbdb/distinfo b/databases/lbdb/distinfo index b0d48a304c8..9395f42fc45 100644 --- a/databases/lbdb/distinfo +++ b/databases/lbdb/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/09/04 14:53:15 tonio Exp $ +$NetBSD: distinfo,v 1.4 2005/09/10 11:26:47 tonio Exp $ SHA1 (lbdb_0.30.tar.gz) = d137c11857ea23e9689e0f93d876ec107a7b8467 RMD160 (lbdb_0.30.tar.gz) = 289c2a9395523bac08bc36510894b14fb3b18057 Size (lbdb_0.30.tar.gz) = 104620 bytes SHA1 (patch-aa) = 22fe204b0a72e6565fd20e812be1ca84550689b3 -SHA1 (patch-ab) = 9fda85f934b41be45239c1c4083e6592caa01d00 +SHA1 (patch-ab) = d7f28838c8501f0c9631be949b3dbc8141170ec4 diff --git a/databases/lbdb/patches/patch-ab b/databases/lbdb/patches/patch-ab index 4731c907731..b2e706848a2 100644 --- a/databases/lbdb/patches/patch-ab +++ b/databases/lbdb/patches/patch-ab @@ -1,8 +1,28 @@ -$NetBSD: patch-ab,v 1.1 2005/08/30 16:14:53 tonio Exp $ +$NetBSD: patch-ab,v 1.2 2005/09/10 11:26:47 tonio Exp $ ---- configure.orig 2005-04-30 20:23:23.000000000 +0100 -+++ configure 2005-07-05 17:46:06.000000000 +0100 -@@ -4604,6 +4604,12 @@ +--- configure.orig 2005-04-30 21:23:23.000000000 +0200 ++++ configure +@@ -3294,18 +3294,7 @@ if test "x$AWK" != "xNONE" ; then + AWK="$AWK" + fi + +-if test "x$NAWK" != "xNONE" ; then +- AWK="$NAWK" +-fi +- +-if test "x$GAWK" != "xNONE" ; then +- AWK="$GAWK" +-fi +- +-if test "x$MAWK" != "xNONE" ; then +- AWK="$MAWK" +-fi +- ++#use the supplied awk + + + # Extract the first word of "tac", so it can be a program name with args. +@@ -4604,6 +4593,12 @@ if test "x$PERL" != xno ; then fi @@ -15,7 +35,7 @@ $NetBSD: patch-ab,v 1.1 2005/08/30 16:14:53 tonio Exp $ # m_osx_addressbook requires xcode (10.3) or projectbuilder (<10.3) # Extract the first word of "xcodebuild", so it can be a program name with args. set dummy xcodebuild; ac_word=$2 -@@ -4694,6 +4700,11 @@ +@@ -4694,6 +4689,11 @@ fi fi fi |