From 301287daf51111edb9cdc4569949c8a0a52c9ab9 Mon Sep 17 00:00:00 2001 From: Andreas Klemm Date: Sat, 11 Jul 1998 20:52:38 +0000 Subject: upgrade to newest php version 3.0.1 fixes regarding compilation/linking with libgd a fix for me in Makefile to make this submission $PREFIX clean big thanks to William Submitted by: William Lloyd --- www/mod_php3/Makefile | 14 +++++++------- www/mod_php3/distinfo | 2 +- www/mod_php4/Makefile | 14 +++++++------- www/mod_php4/distinfo | 2 +- www/mod_php5/Makefile | 14 +++++++------- www/mod_php5/distinfo | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'www') diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile index d46c2e453526..2edb24ac96f8 100644 --- a/www/mod_php3/Makefile +++ b/www/mod_php3/Makefile @@ -3,15 +3,15 @@ # Date created: Wed Sep 3 18:28:20 CEST 1997 # Whom: Andreas Klemm # -# $Id: Makefile,v 1.45 1998/06/14 09:57:32 andreas Exp $ +# $Id: Makefile,v 1.46 1998/06/27 13:52:34 andreas Exp $ # DISTNAME= apache_1.2.6 -PKGNAME= apache-1.2.6-php3.0 +PKGNAME= apache-1.2.6-php3.0.1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ \ http://ca.php.net/distributions/ -DISTFILES= apache_1.2.6.tar.gz php-3.0.tar.gz +DISTFILES= apache_1.2.6.tar.gz php-3.0.1.tar.gz MAINTAINER= andreas@FreeBSD.ORG @@ -31,9 +31,9 @@ PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP} .endif # Set it for local-supplied patch, f.e. -VERS_ID = PHP-3.0 +VERS_ID = PHP-3.0.1 -PHP3_CONF_ARGS= --prefix=${PREFIX} \ +PHP3_CONF_ARGS= --prefix=${PREFIX} --with-gd=${PREFIX} \ --with-system-regex --with-apache=${WRKSRC} \ --with-config-file-path=${PREFIX}/lib --disable-debug @@ -67,14 +67,14 @@ post-patch: .endif pre-configure: - ( cd ${WRKDIR}/php-3.0 \ + ( cd ${WRKDIR}/php-3.0.1 \ && CC="${CC}" CFLAGS="${CFLAGS}" ./configure ${PHP3_CONF_ARGS} \ && ${GMAKE} install ) ${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration .if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql - ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration + ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -I${PREFIX}/include/gd -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == dbase diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo index 3d968b813924..88c5b00387c1 100644 --- a/www/mod_php3/distinfo +++ b/www/mod_php3/distinfo @@ -1,2 +1,2 @@ MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44 -MD5 (php-3.0.tar.gz) = d141bde22af0c6853e352537b96abf72 +MD5 (php-3.0.1.tar.gz) = 9f062f5188672eecf5638d04c459d1c9 diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index d46c2e453526..2edb24ac96f8 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -3,15 +3,15 @@ # Date created: Wed Sep 3 18:28:20 CEST 1997 # Whom: Andreas Klemm # -# $Id: Makefile,v 1.45 1998/06/14 09:57:32 andreas Exp $ +# $Id: Makefile,v 1.46 1998/06/27 13:52:34 andreas Exp $ # DISTNAME= apache_1.2.6 -PKGNAME= apache-1.2.6-php3.0 +PKGNAME= apache-1.2.6-php3.0.1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ \ http://ca.php.net/distributions/ -DISTFILES= apache_1.2.6.tar.gz php-3.0.tar.gz +DISTFILES= apache_1.2.6.tar.gz php-3.0.1.tar.gz MAINTAINER= andreas@FreeBSD.ORG @@ -31,9 +31,9 @@ PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP} .endif # Set it for local-supplied patch, f.e. -VERS_ID = PHP-3.0 +VERS_ID = PHP-3.0.1 -PHP3_CONF_ARGS= --prefix=${PREFIX} \ +PHP3_CONF_ARGS= --prefix=${PREFIX} --with-gd=${PREFIX} \ --with-system-regex --with-apache=${WRKSRC} \ --with-config-file-path=${PREFIX}/lib --disable-debug @@ -67,14 +67,14 @@ post-patch: .endif pre-configure: - ( cd ${WRKDIR}/php-3.0 \ + ( cd ${WRKDIR}/php-3.0.1 \ && CC="${CC}" CFLAGS="${CFLAGS}" ./configure ${PHP3_CONF_ARGS} \ && ${GMAKE} install ) ${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration .if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql - ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration + ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -I${PREFIX}/include/gd -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == dbase diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo index 3d968b813924..88c5b00387c1 100644 --- a/www/mod_php4/distinfo +++ b/www/mod_php4/distinfo @@ -1,2 +1,2 @@ MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44 -MD5 (php-3.0.tar.gz) = d141bde22af0c6853e352537b96abf72 +MD5 (php-3.0.1.tar.gz) = 9f062f5188672eecf5638d04c459d1c9 diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index d46c2e453526..2edb24ac96f8 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -3,15 +3,15 @@ # Date created: Wed Sep 3 18:28:20 CEST 1997 # Whom: Andreas Klemm # -# $Id: Makefile,v 1.45 1998/06/14 09:57:32 andreas Exp $ +# $Id: Makefile,v 1.46 1998/06/27 13:52:34 andreas Exp $ # DISTNAME= apache_1.2.6 -PKGNAME= apache-1.2.6-php3.0 +PKGNAME= apache-1.2.6-php3.0.1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ \ http://ca.php.net/distributions/ -DISTFILES= apache_1.2.6.tar.gz php-3.0.tar.gz +DISTFILES= apache_1.2.6.tar.gz php-3.0.1.tar.gz MAINTAINER= andreas@FreeBSD.ORG @@ -31,9 +31,9 @@ PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP} .endif # Set it for local-supplied patch, f.e. -VERS_ID = PHP-3.0 +VERS_ID = PHP-3.0.1 -PHP3_CONF_ARGS= --prefix=${PREFIX} \ +PHP3_CONF_ARGS= --prefix=${PREFIX} --with-gd=${PREFIX} \ --with-system-regex --with-apache=${WRKSRC} \ --with-config-file-path=${PREFIX}/lib --disable-debug @@ -67,14 +67,14 @@ post-patch: .endif pre-configure: - ( cd ${WRKDIR}/php-3.0 \ + ( cd ${WRKDIR}/php-3.0.1 \ && CC="${CC}" CFLAGS="${CFLAGS}" ./configure ${PHP3_CONF_ARGS} \ && ${GMAKE} install ) ${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration .if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql - ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration + ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -I${PREFIX}/include/gd -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration .elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == dbase diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo index 3d968b813924..88c5b00387c1 100644 --- a/www/mod_php5/distinfo +++ b/www/mod_php5/distinfo @@ -1,2 +1,2 @@ MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44 -MD5 (php-3.0.tar.gz) = d141bde22af0c6853e352537b96abf72 +MD5 (php-3.0.1.tar.gz) = 9f062f5188672eecf5638d04c459d1c9 -- cgit v1.2.3