Change the /usr/pkg check in the configure script to ${PREFIX}.

Move the configure patch to patch-ai and add a patch for configure.in
to patch-ah.

3 files changed, 174 insertions, 22 deletions

diff --git a/www/php3/files/patch-sum b/www/php3/files/patch-sum
index 17ed00fb841..90371175d63 100644
--- a/www/php3/files/patch-sum
+++ b/www/php3/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.7 2000/05/24 15:59:16 rh Exp $
+$NetBSD: patch-sum,v 1.8 2000/05/26 13:40:22 veego Exp $
 
 MD5 (patch-aa) = e849aae28292122164993913671ed861
 MD5 (patch-ab) = 2ee86872739cacc964f53d3798859531
@@ -6,4 +6,5 @@ MD5 (patch-ac) = cebaa37b0348f11233c285dfd7571aea
 MD5 (patch-ad) = 07146ee00a03beb73025daa07c533059
 MD5 (patch-af) = 30bb3522e86d1178d0dda36913301ba1
 MD5 (patch-ag) = 31f5c4a4aea7e216e43af958775feeba
-MD5 (patch-ah) = c8487e157aa096fe3d7df68c503544b8
+MD5 (patch-ah) = 79fb39546a7c42e15cf833507fadf488
+MD5 (patch-ai) = f77042eeb21b0822732eb1a0d057f557
diff --git a/www/php3/patches/patch-ah b/www/php3/patches/patch-ah
index a8bf6383b46..ba916305d2a 100644
--- a/www/php3/patches/patch-ah
+++ b/www/php3/patches/patch-ah
@@ -1,30 +1,77 @@
-$NetBSD: patch-ah,v 1.6 2000/05/24 15:59:17 rh Exp $
-
---- configure.orig	Wed Apr  5 01:32:58 2000
-+++ configure	Wed May 24 17:41:45 2000
-@@ -1624,7 +1624,7 @@
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib"
-+  ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib"
-   for ac_dir in $ac_dummy; do 
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -4373,6 +4373,7 @@
+--- configure.in	Mon Apr  3 20:24:29 2000
++++ configure.in	Fri May 26 15:35:01 2000
+@@ -106,7 +106,7 @@
+ AC_CHECK_SIZEOF(int, 4)
+ 
+ dnl AC_PROG_INSTALL
+-AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib)
++AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib)
+ if test -n "$PROG_SENDMAIL"; then
+   AC_DEFINE(HAVE_SENDMAIL)
+ fi
+@@ -115,9 +115,9 @@
+ dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
+ dnl and source packages.  This should be harmless on other OSs.
+ dnl
+-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+-       CFLAGS="$CFLAGS -I/usr/pkg/include"
+-       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
++if test -d ${PREFIX}/include -a -d ${PREFIX}/lib ; then
++       CFLAGS="$CFLAGS -I${PREFIX}/include"
++       LDFLAGS="$LDFLAGS -L${PREFIX}/lib"
  fi
  
+ AC_CHECK_FUNC(gethostent, [], [
+@@ -285,6 +285,8 @@
  
-+LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
+ AC_CRYPT_CAP
  
- echo $ac_n "checking for Apache module support via DSO through APXS""... $ac_c" 1>&6
- echo "configure:4379: checking for Apache module support via DSO through APXS" >&5
-@@ -4395,7 +4396,7 @@
++LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
++
+ AC_MSG_CHECKING(for Apache module support via DSO through APXS)
+ AC_ARG_WITH(apxs,
+ [  --with-apxs[=FILE]      Build shared Apache module.  FILE is the optional
+@@ -305,7 +307,7 @@
  	if test "a`$APXS -q LD_SHLIB`" = "a" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
  		PHP_APXS_BROKEN=yes
  	fi
 -    PHP_LIBS=-L/usr/local/lib
 +    PHP_LIBS="-R${PREFIX}/lib -L${PREFIX}/lib"
      STRONGHOLD=
-     cat >> confdefs.h <<\EOF
- #define APACHE 1
+     AC_DEFINE(APACHE)
+     AC_SUBST(APXS)
+@@ -539,9 +541,9 @@
+ 		AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include" ],[
+ 			AC_MSG_RESULT("Try /opt/local/include/gdbm.h");
+ 			AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include" ],[
+-				dnl if in /usr/pkg/include, don't add anything.  See above.
+-				AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h");
+-				AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[
++				dnl if in ${PREFIX}/include, don't add anything.  See above.
++				AC_MSG_RESULT("Try ${PREFIX}/include/gdbm.h");
++				AC_CHECK_HEADER(${PREFIX}/include/gdbm.h, [ GDBM_INCLUDE="" ],[
+ 					AC_MSG_RESULT("Giving up - You need to install gdbm.h somewhere");
+ 					exit
+ 				])
+@@ -810,8 +812,8 @@
+       AC_CHECK_LIB(gd,gdImageString16,[ ], [AC_DEFINE(HAVE_GD_ANCIENT)])
+       
+       dnl Say hi to the NetBSD package system!
+-      if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
+-         AC_ADD_INCLUDE(/usr/pkg/include/gd)
++      if test -f ${PREFIX}/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
++         AC_ADD_INCLUDE(${PREFIX}/include/gd)
+       fi
+ 
+       AC_MSG_CHECKING(whether to include GD support)
+@@ -921,8 +923,8 @@
+     AC_CHECK_LIB(gd,gdImageString16,[ ], [AC_DEFINE(HAVE_GD_ANCIENT)])
+     
+     dnl Say hi to the NetBSD package system!
+-    if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
+-       AC_ADD_INCLUDE(/usr/pkg/include/gd)
++    if test -f ${PREFIX}/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
++       AC_ADD_INCLUDE(${PREFIX}/include/gd)
+     fi
+ 
+     AC_MSG_CHECKING(whether to include GD support)
diff --git a/www/php3/patches/patch-ai b/www/php3/patches/patch-ai
new file mode 100644
index 00000000000..98ee8f2d266
--- /dev/null
+++ b/www/php3/patches/patch-ai
@@ -0,0 +1,104 @@
+--- configure	Wed Apr  5 01:32:58 2000
++++ configure	Fri May 26 15:26:58 2000
+@@ -1624,7 +1624,7 @@
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib"
++  ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib"
+   for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+@@ -1651,9 +1651,9 @@
+ 
+ fi
+ 
+-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+-       CFLAGS="$CFLAGS -I/usr/pkg/include"
+-       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
++if test -d ${PREFIX}/include -a -d ${PREFIX}/lib ; then
++       CFLAGS="$CFLAGS -I${PREFIX}/include"
++       LDFLAGS="$LDFLAGS -L${PREFIX}/lib"
+ fi
+ 
+ echo $ac_n "checking for gethostent""... $ac_c" 1>&6
+@@ -4373,6 +4373,7 @@
+ fi
+ 
+ 
++LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
+ 
+ echo $ac_n "checking for Apache module support via DSO through APXS""... $ac_c" 1>&6
+ echo "configure:4379: checking for Apache module support via DSO through APXS" >&5
+@@ -4395,7 +4396,7 @@
+ 	if test "a`$APXS -q LD_SHLIB`" = "a" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
+ 		PHP_APXS_BROKEN=yes
+ 	fi
+-    PHP_LIBS=-L/usr/local/lib
++    PHP_LIBS="-R${PREFIX}/lib -L${PREFIX}/lib"
+     STRONGHOLD=
+     cat >> confdefs.h <<\EOF
+ #define APACHE 1
+@@ -5005,17 +5006,17 @@
+ else
+   echo "$ac_t""no" 1>&6
+ 
+-								echo "$ac_t"""Try /usr/pkg/include/gdbm.h"" 1>&6;
+-				ac_safe=`echo "/usr/pkg/include/gdbm.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for /usr/pkg/include/gdbm.h""... $ac_c" 1>&6
+-echo "configure:5012: checking for /usr/pkg/include/gdbm.h" >&5
++								echo "$ac_t"""Try ${PREFIX}/include/gdbm.h"" 1>&6;
++				ac_safe=`echo "${PREFIX}/include/gdbm.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for ${PREFIX}/include/gdbm.h""... $ac_c" 1>&6
++echo "configure:5012: checking for ${PREFIX}/include/gdbm.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 5017 "configure"
+ #include "confdefs.h"
+-#include </usr/pkg/include/gdbm.h>
++#include <${PREFIX}/include/gdbm.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:5022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6108,14 +6109,14 @@
+ fi
+ 
+       
+-            if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
++            if test -f ${PREFIX}/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
+          
+-  if test "/usr/pkg/include/gd" != "/usr/include"; then
++  if test "${PREFIX}/include/gd" != "/usr/include"; then
+     
+-  if test -z "/usr/pkg/include/gd" || echo "/usr/pkg/include/gd" | grep '^/' >/dev/null ; then
+-    ai_p="/usr/pkg/include/gd"
++  if test -z "${PREFIX}/include/gd" || echo "${PREFIX}/include/gd" | grep '^/' >/dev/null ; then
++    ai_p="${PREFIX}/include/gd"
+   else
+-    ai_p="`pwd`//usr/pkg/include/gd"
++    ai_p="`pwd`/${PREFIX}/include/gd"
+   fi
+ 
+     
+@@ -7076,14 +7077,14 @@
+ fi
+ 
+     
+-        if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
++        if test -f ${PREFIX}/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
+        
+-  if test "/usr/pkg/include/gd" != "/usr/include"; then
++  if test "${PREFIX}/include/gd" != "/usr/include"; then
+     
+-  if test -z "/usr/pkg/include/gd" || echo "/usr/pkg/include/gd" | grep '^/' >/dev/null ; then
+-    ai_p="/usr/pkg/include/gd"
++  if test -z "${PREFIX}/include/gd" || echo "${PREFIX}/include/gd" | grep '^/' >/dev/null ; then
++    ai_p="${PREFIX}/include/gd"
+   else
+-    ai_p="`pwd`//usr/pkg/include/gd"
++    ai_p="`pwd`/${PREFIX}/include/gd"
+   fi
+ 
+