Depend on pdflib3 instead of pdflib and thus enable pdflib support.

4 files changed, 16 insertions, 18 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index f16a8ce4ccf9..17a96ace54b3 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mod_php4
 PORTVERSION=	4.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 86051644e777..1c2c69da028e 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -18,7 +18,7 @@ FreeType	"TrueType font rendering (implies GD)" OFF \
 zlib		"zlib library support" ON \
 mcrypt		"Encryption support" OFF \
 mhash		"Crypto-hashing support" OFF \
-pdflib		"pdflib support (implies zlib)" OFF \
+pdflib		"pdflib support" OFF \
 IMAP		"IMAP support" OFF \
 MySQL		"MySQL database support" ON \
 PostgreSQL	"PostgreSQL database support" OFF \
@@ -92,16 +92,15 @@ while [ "$1" ]; do
 			echo "CONFIGURE_ARGS+=--with-mhash=\${PREFIX}"
 			;;
 		\"pdflib\")
-			echo "pdflib is DISABLED for now. Ignoring." > /dev/stderr
-			;;
-		\"nothing\")
-			echo "LIB_DEPENDS+=	pdf.2:\${PORTSDIR}/print/pdflib"
+			echo "LIB_DEPENDS+=	pdf.3:\${PORTSDIR}/print/pdflib3"
+			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
+			echo "LIB_DEPENDS+=	png.4:\${PORTSDIR}/graphics/png"
+			echo "LIB_DEPENDS+=	tiff.4:\${PORTSDIR}/graphics/tiff"
 			echo "CONFIGURE_ARGS+=--with-pdflib=\${PREFIX} \\"
+			echo "		--with-zlib-dir=/usr \\"
 			echo "		--with-jpeg-dir=\${PREFIX} \\"
+			echo "		--with-png-dir=\${PREFIX} \\"
 			echo "		--with-tiff-dir=\${PREFIX}"
-			if [ -z "$ZLIB" ]; then
-				set $* \"zlib\"
-			fi
 			;;
 		\"IMAP\")
 			echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index f16a8ce4ccf9..17a96ace54b3 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mod_php4
 PORTVERSION=	4.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 86051644e777..1c2c69da028e 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -18,7 +18,7 @@ FreeType	"TrueType font rendering (implies GD)" OFF \
 zlib		"zlib library support" ON \
 mcrypt		"Encryption support" OFF \
 mhash		"Crypto-hashing support" OFF \
-pdflib		"pdflib support (implies zlib)" OFF \
+pdflib		"pdflib support" OFF \
 IMAP		"IMAP support" OFF \
 MySQL		"MySQL database support" ON \
 PostgreSQL	"PostgreSQL database support" OFF \
@@ -92,16 +92,15 @@ while [ "$1" ]; do
 			echo "CONFIGURE_ARGS+=--with-mhash=\${PREFIX}"
 			;;
 		\"pdflib\")
-			echo "pdflib is DISABLED for now. Ignoring." > /dev/stderr
-			;;
-		\"nothing\")
-			echo "LIB_DEPENDS+=	pdf.2:\${PORTSDIR}/print/pdflib"
+			echo "LIB_DEPENDS+=	pdf.3:\${PORTSDIR}/print/pdflib3"
+			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
+			echo "LIB_DEPENDS+=	png.4:\${PORTSDIR}/graphics/png"
+			echo "LIB_DEPENDS+=	tiff.4:\${PORTSDIR}/graphics/tiff"
 			echo "CONFIGURE_ARGS+=--with-pdflib=\${PREFIX} \\"
+			echo "		--with-zlib-dir=/usr \\"
 			echo "		--with-jpeg-dir=\${PREFIX} \\"
+			echo "		--with-png-dir=\${PREFIX} \\"
 			echo "		--with-tiff-dir=\${PREFIX}"
-			if [ -z "$ZLIB" ]; then
-				set $* \"zlib\"
-			fi
 			;;
 		\"IMAP\")
 			echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"