From 5e1540aadcaee8b87f41ee3d82360cf67ab51794 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Thu, 18 Nov 1999 23:07:14 +0000 Subject: [PATCH] graphics/gd does not install shared libraries any longer, so use BUILD_DEPENDS instead of LIB_DEPENDS. gd-1.7.3 does not work with PHP-3.0.12, so pull the relevant parts from their cvs tree and put them into PATCHFILES. I hope the PHP developers are releasing PHP-3.0.13 soon. Otherwise we end up in maintaining their complete cvs tree as a part of ours. ;-) --- www/mod_php3/Makefile | 4 ++-- www/mod_php3/distinfo | 7 ++++--- www/mod_php3/scripts/configure.php | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile index 77476ec5294a..7c79701b7635 100644 --- a/www/mod_php3/Makefile +++ b/www/mod_php3/Makefile @@ -42,8 +42,8 @@ MASTER_SITES= http://www.apache.org/dist/ \ DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz PATCH_SITES= http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/ -PATCHFILES= php_configure.diff php_gd.c.diff php_php3_gd.h.diff \ - php_pdf.c.diff php_snmp.c.diff +PATCHFILES= php_configure.2.diff php_gd.c.2.diff php_php3_gd.h.2.diff \ + php_pdf.c.diff php_snmp.c.diff php_config.h.in.diff MAINTAINER= dirk@FreeBSD.org diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo index 6e21fee070c0..46a4c94e89b8 100644 --- a/www/mod_php3/distinfo +++ b/www/mod_php3/distinfo @@ -1,8 +1,9 @@ MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 MD5 (php-3.0.12.tar.gz) = 0d3b9517f8af17f1cd8c994d6fa26dd7 MD5 (mod_ssl-2.4.8-1.3.9.tar.gz) = f764b961220b8c067e88ae3abc717785 -MD5 (php_configure.diff) = 69d8e2e6d49d9e37aab6e8d9765bcb1d -MD5 (php_gd.c.diff) = da5f001772417a1a65711be55f1cd38c -MD5 (php_php3_gd.h.diff) = d9da6e7fecafc5a57dcd320a943c22fd +MD5 (php_config.h.in.diff) = 457a3c0f852b77c41a3dc77941084563 +MD5 (php_configure.2.diff) = 7a3d4f454bc4f2e8b90cd49b8c2c2b34 +MD5 (php_gd.c.2.diff) = f5bd3dce848680bf4ae896cdd79a0130 MD5 (php_pdf.c.diff) = 9468644eeade2d03e7f5409f7108ea4b +MD5 (php_php3_gd.h.2.diff) = 7e863363f2aa127e9859369a5697e3c3 MD5 (php_snmp.c.diff) = ece35a4e9349df144f596a10fc1df4c6 diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php index 40f57f46ee41..bb10098f6cf3 100644 --- a/www/mod_php3/scripts/configure.php +++ b/www/mod_php3/scripts/configure.php @@ -56,7 +56,7 @@ while [ "$1" ]; do echo "APACHE_PERF_TUNING= YES" ;; \"GD\") - echo "LIB_DEPENDS+= gd.0:\${PORTSDIR}/graphics/gd" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" echo "PHP_CONF_ARGS+= --with-gd=\${PREFIX}" GD=1 ;;