From 2cebc7343e23f5374b4a292f92e051d16c9d448b Mon Sep 17 00:00:00 2001
From: Dirk Froemberg <dirk@FreeBSD.org>
Date: Wed, 8 Aug 2001 21:02:35 +0000
Subject: [PATCH] Move freetype support into GD support and switch to
 freetype2. GD depends on freetype2 anyway.

---
 www/mod_php4/scripts/configure.php | 17 +++++++----------
 www/mod_php5/scripts/configure.php | 17 +++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 6d4450488241..40c068fceac4 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -14,7 +14,6 @@ else
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
 GD		"GD library support" OFF \
-FreeType	"TrueType font rendering (implies GD)" OFF \
 zlib		"zlib library support" ON \
 mcrypt		"Encryption support" OFF \
 mhash		"Crypto-hashing support" OFF \
@@ -73,15 +72,13 @@ while [ "$1" ]; do
 	case $1 in
 		\"GD\")
 			echo "LIB_DEPENDS+=	gd.2:\${PORTSDIR}/graphics/gd"
-			echo "CONFIGURE_ARGS+=--with-gd=\${PREFIX}"
-			GD=1
-			;;
-		\"FreeType\")
-			echo "LIB_DEPENDS+=	ttf.4:\${PORTSDIR}/print/freetype"
-			echo "CONFIGURE_ARGS+=--with-ttf=\${PREFIX}"
-			if [ -z "$GD" ]; then
-				set $* \"GD\"
-			fi
+			echo "LIB_DEPENDS+=	freetype.7:\${PORTSDIR}/print/freetype2"
+			echo "LIB_DEPENDS+=	png.4:\${PORTSDIR}/graphics/png"
+			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
+			echo "CONFIGURE_ARGS+=--with-gd=\${PREFIX} \\"
+			echo "		--with-freetype-dir=\${PREFIX} \\"
+			echo "		--with-jpeg-dir=\${PREFIX} \\"
+			echo "		--with-png-dir=\${PREFIX}"
 			;;
 		\"zlib\")
 			echo "CONFIGURE_ARGS+=--with-zlib"
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 6d4450488241..40c068fceac4 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -14,7 +14,6 @@ else
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
 GD		"GD library support" OFF \
-FreeType	"TrueType font rendering (implies GD)" OFF \
 zlib		"zlib library support" ON \
 mcrypt		"Encryption support" OFF \
 mhash		"Crypto-hashing support" OFF \
@@ -73,15 +72,13 @@ while [ "$1" ]; do
 	case $1 in
 		\"GD\")
 			echo "LIB_DEPENDS+=	gd.2:\${PORTSDIR}/graphics/gd"
-			echo "CONFIGURE_ARGS+=--with-gd=\${PREFIX}"
-			GD=1
-			;;
-		\"FreeType\")
-			echo "LIB_DEPENDS+=	ttf.4:\${PORTSDIR}/print/freetype"
-			echo "CONFIGURE_ARGS+=--with-ttf=\${PREFIX}"
-			if [ -z "$GD" ]; then
-				set $* \"GD\"
-			fi
+			echo "LIB_DEPENDS+=	freetype.7:\${PORTSDIR}/print/freetype2"
+			echo "LIB_DEPENDS+=	png.4:\${PORTSDIR}/graphics/png"
+			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
+			echo "CONFIGURE_ARGS+=--with-gd=\${PREFIX} \\"
+			echo "		--with-freetype-dir=\${PREFIX} \\"
+			echo "		--with-jpeg-dir=\${PREFIX} \\"
+			echo "		--with-png-dir=\${PREFIX}"
 			;;
 		\"zlib\")
 			echo "CONFIGURE_ARGS+=--with-zlib"