Date: Wed, 2 Dec 1998 22:47:06 +0100 From: Dirk Froemberg <ibex@physik.TU-Berlin.DE> To: Gary Palmer <gpalmer@FreeBSD.ORG>, obrien@NUXI.com Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: ports/www/apache12-php3 Makefile Message-ID: <19981202224706.A25504@physik.TU-Berlin.DE> In-Reply-To: <28077.912584507@gjp.erols.com>; from Gary Palmer on Wed, Dec 02, 1998 at 02:41:47AM -0500 References: <19981201224720.B22183@nuxi.com> <28077.912584507@gjp.erols.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=us-ascii
Hi!
On Wed, Dec 02, 1998 at 02:41:47AM -0500, Gary Palmer wrote:
> "David O'Brien" wrote in message ID
> <19981201224720.B22183@nuxi.com>:
> > dragon:apache12-php3> make fetch
> > >> php-3.0.3.tar.gz doesn't seem to exist on this system.
>
> Whoops. I hacked my makefile to fetch 3.0.5 and I never
> remembered. Sorry. It just needs an update to the port :)
Here it comes... 8)
David, could you please be so kind and commit these changes?
If so apache12-php3/patches/patch-an has to be deleted too, since
it was included in php-3.0.5 (sort of...).
Best regards Dirk
--
e-mail: ibex@physik.tu-berlin.de
--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="apache12-php3.diffs"
diff -ru /usr/ports/www/apache12-php3/Makefile apache12-php3/Makefile
--- /usr/ports/www/apache12-php3/Makefile Wed Dec 2 22:43:21 1998
+++ apache12-php3/Makefile Wed Dec 2 22:44:00 1998
@@ -10,13 +10,13 @@
PKGNAME= apache-php${PHP3_VER}-${APACHE_VER}
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/ \
- ftp://www.php.net/pub/distributions/
+ http://www.php.net/distributions/
DISTFILES= apache_${APACHE_VER}.tar.gz php-${PHP3_VER}.tar.gz
MAINTAINER= Dirk Froemberg <ibex@physik.TU-Berlin.DE>
APACHE_VER= 1.2.6
-PHP3_VER= 3.0.3
+PHP3_VER= 3.0.5
IS_INTERACTIVE= yes
NO_PACKAGE= "Support for different databases via make-variable"
diff -ru /usr/ports/www/apache12-php3/files/md5 apache12-php3/files/md5
--- /usr/ports/www/apache12-php3/files/md5 Mon Sep 14 05:07:21 1998
+++ apache12-php3/files/md5 Wed Dec 2 09:59:13 1998
@@ -1,2 +1,2 @@
MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44
-MD5 (php-3.0.3.tar.gz) = 11c2b1b24642d097efea40e9ce787917
+MD5 (php-3.0.5.tar.gz) = f5d78d425bfe642a25871ff3e375fec2
diff -ru /usr/ports/www/apache12-php3/scripts/configure.php apache12-php3/scripts/configure.php
--- /usr/ports/www/apache12-php3/scripts/configure.php Sun Sep 13 19:12:04 1998
+++ apache12-php3/scripts/configure.php Wed Dec 2 13:03:53 1998
@@ -45,7 +45,7 @@
GD=1
;;
\"FreeType\")
- echo "LIB_DEPENDS+= ttf\\\\.2\\\\.:\${PORTSDIR}/print/freetype" >> ${CURDIR}/Makefile.inc
+ echo "LIB_DEPENDS+= ttf.2:\${PORTSDIR}/print/freetype" >> ${CURDIR}/Makefile.inc
LIBS="$LIBS -lttf"
if [ -z "$GD" ]; then
set $* \"GD\"
@@ -80,8 +80,11 @@
done
ldconfig -r | grep -q -e -lttf
-if [ -z "$FREETYPE" -a $? ]; then
+if [ -z "$FREETYPE" -a $? -eq 0 ]; then
LIBS="$LIBS -lttf"
+fi
+if [ -f ${PREFIX}/lib/libgdbm.a ]; then
+ LIBS="$LIBS -L\${PREFIX}/lib -lgdbm"
fi
echo "EXTRA_LIBS= $LIBS" >> ${CURDIR}/Makefile.inc
--ew6BAiZeqk4r7MaW--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19981202224706.A25504>