head	1.16;
access;
symbols
	RELEASE_6_1_0:1.15
	RELEASE_5_5_0:1.15
	RELEASE_6_0_0:1.14
	RELEASE_5_4_0:1.14
	RELEASE_4_11_0:1.14
	RELEASE_5_3_0:1.14
	RELEASE_4_10_0:1.12
	RELEASE_5_2_1:1.9
	RELEASE_5_2_0:1.9
	RELEASE_4_9_0:1.7
	RELEASE_5_1_0:1.1;
locks; strict;
comment	@# @;


1.16
date	2006.05.06.13.26.46;	author ale;	state dead;
branches;
next	1.15;

1.15
date	2005.11.16.08.24.46;	author ale;	state Exp;
branches;
next	1.14;

1.14
date	2004.10.11.19.47.20;	author ale;	state Exp;
branches;
next	1.13;

1.13
date	2004.07.19.07.05.33;	author ale;	state dead;
branches;
next	1.12;

1.12
date	2004.03.29.07.58.05;	author ale;	state Exp;
branches;
next	1.11;

1.11
date	2004.03.26.16.44.25;	author ale;	state Exp;
branches;
next	1.10;

1.10
date	2004.01.24.13.15.54;	author ale;	state Exp;
branches;
next	1.9;

1.9
date	2003.11.05.11.06.59;	author jeh;	state Exp;
branches;
next	1.8;

1.8
date	2003.09.30.11.50.26;	author nork;	state Exp;
branches;
next	1.7;

1.7
date	2003.08.26.15.58.48;	author nork;	state Exp;
branches;
next	1.6;

1.6
date	2003.08.19.01.57.50;	author nork;	state Exp;
branches;
next	1.5;

1.5
date	2003.07.31.07.57.01;	author nork;	state Exp;
branches;
next	1.4;

1.4
date	2003.07.03.06.01.37;	author nork;	state Exp;
branches;
next	1.3;

1.3
date	2003.06.20.05.25.24;	author nork;	state Exp;
branches;
next	1.2;

1.2
date	2003.06.07.20.45.11;	author nork;	state Exp;
branches;
next	1.1;

1.1
date	2003.05.22.18.26.28;	author nork;	state Exp;
branches;
next	;


desc
@@


1.16
log
@Simplify PHP base ports infrastructure:
- remove all slave ports
- add the ability to build all SAPIs concurrently
- update php5 to 5.1.4

*Read* the UPDATING file *before* trying to update PHP
(or at least before mailing me).
@
text
@--- configure.orig	Sun Oct 30 12:06:37 2005
+++ configure	Tue Nov 15 23:25:55 2005
@@@@ -2900,7 +2900,7 @@@@
   save_LIBS=$LIBS
   
 if test -n "$ac_cv_pthreads_lib"; then
-  LIBS="$LIBS -l$ac_cv_pthreads_lib"
+  LIBS="$LIBS $ac_cv_pthreads_lib"
 fi
 
 if test -n "$ac_cv_pthreads_cflags"; then
@@@@ -9725,7 +9725,7 @@@@
 if test "$enable_experimental_zts" = "yes"; then
   
 if test -n "$ac_cv_pthreads_lib"; then
-  LIBS="$LIBS -l$ac_cv_pthreads_lib"
+  LIBS="$LIBS $ac_cv_pthreads_lib"
 fi
 
 if test -n "$ac_cv_pthreads_cflags"; then
@@@@ -9742,8 +9742,6 @@@@
   case $host_alias in
   *solaris*)
     PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
-  *freebsd*)
-    PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
   *linux*)
     PTHREAD_FLAGS=-D_REENTRANT;;
   *aix*)
@@@@ -98846,7 +98844,7 @@@@
   save_LIBS=$LIBS
   
 if test -n "$ac_cv_pthreads_lib"; then
-  LIBS="$LIBS -l$ac_cv_pthreads_lib"
+  LIBS="$LIBS $ac_cv_pthreads_lib"
 fi
 
 if test -n "$ac_cv_pthreads_cflags"; then
@


1.15
log
@- Fix pear pkg-plist
- Increase pear memory limit (requested by amd64)
- Revert apache2handler to the latest working version found in
  PHP 4.4.0, since PHP developers seem not interested in
  fixing the bug with apache2 and mod_rewrite
@
text
@@


1.14
log
@Update to 4.3.9 release:
- Fix compilation of thread-safe PHP after the PTHREAD_LIBS change
- Include md5 and blowfish support on amd64 (fix headers) [1]
- Fix vulnerability in RFC 1867 file upload processing [2]
- Fix php_variables memory disclosure [2]
- GD LZW-GIF support is now enabled by default

PR:		ports/71752 [1], ports/72420 [2]
Submitted by:	Adam Gregoire <bsdunx@@yahoo.com> [1],
		Dmitry A Grigorovich <odip@@bionet.nsc.ru> [2]
Approved by:	portmgr (kris)
@
text
@d1 3
a3 3
--- configure.orig	Mon Oct 11 15:56:07 2004
+++ configure	Mon Oct 11 15:56:28 2004
@@@@ -2672,7 +2672,7 @@@@
d12 1
a12 1
@@@@ -8934,7 +8934,7 @@@@
d21 1
a21 1
@@@@ -8951,8 +8951,6 @@@@
d30 1
a30 1
@@@@ -89623,7 +89621,7 @@@@
@


1.13
log
@First step of the PHP mega-commit:
- remove extensions and PEAR from the PHP base ports
- add more OPTIONS to PHP base ports
@
text
@d1 4
a4 79
--- configure.orig	Thu Mar 25 15:03:34 2004
+++ configure	Mon Mar 29 09:54:06 2004
@@@@ -617,6 +617,8 @@@@
 ac_help="$ac_help
   --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support."
 ac_help="$ac_help
+  --enable-gd-lzw-gif       GD: Enable LZW-compressed GIF support."
+ac_help="$ac_help
   --with-gettext[=DIR]    Include GNU gettext support."
 ac_help="$ac_help
   --with-gmp[=DIR]        Include GNU MP support"
@@@@ -23147,6 +23149,14 @@@@
         THIS_PREFIX=$i
         THIS_INCLUDE=$i/db4/db.h
         break
+      elif test -f "$i/include/db42/db.h"; then
+        THIS_PREFIX=$i
+        THIS_INCLUDE=$i/include/db42/db.h
+        break
+      elif test -f "$i/include/db41/db.h"; then
+        THIS_PREFIX=$i
+        THIS_INCLUDE=$i/include/db41/db.h
+        break
       elif test -f "$i/include/db4/db.h"; then
         THIS_PREFIX=$i
         THIS_INCLUDE=$i/include/db4/db.h
@@@@ -23166,7 +23176,7 @@@@
       fi
     done
     
-  for LIB in db-4.2 db-4.1 db-4.0 db-4 db4 db; do
+  for LIB in db-4.2 db-4.1 db-4.0 db-4 db41 db4 db; do
     if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
       
   old_LDFLAGS=$LDFLAGS
@@@@ -29711,6 +29721,31 @@@@
 
 
 
+echo $ac_n "checking whether to enable LZW-compressed GIF support in GD""... $ac_c" 1>&6
+echo "configure:28220: checking whether to enable LZW-compressed GIF support in GD" >&5
+# Check whether --enable-gd-lzw-gif or --disable-gd-lzw-gif was given.
+if test "${enable_gd_lzw_gif+set}" = set; then
+  enableval="$enable_gd_lzw_gif"
+  PHP_GD_LZW_GIF=$enableval
+else
+  
+  PHP_GD_LZW_GIF=no
+
+  if test "$PHP_ENABLE_ALL" && test "no" = "yes"; then
+    PHP_GD_LZW_GIF=$PHP_ENABLE_ALL
+  fi
+
+fi
+
+
+ext_output=$PHP_GD_LZW_GIF
+echo "$ac_t""$ext_output" 1>&6
+
+
+
+
+
+
 
 
 
@@@@ -29863,7 +29898,7 @@@@
                  libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \
                  libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \
                  libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \
-                 libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \
+                 libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c libgd/gd_biggif_out.c libgd/gd_lzw_out.c libgd/gd_gif_out.c \
                  libgd/xbm.c"
 
   for ac_func in fabsf floorf
@@@@ -29938,6 +29973,11 @@@@
   fi
 
d6 8
a13 307
+  if test "$PHP_GD_LZW_GIF" = "yes"; then
+    USE_GD_LZW_GIF=1
+  fi
+
+  
   if test "$PHP_JPEG_DIR" != "no"; then
 
     for i in $PHP_JPEG_DIR /usr/local /usr; do
@@@@ -31649,6 +31689,9 @@@@
 
   cat >> confdefs.h <<\EOF
 #define HAVE_GD_BUNDLED 1
+#define HAVE_GD_GIF_CREATE 1
+#define HAVE_GD_GIF_CTX 1
+#define HAVE_GD_GIF_ANIM 1
 EOF
 
   cat >> confdefs.h <<\EOF
@@@@ -31703,6 +31746,14 @@@@
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
   fi
 
+  if test -n "$USE_GD_LZW_GIF"; then
+    cat >> confdefs.h <<\EOF
+#define LZW_LICENCED 1
+EOF
+
+    GDLIB_CFLAGS="$GDLIB_CFLAGS -DLZW_LICENCED"
+  fi
+
 else
 
  if test "$PHP_GD" != "no"; then
@@@@ -36052,6 +36103,137 @@@@
     esac
   done
 
+  echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6
+echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5
+ac_lib_var=`echo gd'_'gdImageGifAnimBegin | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lgd  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 32258 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gdImageGifAnimBegin();
+
+int main() {
+gdImageGifAnimBegin()
+; return 0; }
+EOF
+if { (eval echo configure:32269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+
+    LDFLAGS=$save_old_LDFLAGS
+    ext_shared=$save_ext_shared
+    cat >> confdefs.h <<\EOF
+#define HAVE_GD_GIF_ANIM 1
+EOF
+
+
+else
+  echo "$ac_t""no" 1>&6
+
+    LDFLAGS=$save_old_LDFLAGS
+    ext_shared=$save_ext_shared
+    unset ac_cv_func_gd
+
+
+fi
+
+
+  save_old_LDFLAGS=$LDFLAGS
+  ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
+
+  save_ext_shared=$ext_shared
+  ext_shared=yes
+
+  for ac_i in $ac_stuff; do
+    case $ac_i in
+    -l*)
+      ac_ii=`echo $ac_i|cut -c 3-`
+
+
+  case $ac_ii in
+  c|c_r|pthread*) ;;
+  *)
+    if test "$ext_shared" = "yes"; then
+        LDFLAGS="$LDFLAGS -l$ac_ii"
+    else
+
+
+  case $ac_ii in
+  c|c_r|pthread*) ;;
+  *)
+      LIBS="$LIBS -l$ac_ii"
+   ;;
+  esac
+
+
+    fi
+   ;;
+  esac
+
+
+    ;;
+    -L*)
+      ac_ii=`echo $ac_i|cut -c 3-`
+
+  if test "$ac_ii" != "/usr/lib"; then
+
+  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
+    ai_p=$ac_ii
+  else
+
+    ep_dir="`echo $ac_ii|sed 's%/*[^/][^/]*/*$%%'`"
+
+    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+  fi
+
+
+      if test "$ext_shared" = "yes"; then
+        LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS"
+      else
+
+
+
+  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+
+  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "LIBPATH$unique=set"
+
+    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+    LDFLAGS="$LDFLAGS -L$ai_p"
+    PHP_RPATHS="$PHP_RPATHS $ai_p"
+
+  fi
+
+
+      fi
+
+  fi
+
+    ;;
+    esac
+  done
+
   echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
 echo "configure:36057: checking for gdCacheCreate in -lgd" >&5
 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
@@@@ -62586,6 +62768,102 @@@@
 	    
 
   if test "$ext_shared" = "yes"; then
+    ORACLE_SHARED_LIBADD="-lwrap $ORACLE_SHARED_LIBADD"
+    if test -n "$ORACLE_DIR/lib"; then
+      
+  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+    
+  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/lib
+  else
+    
+    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    
+    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+  fi
+
+    
+      if test "$ext_shared" = "yes"; then
+        ORACLE_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $ORACLE_SHARED_LIBADD"
+      else
+        
+  
+  
+  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+  
+  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "LIBPATH$unique=set"
+    
+    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+    LDFLAGS="$LDFLAGS -L$ai_p"
+    PHP_RPATHS="$PHP_RPATHS $ai_p"
+  
+  fi
+
+
+      fi
+    
+  fi
+
+    fi
+  else
+    
+
+  if test -n "$ORACLE_DIR/lib"; then
+    
+  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+    
+  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/lib
+  else
+    
+    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    
+    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+  fi
+
+    
+      
+  
+  
+  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+  
+  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "LIBPATH$unique=set"
+    
+    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+    LDFLAGS="$LDFLAGS -L$ai_p"
+    PHP_RPATHS="$PHP_RPATHS $ai_p"
+  
+  fi
+
+
+    
+  fi
+
+  fi
+  
+  
+  case wrap in
+  c|c_r|pthread*) ;;
+  *) 
+      LIBS="-lwrap $LIBS" 
+   ;;
+  esac
+
+
+
+
+  fi
+
+
+	    
+
+  if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
     if test -n "$ORACLE_DIR/lib"; then
       
@@@@ -79741,29 +80019,6 @@@@
   else
     
   
-  case cs in
-  c|c_r|pthread*) ;;
-  *) 
-    if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" 
-    else
-      
-  
-  case cs in
-  c|c_r|pthread*) ;;
-  *) 
-      LIBS="-lcs $LIBS" 
-   ;;
-  esac
-
-
-    fi
-   ;;
-  esac
-
-
-    
-  
   case ct in
   c|c_r|pthread*) ;;
   *) 
@@@@ -79787,52 +80042,7 @@@@
 
     
d15 17
a31 47
-  case comn in
-  c|c_r|pthread*) ;;
-  *) 
-    if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" 
-    else
-      
-  
-  case comn in
-  c|c_r|pthread*) ;;
-  *) 
-      LIBS="-lcomn $LIBS" 
-   ;;
-  esac
-
-
-    fi
-   ;;
-  esac
-
-
-    
-  
-  case intl in
-  c|c_r|pthread*) ;;
-  *) 
-    if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" 
-    else
-      
-  
-  case intl in
-  c|c_r|pthread*) ;;
-  *) 
-      LIBS="-lintl $LIBS" 
-   ;;
-  esac
-
-
-    fi
-   ;;
-  esac
-
-
-  
-    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
+    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
d33 4
a36 40
     
   save_old_LDFLAGS=$LDFLAGS
@@@@ -79967,38 +80177,6 @@@@
   c|c_r|pthread*) ;;
   *) 
       LIBS="-ltcl $LIBS" 
-   ;;
-  esac
-
-
-    fi
-   ;;
-  esac
-
-
-    
-  
-else
-  echo "$ac_t""no" 1>&6
-
-    LDFLAGS=$save_old_LDFLAGS
-    ext_shared=$save_ext_shared
-    unset ac_cv_func_tcl
-     
-      
-  
-  case sybtcl in
-  c|c_r|pthread*) ;;
-  *) 
-    if test "$ext_shared" = "yes"; then
-        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 
-    else
-      
-  
-  case sybtcl in
-  c|c_r|pthread*) ;;
-  *) 
-      LIBS="-lsybtcl $LIBS" 
    ;;
   esac
d38 1
@


1.12
log
@Forgot a patch in previous commit (support for DB 4.2).

Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@@sunpoet.net>
@
text
@@


1.11
log
@Update to 4.3.5 release:
- add support for db 4.2
@
text
@d2 1
a2 1
+++ configure	Fri Mar 26 16:36:02 2004
d12 1
a12 1
@@@@ -23147,6 +23149,10 @@@@
d16 4
d27 1
a27 1
@@@@ -23166,7 +23172,7 @@@@
d36 1
a36 1
@@@@ -29711,6 +29717,31 @@@@
d68 1
a68 1
@@@@ -29863,7 +29894,7 @@@@
d77 1
a77 1
@@@@ -29938,6 +29969,11 @@@@
d89 1
a89 1
@@@@ -31649,6 +31685,9 @@@@
d99 1
a99 1
@@@@ -31703,6 +31742,14 @@@@
d114 1
a114 1
@@@@ -36052,6 +36099,137 @@@@
d252 1
a252 1
@@@@ -62586,6 +62764,102 @@@@
d355 1
a355 1
@@@@ -79741,29 +80015,6 @@@@
d385 1
a385 1
@@@@ -79787,52 +80038,7 @@@@
d439 1
a439 1
@@@@ -79967,38 +80173,6 @@@@
@


1.10
log
@- Better handling of snmp dependency [1]
- Add support for BDB 4.1 [2]
- Better handling of postgresql dependency [3]
- Add new direct I/O extension [4]

PR:		58920 [1], 60541 [2], 61409 [3]
Submitted by:	Dirk Meyer <dirk.meyer@@dinoex.sub.org> [1] [3],
		Sunpoet Po-Chuan Hsieh <sunpoet@@sunpoet.net> [2],
		Izzy Kindred <ikindred@@cox.net> [4]
Approved by:	nork (mentor/implicitly)
@
text
@d1 2
a2 2
--- configure.orig	Mon Nov  3 00:27:51 2003
+++ configure	Sat Jan 24 12:58:20 2004
d11 2
a12 2
   --with-gmp              Include GNU MP support"
@@@@ -23070,6 +23072,10 @@@@
d23 1
a23 1
@@@@ -23089,7 +23095,7 @@@@
d27 2
a28 2
-  for LIB in db-4.1 db-4.0 db-4 db4 db; do
+  for LIB in db-4.1 db-4.0 db-4 db41 db4 db; do
d32 1
a32 1
@@@@ -29623,6 +29629,31 @@@@
d64 1
a64 1
@@@@ -29775,7 +29806,7 @@@@
d73 1
a73 1
@@@@ -29850,6 +29881,11 @@@@
d85 1
a85 1
@@@@ -31561,6 +31597,9 @@@@
d95 1
a95 1
@@@@ -31615,6 +31654,14 @@@@
d110 1
a110 1
@@@@ -35964,6 +36011,137 @@@@
d246 1
a246 1
 echo "configure:35969: checking for gdCacheCreate in -lgd" >&5
d248 1
a248 1
@@@@ -61825,6 +62003,102 @@@@
d351 1
a351 1
@@@@ -79004,29 +79278,6 @@@@
d381 1
a381 1
@@@@ -79050,52 +79301,7 @@@@
d435 15
a449 4
@@@@ -79241,38 +79447,6 @@@@
 
     
   
d471 2
a472 24
-   ;;
-  esac
-
-
-    fi
-   ;;
-  esac
-
-
-    
-  
 fi
 
   
@@@@ -93087,10 +93261,7 @@@@
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $install_pear install-build install-headers install-programs"
-if test "$PHP_SAPI" != "cgi"; then
-  install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-fi
+install_targets="install-sapi $PHP_INSTALL_CLI_TARGET install-modules $install_pear install-build install-headers install-programs"
 
a473 1
   PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets"
@


1.9
log
@Update to 4.3.4 final release.

PR:		58914
Submitted by:	MAINTAINER
@
text
@d1 3
a3 3
--- configure.orig	Thu Jul 31 00:51:41 2003
+++ configure	Thu Jul 31 08:56:35 2003
@@@@ -616,6 +616,8 @@@@
d12 21
a32 1
@@@@ -29141,6 +29143,31 @@@@
d64 1
a64 1
@@@@ -29293,7 +29320,7 @@@@
d73 1
a73 1
@@@@ -29368,6 +29395,11 @@@@
d84 2
a85 2
     for i in /usr /usr/local $PHP_JPEG_DIR; do
@@@@ -31077,6 +31109,9 @@@@
d95 1
a95 1
@@@@ -31127,6 +31162,14 @@@@
d110 1
a110 1
@@@@ -35474,6 +35517,137 @@@@
d246 1
a246 1
 echo "configure:35479: checking for gdCacheCreate in -lgd" >&5
d248 1
a248 12
@@@@ -58977,8 +59151,8 @@@@
   
   echo $ac_n "checking Oracle version""... $ac_c" 1>&6
 echo "configure:60535: checking Oracle version" >&5
-  if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
-  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
+  if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then
+  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/ocommon/install/partial.prd | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
 	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
   elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
     ORACLE_VERSION=9.0
@@@@ -60270,6 +60444,102 @@@@
d351 1
a351 1
@@@@ -76670,29 +76940,6 @@@@
d381 1
a381 1
@@@@ -76716,52 +76963,7 @@@@
d435 1
a435 1
@@@@ -76907,38 +77109,6 @@@@
d474 1
a474 1
@@@@ -90711,10 +90881,7 @@@@
@


1.8
log
@o Update to 4.3.4RC1.
o Sync with latest PHP5 changes (new DB4 extension,
  use correct knobs, etc...)

PR:		ports/57399
Submitted by:	Alex Dupre <sysadmin@@alexdupre.com> (maintainer)
@
text
@d231 1
a231 1
 echo "configure:59852: checking Oracle version" >&5
@


1.7
log
@Update to 4.3.3 final release.

PR:		ports/55990
Submitted by:	Alex Dupre <sysadmin@@alexdupre.com> (maintainer)
@
text
@d231 1
a231 1
 echo "configure:58982: checking Oracle version" >&5
@


1.6
log
@Update to 4.3.3RC4.

PR:		ports/55713
Submitted by:	Alex Dupre <sysadmin@@alexdupre.com> (maintainer)
@
text
@d231 1
a231 1
 echo "configure:58981: checking Oracle version" >&5
@


1.5
log
@o Update to 4.3.3RC2.
o Add identification to php4 configuration dialog [1].
o Fix incorrect detecting of OpenLDAP dependency [2].

PR:		ports/55100, ports/54283[1], ports/54726[2]
Submitted by:	Alex Dupre <sysadmin@@alexdupre.com> (maintainer)
		Mark Linimon <linimon@@lonesome.com> [1]
		Jens Rehsack <rehsack@@liwing.de> [2]
@
text
@d231 1
a231 1
 echo "configure:58980: checking Oracle version" >&5
@


1.4
log
@o Switch to libtool 1.4.
o Add WITHOUT_IPV6 knob (Requested by Jens Rehsack <rehsack@@liwing.de>
  in ports/53754, implemented in a slightly different way).
o Add GIF and animated GIF write support by default in GD and add
  WITH_LZW knob to enable the LZW compression algorithm (patented
  in some countries).
o Removed gd_gif_out.diff patch and added many new patches.

PR:		ports/53754, ports/53879
Requested by:	Jens Rehsack <rehsack@@liwing.de>
Submitted by:	Alex Dupre <sysadmin@@alexdupre.com> (maintainer)
@
text
@d1 3
a3 3
--- configure.orig	Thu Jun 19 00:06:29 2003
+++ configure	Sat Jun 28 16:45:44 2003
@@@@ -597,6 +597,8 @@@@
d12 1
a12 1
@@@@ -28224,6 +28226,31 @@@@
d44 1
a44 1
@@@@ -28248,7 +28275,7 @@@@
d53 1
a53 1
@@@@ -28323,6 +28350,11 @@@@
d65 1
a65 1
@@@@ -29724,6 +29756,9 @@@@
d75 1
a75 1
@@@@ -29774,6 +29809,14 @@@@
d90 4
a93 4
@@@@ -32275,6 +32318,60 @@@@
   
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD  $LDFLAGS"
d129 1
a129 1
+  
d131 1
d136 1
a136 1
+  
d141 1
d143 2
a144 2
+    
+  
d147 1
a147 1
+  
d149 76
a224 1
+  LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD  $LDFLAGS"
d226 1
a226 1
 echo "configure:32280: checking for gdCacheCreate in -lgd" >&5
d228 1
a228 1
@@@@ -54325,8 +54422,8 @@@@
d231 1
a231 1
 echo "configure:54328: checking Oracle version" >&5
d239 1
a239 1
@@@@ -56589,6 +56686,102 @@@@
d342 1
a342 1
@@@@ -71130,29 +71323,6 @@@@
d372 1
a372 1
@@@@ -71176,52 +71346,7 @@@@
d426 1
a426 1
@@@@ -71291,37 +71416,6 @@@@
d434 1
d465 1
a465 1
@@@@ -84252,10 +84346,7 @@@@
@


1.3
log
@o Update to 4.3.3RC1.
o Add inifile and cdb extensions.
o Fix imap without ssl(inspired from ports/53141).
o Rename some variable for future compatability (PHP => PHP4)
  (inspired from ports/53113, points 1 and 4 - point 2 is useless).

PR:		ports/53498
Submitted by:	Alex Dupre <sysadmin@@alexdupre.com> (maintainer)
Inspired by:	ports/53141 (Torsten Schneider <fbsd-bugs@@tschneider.org>)
Inspired by:	ports/53113 (Jens Rehsack      <rehsack@@liwing.de>)
@
text
@d2 150
a151 2
+++ configure	Thu Jun 19 11:27:23 2003
@@@@ -54325,8 +54325,8 @@@@
d162 1
a162 1
@@@@ -56589,6 +56589,102 @@@@
d265 1
a265 1
@@@@ -71130,29 +71226,6 @@@@
d295 1
a295 1
@@@@ -71176,52 +71249,7 @@@@
d349 1
a349 1
@@@@ -71291,37 +71319,6 @@@@
d387 1
a387 1
@@@@ -84252,10 +84249,7 @@@@
@


1.2
log
@Add Oracle7 support into PHP4.

PR:		ports/53017
Submitted by:	Alex Dupre <sysadmin@@alexdupre.com> (maintainer)
Obtained from:	ports/52615
Obtained by:	Joe Kelsey <joek@@zircon.staff.flyingcroc.net>
@
text
@d1 3
a3 3
--- configure.orig	Wed May 28 14:36:29 2003
+++ configure	Sat Jun  7 15:37:45 2003
@@@@ -54106,8 +54106,8 @@@@
d6 1
a6 1
 echo "configure:54109: checking Oracle version" >&5
d14 1
a14 1
@@@@ -56370,6 +56370,102 @@@@
d117 1
a117 1
@@@@ -70911,29 +71007,6 @@@@
d147 1
a147 1
@@@@ -70957,52 +71030,7 @@@@
d201 1
a201 1
@@@@ -71072,37 +71100,6 @@@@
d239 1
a239 1
@@@@ -84033,10 +84030,7 @@@@
@


1.1
log
@Add completely new port system for PHP4 (4.3.2RC4).  Updated mod_php4
to 4.3.2RC4 release and added php4-cli and php4 ports, for apache
module, command line interface, and both, respectively.  Too many
changes (improvements, bug fixes and new features) to be listed here,

PR:		ports/51945
Submitted by:	Alex Dupre <sysadmin@@alexdupre.com>
@
text
@d1 117
a117 3
--- configure.orig	Thu May  1 23:30:59 2003
+++ configure	Fri May  2 15:59:58 2003
@@@@ -70925,29 +70925,6 @@@@
d147 1
a147 1
@@@@ -70971,52 +70948,7 @@@@
d201 1
a201 1
@@@@ -71086,37 +71018,6 @@@@
d239 1
a239 1
@@@@ -84050,10 +83951,7 @@@@
@

