From 1e60a28d984010803bb70e1671aa37d93d6e9596 Mon Sep 17 00:00:00 2001 From: Andreas Klemm Date: Tue, 1 Sep 1998 18:38:05 +0000 Subject: - update port to newest apache (1.3.1) and php (3.0.3) version - change maintainer to Dirk Froemberg , since he is now the driving force - totally revamped configuration (dialog based as in ghostscript) - make portlint happy (andreas@FreeBSD.ORG), APACHE_VER and PHP3_VER variable has to appear later in Makefile, not in front of DISTNAME and PKGNAME Submitted by: Dirk Froemberg --- www/mod_php3/Makefile | 94 ++++++++++++++++++++------------------ www/mod_php3/distinfo | 2 +- www/mod_php3/pkg-plist | 14 ++++-- www/mod_php3/scripts/configure.php | 62 +++++++++++++++++++++++++ www/mod_php4/Makefile | 94 ++++++++++++++++++++------------------ www/mod_php4/distinfo | 2 +- www/mod_php4/pkg-plist | 14 ++++-- www/mod_php4/scripts/configure.php | 62 +++++++++++++++++++++++++ www/mod_php5/Makefile | 94 ++++++++++++++++++++------------------ www/mod_php5/distinfo | 2 +- www/mod_php5/pkg-plist | 14 ++++-- www/mod_php5/scripts/configure.php | 62 +++++++++++++++++++++++++ 12 files changed, 369 insertions(+), 147 deletions(-) create mode 100644 www/mod_php3/scripts/configure.php create mode 100644 www/mod_php4/scripts/configure.php create mode 100644 www/mod_php5/scripts/configure.php diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile index 2aded1f26d95..56ff8bf8961a 100644 --- a/www/mod_php3/Makefile +++ b/www/mod_php3/Makefile @@ -1,24 +1,27 @@ # New ports collection makefile for: apache HTTPD / php3 -# Version required: 1.3.0 / 3.0.3 +# Version required: 1.3.1 / 3.0.3 # Date created: So 21 Jun 1998 16:09:39 CEST # Whom: Stefan Herrmann # # $Id: Makefile,v 1.50 1998/08/27 14:08:20 kuriyama Exp $ # -DISTNAME= apache_1.3.0 -PKGNAME= apache-php3.0.3-1.3.0 +DISTNAME= apache_${APACHE_VER} +PKGNAME= apache-php${PHP3_VER}-${APACHE_VER} CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ \ http://www.php.net/distributions/ -DISTFILES= apache_1.3.0.tar.gz php-3.0.3.tar.gz +DISTFILES= apache_${APACHE_VER}.tar.gz php-${PHP3_VER}.tar.gz -MAINTAINER= stefan@asterix.webaffairs.net +MAINTAINER= ibex@physik.TU-Berlin.DE -BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \ - perl5:${PORTSDIR}/lang/perl5 +APACHE_VER= 1.3.1 +PHP3_VER= 3.0.3 -NO_PACKAGE= "Support for different databases via make-variable" +#USE_PERL5= yes + +IS_INTERACTIVE= yes +NO_PACKAGE= Support for different databases # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance @@ -50,7 +53,7 @@ OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations .endif -CONFIGURE_ENV= OPTIM='${OPTIM}' +CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib' MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1 MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8 @@ -60,47 +63,25 @@ PHP3DOCDIR= ${PREFIX}/share/doc/php3 PHP3_CONF_ARGS= --prefix=${PREFIX} \ --with-system-regex \ - --with-gd \ --with-apache=${WRKSRC} \ --with-config-file-path=${PREFIX}/lib \ --disable-debug -.if !defined(PHP3_DBTYPE) || ${PHP3_DBTYPE} != msql && ${PHP3_DBTYPE} != mysql && ${PHP3_DBTYPE} != pgsql -pre-fetch: - @ ${ECHO} - @ ${ECHO} "You must set variable PHP3_DBTYPE to msql, mysql or pgsql by typing" - @ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]" - @ ${FALSE} -.elif defined(PHP3_DBTYPE) -.if ${PHP3_DBTYPE} == msql -BUILD_DEPENDS+= msql:${PORTSDIR}/databases/msql -PHP3_CONF_ARGS+= --with-msql=${PREFIX} -.elif ${PHP3_DBTYPE} == mysql -BUILD_DEPENDS+= mysql:${PORTSDIR}/databases/mysql -PHP3_CONF_ARGS+= --with-mysql=${PREFIX} -.elif ${PHP3_DBTYPE} == pgsql -BUILD_DEPENDS+= ${PREFIX}/pgsql/bin/psql:${PORTSDIR}/databases/postgresql -PHP3_CONF_ARGS+= --with-pgsql=${PREFIX}/pgsql -.endif -.endif +post-fetch: + @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php -post-patch: - @ ${PATCH} -s -d ${WRKDIR}/php-3.0.3 < ${FILESDIR}/configure.patch +#post-patch: +# @${PATCH} -s -d ${WRKDIR}/php-${PHP3_VER} < ${FILESDIR}/configure.patch pre-configure: - @( cd ${WRKDIR}/php-3.0.3 \ - && ${ECHO_MSG} "===> Configuring for PHP-3.0.3" \ + @( cd ${WRKSRC} \ + && ./configure > /dev/null \ + && cd ${WRKDIR}/php-${PHP3_VER} \ + && ${ECHO_MSG} "===> Configuring for PHP-${PHP3_VER}" \ && CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \ - && ${ECHO_MSG} "===> Building for PHP-3.0.3" \ + && ${ECHO_MSG} "===> Building for PHP-${PHP3_VER}" \ && ${MAKE} install \ - && ${ECHO_MSG} "===> Configuring for Apache-1.3.0" ) -.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql -CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/lib -lmsql -lgd -lm' -.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql -CONFIGURE_ENV+= LIBS='-L${PREFIX}/lib/mysql -L${PREFIX}/lib -lmysqlclient -lm -lgd' -.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql -CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm' -.endif + && ${ECHO_MSG} "===> Configuring for Apache-${APACHE_VER}" ) post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ @@ -121,13 +102,36 @@ post-install: find ${APACHEDOCDIR} -type d -exec chmod a+rx {} \; ; \ find ${APACHEDOCDIR} -type f -exec chmod a+r {} \; .for i in apache_pb.gif index.html manual - /bin/ln -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i + ${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i .endfor .for i in CODING_STANDARDS EXTENSION_STATUS LICENSE - ${INSTALL_DATA} ${WRKDIR}/php-3.0.3/$i ${PHP3DOCDIR} + ${INSTALL_DATA} ${WRKDIR}/php-${PHP3_VER}/$i ${PHP3DOCDIR} .endfor - @ ${ECHO} "Docs reside in ${APACHEDOCDIR}" - @ ${ECHO} "and in ${PHP3DOCDIR}" + @${ECHO} "Docs reside in ${APACHEDOCDIR}" + @${ECHO} "and in ${PHP3DOCDIR}" .endif +# This was copied from bsd.port.mk because a missing post-clean target +# is needed +clean: +.if !defined(NOCLEANDEPENDS) + @${MAKE} clean-depends +.endif + @${ECHO_MSG} "===> Cleaning for ${PKGNAME}" +.if !defined(NO_WRKDIR) + @if [ -d ${WRKDIR} ]; then \ + if [ -w ${WRKDIR} ]; then \ + ${RM} -rf ${WRKDIR}; \ + else \ + ${ECHO_MSG} "===> ${WRKDIR} not writable, skipping"; \ + fi; \ + fi +.else + @${RM} -f ${WRKDIR}/.*_done ${TMPPLIST} +.endif + @${RM} -f Makefile.inc + +.if exists(Makefile.inc) +.include "Makefile.inc" +.endif .include diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo index 20a28b9bd72b..a7bf61f78029 100644 --- a/www/mod_php3/distinfo +++ b/www/mod_php3/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308 +MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 MD5 (php-3.0.3.tar.gz) = 11c2b1b24642d097efea40e9ce787917 diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist index b5ef7df2c205..c4b715f57c49 100644 --- a/www/mod_php3/pkg-plist +++ b/www/mod_php3/pkg-plist @@ -1,15 +1,23 @@ bin/dbmmanage bin/htdigest bin/htpasswd +etc/apache/access.conf etc/apache/access.conf.default +etc/apache/httpd.conf etc/apache/httpd.conf.default +etc/apache/magic etc/apache/magic.default +etc/apache/mime.types etc/apache/mime.types.default +etc/apache/srm.conf etc/apache/srm.conf.default etc/rc.d/apache.sh include/apache/alloc.h include/apache/ap.h +include/apache/ap_compat.h include/apache/ap_config.h +include/apache/ap_config_auto.h +include/apache/ap_ctype.h include/apache/ap_md5.h include/apache/buff.h include/apache/compat.h @@ -185,8 +193,6 @@ share/doc/php3/EXTENSION_STATUS share/doc/php3/LICENSE www/cgi-bin/printenv www/cgi-bin/test-cgi -www/data/apache_pb.gif -www/data/index.html www/icons/README www/icons/a.gif www/icons/alert.black.gif @@ -263,7 +269,6 @@ www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif -@unexec [ -h %D/www/data/manual ] && rm %D/www/data/manual @dirrm etc/apache @dirrm include/apache @dirrm libexec/apache @@ -274,6 +279,9 @@ www/icons/world2.gif @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm share/doc/php3 +www/data/apache_pb.gif +www/data/index.html +www/data/manual @dirrm www/cgi-bin @dirrm www/data @dirrm www/icons diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php new file mode 100644 index 000000000000..9bf8e6600213 --- /dev/null +++ b/www/mod_php3/scripts/configure.php @@ -0,0 +1,62 @@ +#!/bin/sh + +if [ -f ${CURDIR}/Makefile.inc ]; then + exit +fi + +/usr/bin/dialog --title "PHP configuration options" --clear \ + --checklist "\n\ +Please select desired options:" -1 -1 9 \ +GD "GD library support" ON \ +zlib "zlib library support" ON \ +MySQL "MySQL database support" ON \ +PostgresSQL "PostgresSQL database support" OFF \ +mSQL "mSQL database support" OFF \ +dBase "dBase database support" OFF 2> /tmp/checklist.tmp.$$ + +retval=$? + +if [ -s /tmp/checklist.tmp.$$ ]; then + set `cat /tmp/checklist.tmp.$$` +fi +rm -f /tmp/checklist.tmp.$$ + +case $retval in + 0) if [ -z "$*" ]; then + echo "Nothing selected" + fi + ;; + 1) echo "Cancel pressed." + exit 1 + ;; +esac + +> ${CURDIR}/Makefile.inc + +while [ "$1" ]; do + case $1 in + \"GD\") + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-gd" >> ${CURDIR}/Makefile.inc + ;; + \"zlib\") + echo "PHP3_CONF_ARGS+= --with-zlib" >> ${CURDIR}/Makefile.inc + ;; + \"MySQL\") + echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${CURDIR}/Makefile.inc + ;; + \"PostgresSQL\") + echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${CURDIR}/Makefile.inc + ;; + \"mSQL\") + echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${CURDIR}/Makefile.inc + ;; + \"dBase\") + echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc + ;; + esac + shift +done diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index 2aded1f26d95..56ff8bf8961a 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -1,24 +1,27 @@ # New ports collection makefile for: apache HTTPD / php3 -# Version required: 1.3.0 / 3.0.3 +# Version required: 1.3.1 / 3.0.3 # Date created: So 21 Jun 1998 16:09:39 CEST # Whom: Stefan Herrmann # # $Id: Makefile,v 1.50 1998/08/27 14:08:20 kuriyama Exp $ # -DISTNAME= apache_1.3.0 -PKGNAME= apache-php3.0.3-1.3.0 +DISTNAME= apache_${APACHE_VER} +PKGNAME= apache-php${PHP3_VER}-${APACHE_VER} CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ \ http://www.php.net/distributions/ -DISTFILES= apache_1.3.0.tar.gz php-3.0.3.tar.gz +DISTFILES= apache_${APACHE_VER}.tar.gz php-${PHP3_VER}.tar.gz -MAINTAINER= stefan@asterix.webaffairs.net +MAINTAINER= ibex@physik.TU-Berlin.DE -BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \ - perl5:${PORTSDIR}/lang/perl5 +APACHE_VER= 1.3.1 +PHP3_VER= 3.0.3 -NO_PACKAGE= "Support for different databases via make-variable" +#USE_PERL5= yes + +IS_INTERACTIVE= yes +NO_PACKAGE= Support for different databases # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance @@ -50,7 +53,7 @@ OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations .endif -CONFIGURE_ENV= OPTIM='${OPTIM}' +CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib' MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1 MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8 @@ -60,47 +63,25 @@ PHP3DOCDIR= ${PREFIX}/share/doc/php3 PHP3_CONF_ARGS= --prefix=${PREFIX} \ --with-system-regex \ - --with-gd \ --with-apache=${WRKSRC} \ --with-config-file-path=${PREFIX}/lib \ --disable-debug -.if !defined(PHP3_DBTYPE) || ${PHP3_DBTYPE} != msql && ${PHP3_DBTYPE} != mysql && ${PHP3_DBTYPE} != pgsql -pre-fetch: - @ ${ECHO} - @ ${ECHO} "You must set variable PHP3_DBTYPE to msql, mysql or pgsql by typing" - @ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]" - @ ${FALSE} -.elif defined(PHP3_DBTYPE) -.if ${PHP3_DBTYPE} == msql -BUILD_DEPENDS+= msql:${PORTSDIR}/databases/msql -PHP3_CONF_ARGS+= --with-msql=${PREFIX} -.elif ${PHP3_DBTYPE} == mysql -BUILD_DEPENDS+= mysql:${PORTSDIR}/databases/mysql -PHP3_CONF_ARGS+= --with-mysql=${PREFIX} -.elif ${PHP3_DBTYPE} == pgsql -BUILD_DEPENDS+= ${PREFIX}/pgsql/bin/psql:${PORTSDIR}/databases/postgresql -PHP3_CONF_ARGS+= --with-pgsql=${PREFIX}/pgsql -.endif -.endif +post-fetch: + @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php -post-patch: - @ ${PATCH} -s -d ${WRKDIR}/php-3.0.3 < ${FILESDIR}/configure.patch +#post-patch: +# @${PATCH} -s -d ${WRKDIR}/php-${PHP3_VER} < ${FILESDIR}/configure.patch pre-configure: - @( cd ${WRKDIR}/php-3.0.3 \ - && ${ECHO_MSG} "===> Configuring for PHP-3.0.3" \ + @( cd ${WRKSRC} \ + && ./configure > /dev/null \ + && cd ${WRKDIR}/php-${PHP3_VER} \ + && ${ECHO_MSG} "===> Configuring for PHP-${PHP3_VER}" \ && CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \ - && ${ECHO_MSG} "===> Building for PHP-3.0.3" \ + && ${ECHO_MSG} "===> Building for PHP-${PHP3_VER}" \ && ${MAKE} install \ - && ${ECHO_MSG} "===> Configuring for Apache-1.3.0" ) -.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql -CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/lib -lmsql -lgd -lm' -.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql -CONFIGURE_ENV+= LIBS='-L${PREFIX}/lib/mysql -L${PREFIX}/lib -lmysqlclient -lm -lgd' -.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql -CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm' -.endif + && ${ECHO_MSG} "===> Configuring for Apache-${APACHE_VER}" ) post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ @@ -121,13 +102,36 @@ post-install: find ${APACHEDOCDIR} -type d -exec chmod a+rx {} \; ; \ find ${APACHEDOCDIR} -type f -exec chmod a+r {} \; .for i in apache_pb.gif index.html manual - /bin/ln -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i + ${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i .endfor .for i in CODING_STANDARDS EXTENSION_STATUS LICENSE - ${INSTALL_DATA} ${WRKDIR}/php-3.0.3/$i ${PHP3DOCDIR} + ${INSTALL_DATA} ${WRKDIR}/php-${PHP3_VER}/$i ${PHP3DOCDIR} .endfor - @ ${ECHO} "Docs reside in ${APACHEDOCDIR}" - @ ${ECHO} "and in ${PHP3DOCDIR}" + @${ECHO} "Docs reside in ${APACHEDOCDIR}" + @${ECHO} "and in ${PHP3DOCDIR}" .endif +# This was copied from bsd.port.mk because a missing post-clean target +# is needed +clean: +.if !defined(NOCLEANDEPENDS) + @${MAKE} clean-depends +.endif + @${ECHO_MSG} "===> Cleaning for ${PKGNAME}" +.if !defined(NO_WRKDIR) + @if [ -d ${WRKDIR} ]; then \ + if [ -w ${WRKDIR} ]; then \ + ${RM} -rf ${WRKDIR}; \ + else \ + ${ECHO_MSG} "===> ${WRKDIR} not writable, skipping"; \ + fi; \ + fi +.else + @${RM} -f ${WRKDIR}/.*_done ${TMPPLIST} +.endif + @${RM} -f Makefile.inc + +.if exists(Makefile.inc) +.include "Makefile.inc" +.endif .include diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo index 20a28b9bd72b..a7bf61f78029 100644 --- a/www/mod_php4/distinfo +++ b/www/mod_php4/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308 +MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 MD5 (php-3.0.3.tar.gz) = 11c2b1b24642d097efea40e9ce787917 diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist index b5ef7df2c205..c4b715f57c49 100644 --- a/www/mod_php4/pkg-plist +++ b/www/mod_php4/pkg-plist @@ -1,15 +1,23 @@ bin/dbmmanage bin/htdigest bin/htpasswd +etc/apache/access.conf etc/apache/access.conf.default +etc/apache/httpd.conf etc/apache/httpd.conf.default +etc/apache/magic etc/apache/magic.default +etc/apache/mime.types etc/apache/mime.types.default +etc/apache/srm.conf etc/apache/srm.conf.default etc/rc.d/apache.sh include/apache/alloc.h include/apache/ap.h +include/apache/ap_compat.h include/apache/ap_config.h +include/apache/ap_config_auto.h +include/apache/ap_ctype.h include/apache/ap_md5.h include/apache/buff.h include/apache/compat.h @@ -185,8 +193,6 @@ share/doc/php3/EXTENSION_STATUS share/doc/php3/LICENSE www/cgi-bin/printenv www/cgi-bin/test-cgi -www/data/apache_pb.gif -www/data/index.html www/icons/README www/icons/a.gif www/icons/alert.black.gif @@ -263,7 +269,6 @@ www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif -@unexec [ -h %D/www/data/manual ] && rm %D/www/data/manual @dirrm etc/apache @dirrm include/apache @dirrm libexec/apache @@ -274,6 +279,9 @@ www/icons/world2.gif @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm share/doc/php3 +www/data/apache_pb.gif +www/data/index.html +www/data/manual @dirrm www/cgi-bin @dirrm www/data @dirrm www/icons diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php new file mode 100644 index 000000000000..9bf8e6600213 --- /dev/null +++ b/www/mod_php4/scripts/configure.php @@ -0,0 +1,62 @@ +#!/bin/sh + +if [ -f ${CURDIR}/Makefile.inc ]; then + exit +fi + +/usr/bin/dialog --title "PHP configuration options" --clear \ + --checklist "\n\ +Please select desired options:" -1 -1 9 \ +GD "GD library support" ON \ +zlib "zlib library support" ON \ +MySQL "MySQL database support" ON \ +PostgresSQL "PostgresSQL database support" OFF \ +mSQL "mSQL database support" OFF \ +dBase "dBase database support" OFF 2> /tmp/checklist.tmp.$$ + +retval=$? + +if [ -s /tmp/checklist.tmp.$$ ]; then + set `cat /tmp/checklist.tmp.$$` +fi +rm -f /tmp/checklist.tmp.$$ + +case $retval in + 0) if [ -z "$*" ]; then + echo "Nothing selected" + fi + ;; + 1) echo "Cancel pressed." + exit 1 + ;; +esac + +> ${CURDIR}/Makefile.inc + +while [ "$1" ]; do + case $1 in + \"GD\") + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-gd" >> ${CURDIR}/Makefile.inc + ;; + \"zlib\") + echo "PHP3_CONF_ARGS+= --with-zlib" >> ${CURDIR}/Makefile.inc + ;; + \"MySQL\") + echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${CURDIR}/Makefile.inc + ;; + \"PostgresSQL\") + echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${CURDIR}/Makefile.inc + ;; + \"mSQL\") + echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${CURDIR}/Makefile.inc + ;; + \"dBase\") + echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc + ;; + esac + shift +done diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index 2aded1f26d95..56ff8bf8961a 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -1,24 +1,27 @@ # New ports collection makefile for: apache HTTPD / php3 -# Version required: 1.3.0 / 3.0.3 +# Version required: 1.3.1 / 3.0.3 # Date created: So 21 Jun 1998 16:09:39 CEST # Whom: Stefan Herrmann # # $Id: Makefile,v 1.50 1998/08/27 14:08:20 kuriyama Exp $ # -DISTNAME= apache_1.3.0 -PKGNAME= apache-php3.0.3-1.3.0 +DISTNAME= apache_${APACHE_VER} +PKGNAME= apache-php${PHP3_VER}-${APACHE_VER} CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ \ http://www.php.net/distributions/ -DISTFILES= apache_1.3.0.tar.gz php-3.0.3.tar.gz +DISTFILES= apache_${APACHE_VER}.tar.gz php-${PHP3_VER}.tar.gz -MAINTAINER= stefan@asterix.webaffairs.net +MAINTAINER= ibex@physik.TU-Berlin.DE -BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \ - perl5:${PORTSDIR}/lang/perl5 +APACHE_VER= 1.3.1 +PHP3_VER= 3.0.3 -NO_PACKAGE= "Support for different databases via make-variable" +#USE_PERL5= yes + +IS_INTERACTIVE= yes +NO_PACKAGE= Support for different databases # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance @@ -50,7 +53,7 @@ OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations .endif -CONFIGURE_ENV= OPTIM='${OPTIM}' +CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib' MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1 MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8 @@ -60,47 +63,25 @@ PHP3DOCDIR= ${PREFIX}/share/doc/php3 PHP3_CONF_ARGS= --prefix=${PREFIX} \ --with-system-regex \ - --with-gd \ --with-apache=${WRKSRC} \ --with-config-file-path=${PREFIX}/lib \ --disable-debug -.if !defined(PHP3_DBTYPE) || ${PHP3_DBTYPE} != msql && ${PHP3_DBTYPE} != mysql && ${PHP3_DBTYPE} != pgsql -pre-fetch: - @ ${ECHO} - @ ${ECHO} "You must set variable PHP3_DBTYPE to msql, mysql or pgsql by typing" - @ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]" - @ ${FALSE} -.elif defined(PHP3_DBTYPE) -.if ${PHP3_DBTYPE} == msql -BUILD_DEPENDS+= msql:${PORTSDIR}/databases/msql -PHP3_CONF_ARGS+= --with-msql=${PREFIX} -.elif ${PHP3_DBTYPE} == mysql -BUILD_DEPENDS+= mysql:${PORTSDIR}/databases/mysql -PHP3_CONF_ARGS+= --with-mysql=${PREFIX} -.elif ${PHP3_DBTYPE} == pgsql -BUILD_DEPENDS+= ${PREFIX}/pgsql/bin/psql:${PORTSDIR}/databases/postgresql -PHP3_CONF_ARGS+= --with-pgsql=${PREFIX}/pgsql -.endif -.endif +post-fetch: + @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php -post-patch: - @ ${PATCH} -s -d ${WRKDIR}/php-3.0.3 < ${FILESDIR}/configure.patch +#post-patch: +# @${PATCH} -s -d ${WRKDIR}/php-${PHP3_VER} < ${FILESDIR}/configure.patch pre-configure: - @( cd ${WRKDIR}/php-3.0.3 \ - && ${ECHO_MSG} "===> Configuring for PHP-3.0.3" \ + @( cd ${WRKSRC} \ + && ./configure > /dev/null \ + && cd ${WRKDIR}/php-${PHP3_VER} \ + && ${ECHO_MSG} "===> Configuring for PHP-${PHP3_VER}" \ && CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \ - && ${ECHO_MSG} "===> Building for PHP-3.0.3" \ + && ${ECHO_MSG} "===> Building for PHP-${PHP3_VER}" \ && ${MAKE} install \ - && ${ECHO_MSG} "===> Configuring for Apache-1.3.0" ) -.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql -CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/lib -lmsql -lgd -lm' -.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql -CONFIGURE_ENV+= LIBS='-L${PREFIX}/lib/mysql -L${PREFIX}/lib -lmysqlclient -lm -lgd' -.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql -CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm' -.endif + && ${ECHO_MSG} "===> Configuring for Apache-${APACHE_VER}" ) post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ @@ -121,13 +102,36 @@ post-install: find ${APACHEDOCDIR} -type d -exec chmod a+rx {} \; ; \ find ${APACHEDOCDIR} -type f -exec chmod a+r {} \; .for i in apache_pb.gif index.html manual - /bin/ln -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i + ${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i .endfor .for i in CODING_STANDARDS EXTENSION_STATUS LICENSE - ${INSTALL_DATA} ${WRKDIR}/php-3.0.3/$i ${PHP3DOCDIR} + ${INSTALL_DATA} ${WRKDIR}/php-${PHP3_VER}/$i ${PHP3DOCDIR} .endfor - @ ${ECHO} "Docs reside in ${APACHEDOCDIR}" - @ ${ECHO} "and in ${PHP3DOCDIR}" + @${ECHO} "Docs reside in ${APACHEDOCDIR}" + @${ECHO} "and in ${PHP3DOCDIR}" .endif +# This was copied from bsd.port.mk because a missing post-clean target +# is needed +clean: +.if !defined(NOCLEANDEPENDS) + @${MAKE} clean-depends +.endif + @${ECHO_MSG} "===> Cleaning for ${PKGNAME}" +.if !defined(NO_WRKDIR) + @if [ -d ${WRKDIR} ]; then \ + if [ -w ${WRKDIR} ]; then \ + ${RM} -rf ${WRKDIR}; \ + else \ + ${ECHO_MSG} "===> ${WRKDIR} not writable, skipping"; \ + fi; \ + fi +.else + @${RM} -f ${WRKDIR}/.*_done ${TMPPLIST} +.endif + @${RM} -f Makefile.inc + +.if exists(Makefile.inc) +.include "Makefile.inc" +.endif .include diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo index 20a28b9bd72b..a7bf61f78029 100644 --- a/www/mod_php5/distinfo +++ b/www/mod_php5/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308 +MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 MD5 (php-3.0.3.tar.gz) = 11c2b1b24642d097efea40e9ce787917 diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist index b5ef7df2c205..c4b715f57c49 100644 --- a/www/mod_php5/pkg-plist +++ b/www/mod_php5/pkg-plist @@ -1,15 +1,23 @@ bin/dbmmanage bin/htdigest bin/htpasswd +etc/apache/access.conf etc/apache/access.conf.default +etc/apache/httpd.conf etc/apache/httpd.conf.default +etc/apache/magic etc/apache/magic.default +etc/apache/mime.types etc/apache/mime.types.default +etc/apache/srm.conf etc/apache/srm.conf.default etc/rc.d/apache.sh include/apache/alloc.h include/apache/ap.h +include/apache/ap_compat.h include/apache/ap_config.h +include/apache/ap_config_auto.h +include/apache/ap_ctype.h include/apache/ap_md5.h include/apache/buff.h include/apache/compat.h @@ -185,8 +193,6 @@ share/doc/php3/EXTENSION_STATUS share/doc/php3/LICENSE www/cgi-bin/printenv www/cgi-bin/test-cgi -www/data/apache_pb.gif -www/data/index.html www/icons/README www/icons/a.gif www/icons/alert.black.gif @@ -263,7 +269,6 @@ www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif -@unexec [ -h %D/www/data/manual ] && rm %D/www/data/manual @dirrm etc/apache @dirrm include/apache @dirrm libexec/apache @@ -274,6 +279,9 @@ www/icons/world2.gif @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm share/doc/php3 +www/data/apache_pb.gif +www/data/index.html +www/data/manual @dirrm www/cgi-bin @dirrm www/data @dirrm www/icons diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php new file mode 100644 index 000000000000..9bf8e6600213 --- /dev/null +++ b/www/mod_php5/scripts/configure.php @@ -0,0 +1,62 @@ +#!/bin/sh + +if [ -f ${CURDIR}/Makefile.inc ]; then + exit +fi + +/usr/bin/dialog --title "PHP configuration options" --clear \ + --checklist "\n\ +Please select desired options:" -1 -1 9 \ +GD "GD library support" ON \ +zlib "zlib library support" ON \ +MySQL "MySQL database support" ON \ +PostgresSQL "PostgresSQL database support" OFF \ +mSQL "mSQL database support" OFF \ +dBase "dBase database support" OFF 2> /tmp/checklist.tmp.$$ + +retval=$? + +if [ -s /tmp/checklist.tmp.$$ ]; then + set `cat /tmp/checklist.tmp.$$` +fi +rm -f /tmp/checklist.tmp.$$ + +case $retval in + 0) if [ -z "$*" ]; then + echo "Nothing selected" + fi + ;; + 1) echo "Cancel pressed." + exit 1 + ;; +esac + +> ${CURDIR}/Makefile.inc + +while [ "$1" ]; do + case $1 in + \"GD\") + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-gd" >> ${CURDIR}/Makefile.inc + ;; + \"zlib\") + echo "PHP3_CONF_ARGS+= --with-zlib" >> ${CURDIR}/Makefile.inc + ;; + \"MySQL\") + echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${CURDIR}/Makefile.inc + ;; + \"PostgresSQL\") + echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${CURDIR}/Makefile.inc + ;; + \"mSQL\") + echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${CURDIR}/Makefile.inc + echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${CURDIR}/Makefile.inc + ;; + \"dBase\") + echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc + ;; + esac + shift +done -- cgit v1.2.3