- 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)

4 files changed, 54 insertions, 30 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 00cb19651853..5c66d0944dcb 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -65,6 +65,7 @@ USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
+USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
@@ -124,7 +125,7 @@ PLIST_SUB+=	CLI=""
 SAPI_FILE=	"bin/php"
 .endif
 
-ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX \
+ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \
 		DOMXML DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT \
 		GMP HYPERWAVE ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE \
 		MCRYPT MHASH MIME MING MNOGOSEARCH MSSQL MYSQL NCURSES \
@@ -241,7 +242,12 @@ CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
 
 .if defined(WITH_DB4)
+WITH_DB4_VER?=	41
+.if ${WITH_DB4_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+.else
+LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+.endif
 CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 .endif
 
@@ -257,6 +263,10 @@ CONFIGURE_ARGS+=--enable-dbase
 CONFIGURE_ARGS+=--enable-dbx
 .endif
 
+.if defined(WITH_DIO)
+CONFIGURE_ARGS+=--enable-dio
+.endif
+
 .if defined(WITH_DOMXML)
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 CONFIGURE_ARGS+=--with-dom=${LOCALBASE}
@@ -433,7 +443,8 @@ CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if defined(WITH_POSTGRESQL)
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client
+POSTGRESQL_PORT?=	databases/postgresql-client
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
 .endif
 
@@ -595,7 +606,7 @@ CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
 .endif
 
 .if defined(WITH_SNMP)
-.if exists(${LOCALBASE}/lib/libsnmp.so.4)
+.if exists(${LOCALBASE}/lib/libsnmp.so.4) || defined(WITH_SNMP4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
 .else
 LIB_DEPENDS+=	netsnmp.6:${PORTSDIR}/net/net-snmp
@@ -607,6 +618,8 @@ pre-patch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
 
 post-patch:
+	@${REINPLACE_CMD} -e "s|orainst/unix.rgs|ocommon/install/partial.prd|g" \
+		${WRKSRC}/configure
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" \
 		${WRKSRC}/pear/scripts/pearcmd.php > ${WRKSRC}/pear/scripts/pear
 
diff --git a/lang/php4/files/patch-configure b/lang/php4/files/patch-configure
index 2de827da56b8..2e87a132a3a1 100644
--- a/lang/php4/files/patch-configure
+++ b/lang/php4/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jul 31 00:51:41 2003
-+++ configure	Thu Jul 31 08:56:35 2003
-@@ -616,6 +616,8 @@
+--- configure.orig	Mon Nov  3 00:27:51 2003
++++ configure	Sat Jan 24 12:58:20 2004
+@@ -617,6 +617,8 @@
  ac_help="$ac_help
    --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support."
  ac_help="$ac_help
@@ -9,7 +9,27 @@
    --with-gettext[=DIR]    Include GNU gettext support."
  ac_help="$ac_help
    --with-gmp              Include GNU MP support"
-@@ -29141,6 +29143,31 @@
+@@ -23070,6 +23072,10 @@
+         THIS_PREFIX=$i
+         THIS_INCLUDE=$i/db4/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
+@@ -23089,7 +23095,7 @@
+       fi
+     done
+     
+-  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
+     if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
+       
+   old_LDFLAGS=$LDFLAGS
+@@ -29623,6 +29629,31 @@
  
  
  
@@ -41,7 +61,7 @@
  
  
  
-@@ -29293,7 +29320,7 @@
+@@ -29775,7 +29806,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 \
@@ -50,7 +70,7 @@
                   libgd/xbm.c"
  
    for ac_func in fabsf floorf
-@@ -29368,6 +29395,11 @@
+@@ -29850,6 +29881,11 @@
    fi
  
    
@@ -61,8 +81,8 @@
 +  
    if test "$PHP_JPEG_DIR" != "no"; then
  
-     for i in /usr /usr/local $PHP_JPEG_DIR; do
-@@ -31077,6 +31109,9 @@
+     for i in $PHP_JPEG_DIR /usr/local /usr; do
+@@ -31561,6 +31597,9 @@
  
    cat >> confdefs.h <<\EOF
  #define HAVE_GD_BUNDLED 1
@@ -72,7 +92,7 @@
  EOF
  
    cat >> confdefs.h <<\EOF
-@@ -31127,6 +31162,14 @@
+@@ -31615,6 +31654,14 @@
      GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
    fi
  
@@ -87,7 +107,7 @@
  else
  
   if test "$PHP_GD" != "no"; then
-@@ -35474,6 +35517,137 @@
+@@ -35964,6 +36011,137 @@
      esac
    done
  
@@ -223,20 +243,9 @@
 +  done
 +
    echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
- echo "configure:35479: checking for gdCacheCreate in -lgd" >&5
+ echo "configure:35969: checking for gdCacheCreate in -lgd" >&5
  ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
-@@ -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 @@
+@@ -61825,6 +62003,102 @@
  	    
  
    if test "$ext_shared" = "yes"; then
@@ -339,7 +348,7 @@
      ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
      if test -n "$ORACLE_DIR/lib"; then
        
-@@ -76670,29 +76940,6 @@
+@@ -79004,29 +79278,6 @@
    else
      
    
@@ -369,7 +378,7 @@
    case ct in
    c|c_r|pthread*) ;;
    *) 
-@@ -76716,52 +76963,7 @@
+@@ -79050,52 +79301,7 @@
  
      
    
@@ -423,7 +432,7 @@
    
      
    save_old_LDFLAGS=$LDFLAGS
-@@ -76907,38 +77109,6 @@
+@@ -79241,38 +79447,6 @@
  
      
    
@@ -462,7 +471,7 @@
  fi
  
    
-@@ -90711,10 +90881,7 @@
+@@ -93087,10 +93261,7 @@
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  
  all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
diff --git a/lang/php4/scripts/configure.php b/lang/php4/scripts/configure.php
index 0e8a17f3b677..90615afa8b0f 100644
--- a/lang/php4/scripts/configure.php
+++ b/lang/php4/scripts/configure.php
@@ -28,6 +28,7 @@ CURL		"CURL support" ${WITH_CURL:-OFF} \
 DB4		"Berkeley DB4 support" ${WITH_DB4:-OFF} \
 DBASE		"dBase library support" ${WITH_DBASE:-OFF} \
 DBX		"dbx support" ${WITH_DBX:-OFF} \
+DIO		"Direct I/O support" ${WITH_DIO:-OFF} \
 DOMXML		"DOM support" ${WITH_DOMXML:-OFF} \
 DOMXSLT		"DOM XSLT and EXSLT support (implies DOMXML)" ${WITH_DOMXSLT:-OFF} \
 EXIF		"EXIF support" ${WITH_EXIF:-OFF} \
diff --git a/lang/php4/scripts/php4_options b/lang/php4/scripts/php4_options
index 6658088c8811..bb5c725248af 100644
--- a/lang/php4/scripts/php4_options
+++ b/lang/php4/scripts/php4_options
@@ -8,6 +8,7 @@ WITH_CURL=OFF
 WITH_DB4=OFF
 WITH_DBASE=OFF
 WITH_DBX=OFF
+WITH_DIO=OFF
 WITH_DOMXML=OFF
 WITH_DOMXSLT=OFF
 WITH_EXIF=OFF