Remove setup of environment variables from configure script

to avoid unwanted detection of pre-installed tools.

6 files changed, 133 insertions, 13 deletions

diff --git a/textproc/hyperestraier/distinfo b/textproc/hyperestraier/distinfo
index 74b35aa9af4..9727b820dc3 100644
--- a/textproc/hyperestraier/distinfo
+++ b/textproc/hyperestraier/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.26 2008/01/03 12:50:53 obache Exp $
+$NetBSD: distinfo,v 1.27 2008/05/27 13:51:02 obache Exp $
 
 SHA1 (hyperestraier-1.4.13.tar.gz) = 21c3f325f42019fef096172105c2fc16f3e72fc0
 RMD160 (hyperestraier-1.4.13.tar.gz) = 8af0af25df6d5bd45a09e9abfbb26300339b5a2c
 Size (hyperestraier-1.4.13.tar.gz) = 1014600 bytes
-SHA1 (patch-aa) = 59d2e81e69a4c86d6226955b82bb17e15236c40d
-SHA1 (patch-ac) = f36aa67b501fcf614cd537f80bcedd61764056c6
-SHA1 (patch-ad) = 8ac2fdc41f9a2534bc321c262d87a619d485ea01
+SHA1 (patch-aa) = 67e563ac93b2b3e09122d3fcd12fc443d437fdb3
+SHA1 (patch-ab) = f3f57404f02ff9928adc0a8c5c9ddec65700ce85
+SHA1 (patch-ac) = 06bc0a56cc3a7592995d615a1afbffce8fb99931
+SHA1 (patch-ad) = f2656b84d5f81d9844b97b5536262edc7dee1bdc
+SHA1 (patch-ae) = 28e525d1856ff21fa93f479b3eda65e292857d53
diff --git a/textproc/hyperestraier/patches/patch-aa b/textproc/hyperestraier/patches/patch-aa
index 7219a05d40a..03a748d74dc 100644
--- a/textproc/hyperestraier/patches/patch-aa
+++ b/textproc/hyperestraier/patches/patch-aa
@@ -1,8 +1,34 @@
-$NetBSD: patch-aa,v 1.5 2007/03/05 15:58:19 obache Exp $
+$NetBSD: patch-aa,v 1.6 2008/05/27 13:51:02 obache Exp $
 
---- configure.orig	2007-03-05 18:29:42.000000000 +0900
+--- configure.orig	2007-12-25 01:47:49.000000000 +0000
 +++ configure
-@@ -2966,7 +2966,7 @@ if test "${ac_cv_lib_pthread_main+set}" 
+@@ -1282,25 +1282,6 @@ MYAPPLIBS=""
+ MYRUNPATH=""
+ MYPOSTCMD="true"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+-
+-
+ 
+ #================================================================
+ # Options
+@@ -2966,7 +2947,7 @@ if test "${ac_cv_lib_pthread_main+set}" 
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +37,7 @@ $NetBSD: patch-aa,v 1.5 2007/03/05 15:58:19 obache Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3019,7 +3019,9 @@ fi
+@@ -3019,7 +3000,9 @@ fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
  echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
  if test $ac_cv_lib_pthread_main = yes; then
diff --git a/textproc/hyperestraier/patches/patch-ab b/textproc/hyperestraier/patches/patch-ab
new file mode 100644
index 00000000000..627cea6f071
--- /dev/null
+++ b/textproc/hyperestraier/patches/patch-ab
@@ -0,0 +1,32 @@
+$NetBSD: patch-ab,v 1.7 2008/05/27 13:51:02 obache Exp $
+
+--- perlnative/configure.orig	2007-12-25 01:53:46.000000000 +0000
++++ perlnative/configure
+@@ -1266,27 +1266,6 @@ MYOPTIMIZE="-O3 -fomit-frame-pointer -ff
+ MYPLLIBDIR=/usr/lib/perl5/site_perl
+ MYRUNPATH=""
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+ 
+ # Setting the default prefix
+ if test "$prefix" = NONE
diff --git a/textproc/hyperestraier/patches/patch-ac b/textproc/hyperestraier/patches/patch-ac
index c8da7efd916..7abea5d8933 100644
--- a/textproc/hyperestraier/patches/patch-ac
+++ b/textproc/hyperestraier/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2007/03/05 15:58:20 obache Exp $
+$NetBSD: patch-ac,v 1.3 2008/05/27 13:51:02 obache Exp $
 
---- perlnative/Makefile.in.orig	2007-02-21 18:03:44.000000000 +0900
+--- perlnative/Makefile.in.orig	2007-02-21 09:03:44.000000000 +0000
 +++ perlnative/Makefile.in
 @@ -46,7 +46,7 @@ RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/
  all :
diff --git a/textproc/hyperestraier/patches/patch-ad b/textproc/hyperestraier/patches/patch-ad
index d1bc9e4c74c..e31a5ab7ef8 100644
--- a/textproc/hyperestraier/patches/patch-ad
+++ b/textproc/hyperestraier/patches/patch-ad
@@ -1,8 +1,36 @@
-$NetBSD: patch-ad,v 1.2 2007/03/05 15:58:20 obache Exp $
+$NetBSD: patch-ad,v 1.3 2008/05/27 13:51:02 obache Exp $
 
---- rubynative/configure.orig	2007-03-05 18:38:33.000000000 +0900
+--- rubynative/configure.orig	2007-12-25 01:53:40.000000000 +0000
 +++ rubynative/configure
-@@ -1285,7 +1285,7 @@ fi
+@@ -1233,27 +1233,6 @@ RDOC="rdoc"
+ MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
+ MYRUNPATH=""
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+ 
+ # Setting the default prefix
+ if test "$prefix" = NONE
+@@ -1285,7 +1264,7 @@ fi
  printf '%s\n' "$RDOC"
  
  # Librarh path
diff --git a/textproc/hyperestraier/patches/patch-ae b/textproc/hyperestraier/patches/patch-ae
new file mode 100644
index 00000000000..4deea65b1bf
--- /dev/null
+++ b/textproc/hyperestraier/patches/patch-ae
@@ -0,0 +1,32 @@
+$NetBSD: patch-ae,v 1.1 2008/05/27 13:51:02 obache Exp $
+
+--- rubypure/configure.orig	2007-12-25 01:53:42.000000000 +0000
++++ rubypure/configure
+@@ -1232,27 +1232,6 @@ RUBY="ruby"
+ RDOC="rdoc"
+ MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+ 
+ # Setting the default prefix
+ if test "$prefix" = NONE