- upgrade to PHP-3.0.12

- use new pdflib-2.0

10 files changed, 69 insertions, 38 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 44e564b98c4e..1408dee4acbc 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.80 1999/07/01 11:28:24 dirk Exp $
+# $Id: Makefile,v 1.81 1999/07/03 09:50:38 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -36,7 +36,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 Y2K=		http://www.php.net/y2k.php3
 
 VERSION_APACHE=	1.3.6
-VERSION_PHP3=	3.0.10
+VERSION_PHP3=	3.0.12
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index 64182c0d47da..258cf6675f98 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,3 +1,3 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (php-3.0.10.tar.gz) = decc78b2dc72bd356129f29fe88d46cb
+MD5 (php-3.0.12.tar.gz) = 0d3b9517f8af17f1cd8c994d6fa26dd7
 MD5 (mod_ssl-2.3.10-1.3.6.tar.gz) = be0e441c4a37482387e7651691506102
diff --git a/www/mod_php3/files/patch-aq b/www/mod_php3/files/patch-aq
index b63c36ba4173..64d9664c813c 100644
--- a/www/mod_php3/files/patch-aq
+++ b/www/mod_php3/files/patch-aq
@@ -1,20 +1,33 @@
---- ../php3/configure.orig	Sat May 22 21:38:24 1999
-+++ ../php3/configure	Fri May 28 01:04:36 1999
-@@ -4657,7 +4657,7 @@
- 				IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -limap"
- #           for FreeBSD
- 			elif test -f $IMAP_DIR/lib/libc-client4.a; then
--				IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client4"
-+				IMAP_LIBS="$IMAP_DIR/lib/libc-client4.a"
- 			elif test ! -f $IMAP_DIR/lib/libc-client.a; then
- 				if test ! -f $IMAP_DIR/lib/libc-client4.so; then
- 					{ echo "configure: error: You need to copy or link $IMAP_DIR/lib/c-client.a to $IMAP_DIR/lib/libc-client.a" 1>&2; exit 1; }
-@@ -4672,7 +4672,7 @@
- 				IMAP_LIBS="-L$IMAP_DIR/lib -limap"
- #           for FreeBSD
- 			elif test -f $IMAP_DIR/lib/libc-client4.a; then
--				IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client4"
-+				IMAP_LIBS="$IMAP_DIR/lib/libc-client4.a"
- 			elif test ! -f $IMAP_DIR/lib/c-client.a; then
- 				if test ! -f $IMAP_DIR/lib/libc-client4.so; then
- 					{ echo "configure: error: could not find c-client.a in $IMAP_DIR/lib !" 1>&2; exit 1; }
+--- ../php3/configure.orig	Wed Jul 28 19:07:49 1999
++++ ../php3/configure	Fri Jul 30 17:55:10 1999
+@@ -5072,29 +5072,9 @@
+   if test -n "$unique" && test "`eval $cmd`" = "" ; then
+     eval "LIBPATH$unique=set"
+     
+-    EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
+-    RAW_RPATHS="$RAW_RPATHS ${raw_runpath_switch}$ai_p"
+-    if test -n "$APXS" ; then
+-      RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
+-    else
+-      RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
+-    fi
++    EXTRA_LIBS="$EXTRA_LIBS $ai_p/libc-client4.a"
+   
+   fi
+-
+-
+-  
+-  
+-  unique=`echo $ac_n "c-client4$ac_c" | tr -c -d a-zA-Z0-9`
+-  cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
+-  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+-    eval "LIBRARY$unique=set"
+-    
+-    EXTRA_LIBS="$EXTRA_LIBS -lc-client4"
+-  
+-  fi
+-
+-
+ 
+ 	    elif test -f "$IMAP_DIR/lib/libc-client.a" || test -f "$IMAP_DIR/lib/libc-client.so"; then
+ 		  
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index ce0bdcc14747..d746334a724c 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -14,7 +14,7 @@ FreeType	"PHP3:   TrueType font rendering (implies GD)" OFF \
 zlib		"PHP3:   zlib library support" ON \
 mcrypt		"PHP3:   Encryption support" OFF \
 mhash		"PHP3:   Crypto-hashing support" OFF \
-pdflib		"PHP3:   pdflib support" OFF \
+pdflib		"PHP3:   pdflib support (implies zlib)" OFF \
 IMAP		"PHP3:   IMAP support" OFF \
 MySQL		"PHP3:   MySQL database support" ON \
 PostgreSQL	"PHP3:   PostgreSQL database support" OFF \
@@ -62,6 +62,7 @@ while [ "$1" ]; do
 			;;
 		\"zlib\")
 			echo "PHP3_CONF_ARGS+=	--with-zlib"
+			ZLIB=1
 			;;
 		\"mcrypt\")
 			echo "LIB_DEPENDS+=		mcrypt.2:\${PORTSDIR}/security/libmcrypt"
@@ -72,8 +73,13 @@ while [ "$1" ]; do
 			echo "PHP3_CONF_ARGS+=	--with-mhash=\${PREFIX}"
 			;;
 		\"pdflib\")
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libpdf.a:\${PORTSDIR}/print/pdflib"
-			echo "PHP3_CONF_ARGS+=	--with-pdflib=\${PREFIX}"
+			echo "LIB_DEPENDS+=		pdf.2:\${PORTSDIR}/print/pdflib"
+			echo "PHP3_CONF_ARGS+=	--with-pdflib=\${PREFIX} \\"
+			echo "			--with-jpeg-dir=\${PREFIX} \\"
+			echo "			--with-tiff-dir=\${PREFIX}"
+			if [ -z "$ZLIB" ]; then
+				set $* \"zlib\"
+			fi
 			;;
 		\"IMAP\")
 			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw"
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 44e564b98c4e..1408dee4acbc 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.80 1999/07/01 11:28:24 dirk Exp $
+# $Id: Makefile,v 1.81 1999/07/03 09:50:38 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -36,7 +36,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 Y2K=		http://www.php.net/y2k.php3
 
 VERSION_APACHE=	1.3.6
-VERSION_PHP3=	3.0.10
+VERSION_PHP3=	3.0.12
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 64182c0d47da..258cf6675f98 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,3 +1,3 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (php-3.0.10.tar.gz) = decc78b2dc72bd356129f29fe88d46cb
+MD5 (php-3.0.12.tar.gz) = 0d3b9517f8af17f1cd8c994d6fa26dd7
 MD5 (mod_ssl-2.3.10-1.3.6.tar.gz) = be0e441c4a37482387e7651691506102
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index ce0bdcc14747..d746334a724c 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -14,7 +14,7 @@ FreeType	"PHP3:   TrueType font rendering (implies GD)" OFF \
 zlib		"PHP3:   zlib library support" ON \
 mcrypt		"PHP3:   Encryption support" OFF \
 mhash		"PHP3:   Crypto-hashing support" OFF \
-pdflib		"PHP3:   pdflib support" OFF \
+pdflib		"PHP3:   pdflib support (implies zlib)" OFF \
 IMAP		"PHP3:   IMAP support" OFF \
 MySQL		"PHP3:   MySQL database support" ON \
 PostgreSQL	"PHP3:   PostgreSQL database support" OFF \
@@ -62,6 +62,7 @@ while [ "$1" ]; do
 			;;
 		\"zlib\")
 			echo "PHP3_CONF_ARGS+=	--with-zlib"
+			ZLIB=1
 			;;
 		\"mcrypt\")
 			echo "LIB_DEPENDS+=		mcrypt.2:\${PORTSDIR}/security/libmcrypt"
@@ -72,8 +73,13 @@ while [ "$1" ]; do
 			echo "PHP3_CONF_ARGS+=	--with-mhash=\${PREFIX}"
 			;;
 		\"pdflib\")
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libpdf.a:\${PORTSDIR}/print/pdflib"
-			echo "PHP3_CONF_ARGS+=	--with-pdflib=\${PREFIX}"
+			echo "LIB_DEPENDS+=		pdf.2:\${PORTSDIR}/print/pdflib"
+			echo "PHP3_CONF_ARGS+=	--with-pdflib=\${PREFIX} \\"
+			echo "			--with-jpeg-dir=\${PREFIX} \\"
+			echo "			--with-tiff-dir=\${PREFIX}"
+			if [ -z "$ZLIB" ]; then
+				set $* \"zlib\"
+			fi
 			;;
 		\"IMAP\")
 			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw"
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 44e564b98c4e..1408dee4acbc 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.80 1999/07/01 11:28:24 dirk Exp $
+# $Id: Makefile,v 1.81 1999/07/03 09:50:38 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -36,7 +36,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 Y2K=		http://www.php.net/y2k.php3
 
 VERSION_APACHE=	1.3.6
-VERSION_PHP3=	3.0.10
+VERSION_PHP3=	3.0.12
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 64182c0d47da..258cf6675f98 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,3 +1,3 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (php-3.0.10.tar.gz) = decc78b2dc72bd356129f29fe88d46cb
+MD5 (php-3.0.12.tar.gz) = 0d3b9517f8af17f1cd8c994d6fa26dd7
 MD5 (mod_ssl-2.3.10-1.3.6.tar.gz) = be0e441c4a37482387e7651691506102
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index ce0bdcc14747..d746334a724c 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -14,7 +14,7 @@ FreeType	"PHP3:   TrueType font rendering (implies GD)" OFF \
 zlib		"PHP3:   zlib library support" ON \
 mcrypt		"PHP3:   Encryption support" OFF \
 mhash		"PHP3:   Crypto-hashing support" OFF \
-pdflib		"PHP3:   pdflib support" OFF \
+pdflib		"PHP3:   pdflib support (implies zlib)" OFF \
 IMAP		"PHP3:   IMAP support" OFF \
 MySQL		"PHP3:   MySQL database support" ON \
 PostgreSQL	"PHP3:   PostgreSQL database support" OFF \
@@ -62,6 +62,7 @@ while [ "$1" ]; do
 			;;
 		\"zlib\")
 			echo "PHP3_CONF_ARGS+=	--with-zlib"
+			ZLIB=1
 			;;
 		\"mcrypt\")
 			echo "LIB_DEPENDS+=		mcrypt.2:\${PORTSDIR}/security/libmcrypt"
@@ -72,8 +73,13 @@ while [ "$1" ]; do
 			echo "PHP3_CONF_ARGS+=	--with-mhash=\${PREFIX}"
 			;;
 		\"pdflib\")
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libpdf.a:\${PORTSDIR}/print/pdflib"
-			echo "PHP3_CONF_ARGS+=	--with-pdflib=\${PREFIX}"
+			echo "LIB_DEPENDS+=		pdf.2:\${PORTSDIR}/print/pdflib"
+			echo "PHP3_CONF_ARGS+=	--with-pdflib=\${PREFIX} \\"
+			echo "			--with-jpeg-dir=\${PREFIX} \\"
+			echo "			--with-tiff-dir=\${PREFIX}"
+			if [ -z "$ZLIB" ]; then
+				set $* \"zlib\"
+			fi
 			;;
 		\"IMAP\")
 			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw"