- 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, 47 insertions, 15 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index a062df5f40da..b2f71a4bf5f1 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -128,8 +128,8 @@ PLIST_SUB+=	CLI=""
 SAPI_FILE=	"bin/php"
 .endif
 
-ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DOM \
-		EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
+ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \
+		DOM EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
 		INIFILE MBSTRING MCVE MCRYPT MHASH MIME MING MNOGOSEARCH MSSQL \
 		MYSQL NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \
 		POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP \
@@ -243,7 +243,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
 
@@ -259,6 +264,10 @@ CONFIGURE_ARGS+=--enable-dbase
 CONFIGURE_ARGS+=--enable-dbx
 .endif
 
+.if defined(WITH_DIO)
+CONFIGURE_ARGS+=--enable-dio
+.endif
+
 .if defined(WITH_DOM)
 CONFIGURE_ARGS+=--enable-dom
 .endif
@@ -411,7 +420,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
 
@@ -586,7 +596,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
diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure
index babf35215a6d..4890f31005d6 100644
--- a/lang/php5/files/patch-configure
+++ b/lang/php5/files/patch-configure
@@ -1,5 +1,5 @@
 --- configure.orig	Mon Dec 22 10:01:56 2003
-+++ configure	Mon Dec 22 10:19:16 2003
++++ configure	Sat Jan 24 14:08:52 2004
 @@ -622,6 +622,8 @@
  ac_help="$ac_help
    --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support."
@@ -9,7 +9,27 @@
    --with-gettext[=DIR]    Include GNU gettext support."
  ac_help="$ac_help
    --with-gmp[=DIR]        Include GNU MP support"
-@@ -29640,6 +29642,31 @@
+@@ -23795,6 +23797,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
+@@ -23814,7 +23820,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
+@@ -29640,6 +29646,31 @@
  
  
  
@@ -41,7 +61,7 @@
  
  
  
-@@ -29792,7 +29819,7 @@
+@@ -29792,7 +29823,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
-@@ -29867,6 +29894,11 @@
+@@ -29867,6 +29898,11 @@
    fi
  
    
@@ -62,7 +82,7 @@
    if test "$PHP_JPEG_DIR" != "no"; then
  
      for i in $PHP_JPEG_DIR /usr/local /usr; do
-@@ -31580,6 +31612,9 @@
+@@ -31580,6 +31616,9 @@
  
    cat >> confdefs.h <<\EOF
  #define HAVE_GD_BUNDLED 1
@@ -72,7 +92,7 @@
  EOF
  
    cat >> confdefs.h <<\EOF
-@@ -31634,6 +31669,14 @@
+@@ -31634,6 +31673,14 @@
      GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
    fi
  
@@ -87,7 +107,7 @@
  else
  
   if test "$PHP_GD" != "no"; then
-@@ -35985,6 +36028,137 @@
+@@ -35985,6 +36032,137 @@
      esac
    done
  
@@ -225,7 +245,7 @@
    echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
  echo "configure:35990: checking for gdCacheCreate in -lgd" >&5
  ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
-@@ -60181,6 +60355,102 @@
+@@ -60181,6 +60359,102 @@
  	    
  
    if test "$ext_shared" = "yes"; then
@@ -328,7 +348,7 @@
      ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
      if test -n "$ORACLE_DIR/lib"; then
        
-@@ -79683,29 +79953,6 @@
+@@ -79683,29 +79957,6 @@
    else
      
    
@@ -358,7 +378,7 @@
    case ct in
    c|c_r|pthread*) ;;
    *) 
-@@ -79729,52 +79976,7 @@
+@@ -79729,52 +79980,7 @@
  
      
    
@@ -412,7 +432,7 @@
    
      
    save_old_LDFLAGS=$LDFLAGS
-@@ -79909,38 +80111,6 @@
+@@ -79909,38 +80115,6 @@
    c|c_r|pthread*) ;;
    *) 
        LIBS="-ltcl $LIBS" 
diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php
index 8f31a239cc9f..32056e094a33 100644
--- a/lang/php5/scripts/configure.php
+++ b/lang/php5/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} \
 DOM		"DOM support" ${WITH_DOM:-OFF} \
 EXIF		"EXIF support" ${WITH_EXIF:-OFF} \
 FILEPRO		"filePro support" ${WITH_FILEPRO:-OFF} \
diff --git a/lang/php5/scripts/php5_options b/lang/php5/scripts/php5_options
index b8886dfe0c76..3588ccf52c9a 100644
--- a/lang/php5/scripts/php5_options
+++ b/lang/php5/scripts/php5_options
@@ -8,6 +8,7 @@ WITH_CURL=OFF
 WITH_DB4=OFF
 WITH_DBASE=OFF
 WITH_DBX=OFF
+WITH_DIO=OFF
 WITH_DOM=ON
 WITH_EXIF=OFF
 WITH_FILEPRO=OFF