aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authordirk <dirk@FreeBSD.org>2000-02-28 05:14:28 +0800
committerdirk <dirk@FreeBSD.org>2000-02-28 05:14:28 +0800
commita8ecbfc6fa48413552209e0f22a07b44aac8a717 (patch)
tree2626ebdb6544902bf91e91f1b65f0e6c1abf51d3 /www
parent435c7ade9b060c966cd4bfba1aa39925812050e3 (diff)
downloadfreebsd-ports-gnome-a8ecbfc6fa48413552209e0f22a07b44aac8a717.tar.gz
freebsd-ports-gnome-a8ecbfc6fa48413552209e0f22a07b44aac8a717.tar.zst
freebsd-ports-gnome-a8ecbfc6fa48413552209e0f22a07b44aac8a717.zip
Sometimes graphics/gd depends on print/freetype sometimes not...
So split GD and FreeType into separate options again.
Diffstat (limited to 'www')
-rw-r--r--www/mod_php3/scripts/configure.php11
-rw-r--r--www/mod_php4/scripts/configure.php11
-rw-r--r--www/mod_php5/scripts/configure.php11
3 files changed, 27 insertions, 6 deletions
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 860e7429cf78..99a5bcc79548 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -15,7 +15,8 @@ fi
Please select desired options:" -1 -1 14 \
tuning "Apache: performance tuning" OFF \
modssl "Apache: SSL support" OFF \
-GD "PHP: GD support & FreeType font rendering" OFF \
+GD "PHP: GD library support" OFF \
+FreeType "PHP: TrueType font rendering (implies GD)" OFF \
zlib "PHP: zlib library support" ON \
mcrypt "PHP: Encryption support" OFF \
mhash "PHP: Crypto-hashing support" OFF \
@@ -59,9 +60,15 @@ while [ "$1" ]; do
;;
\"GD\")
echo "LIB_DEPENDS+= gd.0:\${PORTSDIR}/graphics/gd"
- echo "LIB_DEPENDS+= ttf.4:\${PORTSDIR}/print/freetype"
echo "PHP_CONF_ARGS+= --with-gd=\${PREFIX}"
+ GD=1
+ ;;
+ \"FreeType\")
+ echo "LIB_DEPENDS+= ttf.4:\${PORTSDIR}/print/freetype"
echo "PHP_CONF_ARGS+= --with-ttf=\${PREFIX}"
+ if [ -z "$GD" ]; then
+ set $* \"GD\"
+ fi
;;
\"zlib\")
echo "PHP_CONF_ARGS+= --with-zlib"
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index f290e02821d6..c592418d17f2 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -15,7 +15,8 @@ fi
Please select desired options:" -1 -1 14 \
tuning "Apache: performance tuning" OFF \
modssl "Apache: SSL support" OFF \
-GD "PHP: GD support & FreeType font rendering" OFF \
+GD "PHP: GD library support" OFF \
+FreeType "PHP: TrueType font rendering (implies GD)" OFF \
zlib "PHP: zlib library support" ON \
mcrypt "PHP: Encryption support" OFF \
mhash "PHP: Crypto-hashing support" OFF \
@@ -59,9 +60,15 @@ while [ "$1" ]; do
;;
\"GD\")
echo "LIB_DEPENDS+= gd.0:\${PORTSDIR}/graphics/gd"
- echo "LIB_DEPENDS+= ttf.4:\${PORTSDIR}/print/freetype"
echo "PHP_CONF_ARGS+= --with-gd=shared,\${PREFIX}"
+ GD=1
+ ;;
+ \"FreeType\")
+ echo "LIB_DEPENDS+= ttf.4:\${PORTSDIR}/print/freetype"
echo "PHP_CONF_ARGS+= --with-ttf=\${PREFIX}"
+ if [ -z "$GD" ]; then
+ set $* \"GD\"
+ fi
;;
\"zlib\")
echo "PHP_CONF_ARGS+= --with-zlib"
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index f290e02821d6..c592418d17f2 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -15,7 +15,8 @@ fi
Please select desired options:" -1 -1 14 \
tuning "Apache: performance tuning" OFF \
modssl "Apache: SSL support" OFF \
-GD "PHP: GD support & FreeType font rendering" OFF \
+GD "PHP: GD library support" OFF \
+FreeType "PHP: TrueType font rendering (implies GD)" OFF \
zlib "PHP: zlib library support" ON \
mcrypt "PHP: Encryption support" OFF \
mhash "PHP: Crypto-hashing support" OFF \
@@ -59,9 +60,15 @@ while [ "$1" ]; do
;;
\"GD\")
echo "LIB_DEPENDS+= gd.0:\${PORTSDIR}/graphics/gd"
- echo "LIB_DEPENDS+= ttf.4:\${PORTSDIR}/print/freetype"
echo "PHP_CONF_ARGS+= --with-gd=shared,\${PREFIX}"
+ GD=1
+ ;;
+ \"FreeType\")
+ echo "LIB_DEPENDS+= ttf.4:\${PORTSDIR}/print/freetype"
echo "PHP_CONF_ARGS+= --with-ttf=\${PREFIX}"
+ if [ -z "$GD" ]; then
+ set $* \"GD\"
+ fi
;;
\"zlib\")
echo "PHP_CONF_ARGS+= --with-zlib"