From b98bb912e63b7f8b059fc567fe7fce4a7cea7057 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Mon, 16 Aug 1999 18:41:13 +0000 Subject: s/PHP3/PHP/g; s/php3/php/g; whereever appropriate. This was done in preparation for a repository copy to apache13-php4 to keep the diffs between apache13-php3 and apache13-php4 as small as possible. --- www/mod_php3/Makefile | 36 +++++++++--------- www/mod_php3/files/patch-aq | 4 +- www/mod_php3/pkg-comment | 2 +- www/mod_php3/pkg-descr | 8 ++-- www/mod_php3/pkg-plist | 6 +-- www/mod_php3/scripts/configure.php | 76 +++++++++++++++++++------------------- www/mod_php4/Makefile | 36 +++++++++--------- www/mod_php4/pkg-comment | 2 +- www/mod_php4/pkg-descr | 8 ++-- www/mod_php4/pkg-plist | 6 +-- www/mod_php4/scripts/configure.php | 76 +++++++++++++++++++------------------- www/mod_php5/Makefile | 36 +++++++++--------- www/mod_php5/pkg-comment | 2 +- www/mod_php5/pkg-descr | 8 ++-- www/mod_php5/pkg-plist | 6 +-- www/mod_php5/scripts/configure.php | 76 +++++++++++++++++++------------------- 16 files changed, 194 insertions(+), 194 deletions(-) (limited to 'www') diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile index 3b2b5adf17b7..3600db3f800d 100644 --- a/www/mod_php3/Makefile +++ b/www/mod_php3/Makefile @@ -1,13 +1,13 @@ -# New ports collection makefile for: apache HTTPD / php3 +# New ports collection makefile for: Apache / PHP # Version required: 1.3* / 3.0* # Date created: So 21 Jun 1998 16:09:39 CEST # Whom: Stefan Herrmann # -# $Id: Makefile,v 1.82 1999/07/30 21:06:59 dirk Exp $ +# $Id: Makefile,v 1.83 1999/08/10 16:07:26 dirk Exp $ # DISTNAME= apache_${VERSION_APACHE} -PKGNAME= apache+php3-${VERSION_APACHE}+${VERSION_PHP3} +PKGNAME= apache+php-${VERSION_APACHE}+${VERSION_PHP} CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ http://www.rge.com/pub/infosystems/apache/dist/ \ @@ -29,14 +29,14 @@ MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ -DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz +DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz -MAINTAINER= dirk@FreeBSD.ORG +MAINTAINER= dirk@FreeBSD.org Y2K= http://www.php.net/y2k.php3 VERSION_APACHE= 1.3.6 -VERSION_PHP3= 3.0.12 +VERSION_PHP= 3.0.12 USE_PERL5= yes HAS_CONFIGURE= yes @@ -80,9 +80,9 @@ MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apache.8 apachectl.8 apxs.8 logresolve.8 rotatelogs.8 APACHEDOCDIR= ${PREFIX}/share/doc/apache -PHP3DOCDIR= ${PREFIX}/share/doc/php3 +PHPDOCDIR= ${PREFIX}/share/doc/php -PHP3_CONF_ARGS= --prefix=${PREFIX} \ +PHP_CONF_ARGS= --prefix=${PREFIX} \ ${CONFIGURE_TARGET} \ --with-system-regex \ --with-apache=${WRKSRC} \ @@ -96,19 +96,19 @@ pre-fetch: .endif post-extract: - @${LN} -s php-${VERSION_PHP3} ${WRKDIR}/php3 + @${LN} -s php-${VERSION_PHP} ${WRKDIR}/php pre-configure: @cd ${WRKSRC} \ && ./configure > /dev/null \ - && cd ${WRKDIR}/php-${VERSION_PHP3} \ - && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP3}" \ + && cd ${WRKDIR}/php-${VERSION_PHP} \ + && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP}" \ && CC="${CC}" \ CFLAGS="${CFLAGS}" \ CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" \ LDFLAGS=-L${PREFIX}/lib \ - ./configure ${PHP3_CONF_ARGS} \ - && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP3}" \ + ./configure ${PHP_CONF_ARGS} \ + && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP}" \ && ${MAKE} install \ && ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}" @@ -120,21 +120,21 @@ post-install: ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/php3.ini-dist ${PREFIX}/etc + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/php3.ini-dist ${PREFIX}/etc .for i in php2 php3 phpi phps - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/share/apache/icons + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/extra/icons/$i.gif ${PREFIX}/share/apache/icons .endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR} + ${MKDIR} ${APACHEDOCDIR} ${PHPDOCDIR} .for i in README LICENSE ABOUT_APACHE ${INSTALL_DATA} ${WRKSRC}/$i ${APACHEDOCDIR} .endfor .for i in CODING_STANDARDS LICENSE - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/$i ${PHP3DOCDIR} + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/$i ${PHPDOCDIR} .endfor @${ECHO} "Docs reside in ${APACHEDOCDIR}" - @${ECHO} "and in ${PHP3DOCDIR}" + @${ECHO} "and in ${PHPDOCDIR}" .endif # This was copied from bsd.port.mk because a missing post-clean target diff --git a/www/mod_php3/files/patch-aq b/www/mod_php3/files/patch-aq index 64d9664c813c..82a0bdbbcfb8 100644 --- a/www/mod_php3/files/patch-aq +++ b/www/mod_php3/files/patch-aq @@ -1,5 +1,5 @@ ---- ../php3/configure.orig Wed Jul 28 19:07:49 1999 -+++ ../php3/configure Fri Jul 30 17:55:10 1999 +--- ../php/configure.orig Wed Jul 28 19:07:49 1999 ++++ ../php/configure Fri Jul 30 17:55:10 1999 @@ -5072,29 +5072,9 @@ if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "LIBPATH$unique=set" diff --git a/www/mod_php3/pkg-comment b/www/mod_php3/pkg-comment index a46b53a66014..2dd31d751a55 100644 --- a/www/mod_php3/pkg-comment +++ b/www/mod_php3/pkg-comment @@ -1 +1 @@ -Apache http server with database support via compiled in PHP3 module +Apache http server with database support via compiled in PHP module diff --git a/www/mod_php3/pkg-descr b/www/mod_php3/pkg-descr index 80ee014287cc..77d714015a70 100644 --- a/www/mod_php3/pkg-descr +++ b/www/mod_php3/pkg-descr @@ -1,5 +1,5 @@ -Apache 1.3 + PHP3 -================= +Apache 1.3 + PHP +================ Apache is an HTTP server designed as a plug-in replacement for the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in the @@ -7,7 +7,7 @@ NCSA server and includes many frequently requested new features, and has an API which allows it to be extended to meet users' needs more easily. -This version has PHP3 compiled in. PHP3 is a server-side, cross-platform, +This version has PHP compiled in. PHP is a server-side, cross-platform, HTML embedded scripting language which offers easy database integration. SSL support (mod_ssl + OpenSSL) is available as an option. @@ -15,6 +15,6 @@ Documentation ============= Apache: http://www.apache.org/ -PHP3: http://www.php.net/ +PHP: http://www.php.net/ mod_ssl: http://www.modssl.org/ OpenSSL: http://www.openssl.org/ diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist index 7810d9da701b..fa9eb38c83d0 100644 --- a/www/mod_php3/pkg-plist +++ b/www/mod_php3/pkg-plist @@ -323,8 +323,8 @@ share/apache/icons/world2.gif share/doc/apache/ABOUT_APACHE share/doc/apache/LICENSE share/doc/apache/README -share/doc/php3/CODING_STANDARDS -share/doc/php3/LICENSE +share/doc/php/CODING_STANDARDS +share/doc/php/LICENSE @dirrm etc/apache @dirrm include/apache @dirrm libexec/apache @@ -340,4 +340,4 @@ share/doc/php3/LICENSE @dirrm share/apache/icons @dirrm share/apache @dirrm share/doc/apache -@dirrm share/doc/php3 +@dirrm share/doc/php diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php index 692ca50d4430..98819c3f86eb 100644 --- a/www/mod_php3/scripts/configure.php +++ b/www/mod_php3/scripts/configure.php @@ -9,18 +9,18 @@ fi Please select desired options:" -1 -1 14 \ tuning "Apache: performance tuning" OFF \ modssl "Apache: SSL support" OFF \ -GD "PHP3: GD library support" OFF \ -FreeType "PHP3: TrueType font rendering (implies GD)" OFF \ -zlib "PHP3: zlib library support" ON \ -mcrypt "PHP3: Encryption support" OFF \ -mhash "PHP3: Crypto-hashing support" OFF \ -pdflib "PHP3: pdflib support (implies zlib)" OFF \ -IMAP "PHP3: IMAP support" OFF \ -MySQL "PHP3: MySQL database support" ON \ -PostgreSQL "PHP3: PostgreSQL database support" OFF \ -mSQL "PHP3: mSQL database support" OFF \ -dBase "PHP3: dBase database support" OFF \ -OpenLDAP "PHP3: OpenLDAP support" 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 \ +pdflib "PHP: pdflib support (implies zlib)" OFF \ +IMAP "PHP: IMAP support" OFF \ +MySQL "PHP: MySQL database support" ON \ +PostgreSQL "PHP: PostgreSQL database support" OFF \ +mSQL "PHP: mSQL database support" OFF \ +dBase "PHP: dBase database support" OFF \ +OpenLDAP "PHP: OpenLDAP support" OFF \ 2> /tmp/checklist.tmp.$$ retval=$? @@ -49,65 +49,65 @@ while [ "$1" ]; do echo "APACHE_PERF_TUNING= YES" ;; \"GD\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" - echo "PHP3_CONF_ARGS+= --with-gd=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" + echo "PHP_CONF_ARGS+= --with-gd=\${PREFIX}" GD=1 ;; \"FreeType\") - echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" - echo "PHP3_CONF_ARGS+= --with-ttf=\${PREFIX}" + echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" + echo "PHP_CONF_ARGS+= --with-ttf=\${PREFIX}" if [ -z "$GD" ]; then set $* \"GD\" fi ;; \"zlib\") - echo "PHP3_CONF_ARGS+= --with-zlib" + echo "PHP_CONF_ARGS+= --with-zlib" ZLIB=1 ;; \"mcrypt\") - echo "LIB_DEPENDS+= mcrypt.2:\${PORTSDIR}/security/libmcrypt" - echo "PHP3_CONF_ARGS+= --with-mcrypt=\${PREFIX}" + echo "LIB_DEPENDS+= mcrypt.2:\${PORTSDIR}/security/libmcrypt" + echo "PHP_CONF_ARGS+= --with-mcrypt=\${PREFIX}" ;; \"mhash\") - echo "LIB_DEPENDS+= mhash.1:\${PORTSDIR}/security/mhash" - echo "PHP3_CONF_ARGS+= --with-mhash=\${PREFIX}" + echo "LIB_DEPENDS+= mhash.1:\${PORTSDIR}/security/mhash" + echo "PHP_CONF_ARGS+= --with-mhash=\${PREFIX}" ;; \"pdflib\") - echo "LIB_DEPENDS+= pdf.2:\${PORTSDIR}/print/pdflib" - echo "PHP3_CONF_ARGS+= --with-pdflib=\${PREFIX} \\" - echo " --with-jpeg-dir=\${PREFIX} \\" - echo " --with-tiff-dir=\${PREFIX}" + echo "LIB_DEPENDS+= pdf.2:\${PORTSDIR}/print/pdflib" + echo "PHP_CONF_ARGS+= --with-pdflib=\${PREFIX} \\" + echo " --with-jpeg-dir=\${PREFIX} \\" + echo " --with-tiff-dir=\${PREFIX}" if [ -z "$ZLIB" ]; then set $* \"zlib\" fi ;; \"IMAP\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw" - echo "PHP3_CONF_ARGS+= --with-imap=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw" + echo "PHP_CONF_ARGS+= --with-imap=\${PREFIX}" ;; \"MySQL\") - echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" - echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" + echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" + echo "PHP_CONF_ARGS+= --with-mysql=\${PREFIX}" ;; \"PostgreSQL\") - echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" - echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" + echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" + echo "PHP_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" ;; \"mSQL\") - echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" - echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" + echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" + echo "PHP_CONF_ARGS+= --with-msql=\${PREFIX}" ;; \"dBase\") - echo "PHP3_CONF_ARGS+= --with-dbase" + echo "PHP_CONF_ARGS+= --with-dbase" ;; \"OpenLDAP\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" - echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" - echo "PHP3_CONF_ARGS+= --with-ldap=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" + echo "PHP_CONF_ARGS+= --with-ldap=\${PREFIX}" ;; \"modssl\") cat << EOF -PKGNAME= apache+php3+mod_ssl-\${VERSION_APACHE}+\${VERSION_PHP3}+\${VERSION_MODSSL} +PKGNAME= apache+php+mod_ssl-\${VERSION_APACHE}+\${VERSION_PHP}+\${VERSION_MODSSL} MASTER_SITES+= http://www.modssl.org/source/ \\ ftp://ftp.modssl.org/source/ \\ ftp://ftp.ecrc.net/pub/security/mod_ssl/ \\ diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index 3b2b5adf17b7..3600db3f800d 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -1,13 +1,13 @@ -# New ports collection makefile for: apache HTTPD / php3 +# New ports collection makefile for: Apache / PHP # Version required: 1.3* / 3.0* # Date created: So 21 Jun 1998 16:09:39 CEST # Whom: Stefan Herrmann # -# $Id: Makefile,v 1.82 1999/07/30 21:06:59 dirk Exp $ +# $Id: Makefile,v 1.83 1999/08/10 16:07:26 dirk Exp $ # DISTNAME= apache_${VERSION_APACHE} -PKGNAME= apache+php3-${VERSION_APACHE}+${VERSION_PHP3} +PKGNAME= apache+php-${VERSION_APACHE}+${VERSION_PHP} CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ http://www.rge.com/pub/infosystems/apache/dist/ \ @@ -29,14 +29,14 @@ MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ -DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz +DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz -MAINTAINER= dirk@FreeBSD.ORG +MAINTAINER= dirk@FreeBSD.org Y2K= http://www.php.net/y2k.php3 VERSION_APACHE= 1.3.6 -VERSION_PHP3= 3.0.12 +VERSION_PHP= 3.0.12 USE_PERL5= yes HAS_CONFIGURE= yes @@ -80,9 +80,9 @@ MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apache.8 apachectl.8 apxs.8 logresolve.8 rotatelogs.8 APACHEDOCDIR= ${PREFIX}/share/doc/apache -PHP3DOCDIR= ${PREFIX}/share/doc/php3 +PHPDOCDIR= ${PREFIX}/share/doc/php -PHP3_CONF_ARGS= --prefix=${PREFIX} \ +PHP_CONF_ARGS= --prefix=${PREFIX} \ ${CONFIGURE_TARGET} \ --with-system-regex \ --with-apache=${WRKSRC} \ @@ -96,19 +96,19 @@ pre-fetch: .endif post-extract: - @${LN} -s php-${VERSION_PHP3} ${WRKDIR}/php3 + @${LN} -s php-${VERSION_PHP} ${WRKDIR}/php pre-configure: @cd ${WRKSRC} \ && ./configure > /dev/null \ - && cd ${WRKDIR}/php-${VERSION_PHP3} \ - && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP3}" \ + && cd ${WRKDIR}/php-${VERSION_PHP} \ + && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP}" \ && CC="${CC}" \ CFLAGS="${CFLAGS}" \ CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" \ LDFLAGS=-L${PREFIX}/lib \ - ./configure ${PHP3_CONF_ARGS} \ - && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP3}" \ + ./configure ${PHP_CONF_ARGS} \ + && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP}" \ && ${MAKE} install \ && ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}" @@ -120,21 +120,21 @@ post-install: ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/php3.ini-dist ${PREFIX}/etc + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/php3.ini-dist ${PREFIX}/etc .for i in php2 php3 phpi phps - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/share/apache/icons + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/extra/icons/$i.gif ${PREFIX}/share/apache/icons .endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR} + ${MKDIR} ${APACHEDOCDIR} ${PHPDOCDIR} .for i in README LICENSE ABOUT_APACHE ${INSTALL_DATA} ${WRKSRC}/$i ${APACHEDOCDIR} .endfor .for i in CODING_STANDARDS LICENSE - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/$i ${PHP3DOCDIR} + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/$i ${PHPDOCDIR} .endfor @${ECHO} "Docs reside in ${APACHEDOCDIR}" - @${ECHO} "and in ${PHP3DOCDIR}" + @${ECHO} "and in ${PHPDOCDIR}" .endif # This was copied from bsd.port.mk because a missing post-clean target diff --git a/www/mod_php4/pkg-comment b/www/mod_php4/pkg-comment index a46b53a66014..2dd31d751a55 100644 --- a/www/mod_php4/pkg-comment +++ b/www/mod_php4/pkg-comment @@ -1 +1 @@ -Apache http server with database support via compiled in PHP3 module +Apache http server with database support via compiled in PHP module diff --git a/www/mod_php4/pkg-descr b/www/mod_php4/pkg-descr index 80ee014287cc..77d714015a70 100644 --- a/www/mod_php4/pkg-descr +++ b/www/mod_php4/pkg-descr @@ -1,5 +1,5 @@ -Apache 1.3 + PHP3 -================= +Apache 1.3 + PHP +================ Apache is an HTTP server designed as a plug-in replacement for the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in the @@ -7,7 +7,7 @@ NCSA server and includes many frequently requested new features, and has an API which allows it to be extended to meet users' needs more easily. -This version has PHP3 compiled in. PHP3 is a server-side, cross-platform, +This version has PHP compiled in. PHP is a server-side, cross-platform, HTML embedded scripting language which offers easy database integration. SSL support (mod_ssl + OpenSSL) is available as an option. @@ -15,6 +15,6 @@ Documentation ============= Apache: http://www.apache.org/ -PHP3: http://www.php.net/ +PHP: http://www.php.net/ mod_ssl: http://www.modssl.org/ OpenSSL: http://www.openssl.org/ diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist index 7810d9da701b..fa9eb38c83d0 100644 --- a/www/mod_php4/pkg-plist +++ b/www/mod_php4/pkg-plist @@ -323,8 +323,8 @@ share/apache/icons/world2.gif share/doc/apache/ABOUT_APACHE share/doc/apache/LICENSE share/doc/apache/README -share/doc/php3/CODING_STANDARDS -share/doc/php3/LICENSE +share/doc/php/CODING_STANDARDS +share/doc/php/LICENSE @dirrm etc/apache @dirrm include/apache @dirrm libexec/apache @@ -340,4 +340,4 @@ share/doc/php3/LICENSE @dirrm share/apache/icons @dirrm share/apache @dirrm share/doc/apache -@dirrm share/doc/php3 +@dirrm share/doc/php diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index 692ca50d4430..98819c3f86eb 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -9,18 +9,18 @@ fi Please select desired options:" -1 -1 14 \ tuning "Apache: performance tuning" OFF \ modssl "Apache: SSL support" OFF \ -GD "PHP3: GD library support" OFF \ -FreeType "PHP3: TrueType font rendering (implies GD)" OFF \ -zlib "PHP3: zlib library support" ON \ -mcrypt "PHP3: Encryption support" OFF \ -mhash "PHP3: Crypto-hashing support" OFF \ -pdflib "PHP3: pdflib support (implies zlib)" OFF \ -IMAP "PHP3: IMAP support" OFF \ -MySQL "PHP3: MySQL database support" ON \ -PostgreSQL "PHP3: PostgreSQL database support" OFF \ -mSQL "PHP3: mSQL database support" OFF \ -dBase "PHP3: dBase database support" OFF \ -OpenLDAP "PHP3: OpenLDAP support" 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 \ +pdflib "PHP: pdflib support (implies zlib)" OFF \ +IMAP "PHP: IMAP support" OFF \ +MySQL "PHP: MySQL database support" ON \ +PostgreSQL "PHP: PostgreSQL database support" OFF \ +mSQL "PHP: mSQL database support" OFF \ +dBase "PHP: dBase database support" OFF \ +OpenLDAP "PHP: OpenLDAP support" OFF \ 2> /tmp/checklist.tmp.$$ retval=$? @@ -49,65 +49,65 @@ while [ "$1" ]; do echo "APACHE_PERF_TUNING= YES" ;; \"GD\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" - echo "PHP3_CONF_ARGS+= --with-gd=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" + echo "PHP_CONF_ARGS+= --with-gd=\${PREFIX}" GD=1 ;; \"FreeType\") - echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" - echo "PHP3_CONF_ARGS+= --with-ttf=\${PREFIX}" + echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" + echo "PHP_CONF_ARGS+= --with-ttf=\${PREFIX}" if [ -z "$GD" ]; then set $* \"GD\" fi ;; \"zlib\") - echo "PHP3_CONF_ARGS+= --with-zlib" + echo "PHP_CONF_ARGS+= --with-zlib" ZLIB=1 ;; \"mcrypt\") - echo "LIB_DEPENDS+= mcrypt.2:\${PORTSDIR}/security/libmcrypt" - echo "PHP3_CONF_ARGS+= --with-mcrypt=\${PREFIX}" + echo "LIB_DEPENDS+= mcrypt.2:\${PORTSDIR}/security/libmcrypt" + echo "PHP_CONF_ARGS+= --with-mcrypt=\${PREFIX}" ;; \"mhash\") - echo "LIB_DEPENDS+= mhash.1:\${PORTSDIR}/security/mhash" - echo "PHP3_CONF_ARGS+= --with-mhash=\${PREFIX}" + echo "LIB_DEPENDS+= mhash.1:\${PORTSDIR}/security/mhash" + echo "PHP_CONF_ARGS+= --with-mhash=\${PREFIX}" ;; \"pdflib\") - echo "LIB_DEPENDS+= pdf.2:\${PORTSDIR}/print/pdflib" - echo "PHP3_CONF_ARGS+= --with-pdflib=\${PREFIX} \\" - echo " --with-jpeg-dir=\${PREFIX} \\" - echo " --with-tiff-dir=\${PREFIX}" + echo "LIB_DEPENDS+= pdf.2:\${PORTSDIR}/print/pdflib" + echo "PHP_CONF_ARGS+= --with-pdflib=\${PREFIX} \\" + echo " --with-jpeg-dir=\${PREFIX} \\" + echo " --with-tiff-dir=\${PREFIX}" if [ -z "$ZLIB" ]; then set $* \"zlib\" fi ;; \"IMAP\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw" - echo "PHP3_CONF_ARGS+= --with-imap=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw" + echo "PHP_CONF_ARGS+= --with-imap=\${PREFIX}" ;; \"MySQL\") - echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" - echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" + echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" + echo "PHP_CONF_ARGS+= --with-mysql=\${PREFIX}" ;; \"PostgreSQL\") - echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" - echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" + echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" + echo "PHP_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" ;; \"mSQL\") - echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" - echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" + echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" + echo "PHP_CONF_ARGS+= --with-msql=\${PREFIX}" ;; \"dBase\") - echo "PHP3_CONF_ARGS+= --with-dbase" + echo "PHP_CONF_ARGS+= --with-dbase" ;; \"OpenLDAP\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" - echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" - echo "PHP3_CONF_ARGS+= --with-ldap=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" + echo "PHP_CONF_ARGS+= --with-ldap=\${PREFIX}" ;; \"modssl\") cat << EOF -PKGNAME= apache+php3+mod_ssl-\${VERSION_APACHE}+\${VERSION_PHP3}+\${VERSION_MODSSL} +PKGNAME= apache+php+mod_ssl-\${VERSION_APACHE}+\${VERSION_PHP}+\${VERSION_MODSSL} MASTER_SITES+= http://www.modssl.org/source/ \\ ftp://ftp.modssl.org/source/ \\ ftp://ftp.ecrc.net/pub/security/mod_ssl/ \\ diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index 3b2b5adf17b7..3600db3f800d 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -1,13 +1,13 @@ -# New ports collection makefile for: apache HTTPD / php3 +# New ports collection makefile for: Apache / PHP # Version required: 1.3* / 3.0* # Date created: So 21 Jun 1998 16:09:39 CEST # Whom: Stefan Herrmann # -# $Id: Makefile,v 1.82 1999/07/30 21:06:59 dirk Exp $ +# $Id: Makefile,v 1.83 1999/08/10 16:07:26 dirk Exp $ # DISTNAME= apache_${VERSION_APACHE} -PKGNAME= apache+php3-${VERSION_APACHE}+${VERSION_PHP3} +PKGNAME= apache+php-${VERSION_APACHE}+${VERSION_PHP} CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ http://www.rge.com/pub/infosystems/apache/dist/ \ @@ -29,14 +29,14 @@ MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ -DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz +DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz -MAINTAINER= dirk@FreeBSD.ORG +MAINTAINER= dirk@FreeBSD.org Y2K= http://www.php.net/y2k.php3 VERSION_APACHE= 1.3.6 -VERSION_PHP3= 3.0.12 +VERSION_PHP= 3.0.12 USE_PERL5= yes HAS_CONFIGURE= yes @@ -80,9 +80,9 @@ MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apache.8 apachectl.8 apxs.8 logresolve.8 rotatelogs.8 APACHEDOCDIR= ${PREFIX}/share/doc/apache -PHP3DOCDIR= ${PREFIX}/share/doc/php3 +PHPDOCDIR= ${PREFIX}/share/doc/php -PHP3_CONF_ARGS= --prefix=${PREFIX} \ +PHP_CONF_ARGS= --prefix=${PREFIX} \ ${CONFIGURE_TARGET} \ --with-system-regex \ --with-apache=${WRKSRC} \ @@ -96,19 +96,19 @@ pre-fetch: .endif post-extract: - @${LN} -s php-${VERSION_PHP3} ${WRKDIR}/php3 + @${LN} -s php-${VERSION_PHP} ${WRKDIR}/php pre-configure: @cd ${WRKSRC} \ && ./configure > /dev/null \ - && cd ${WRKDIR}/php-${VERSION_PHP3} \ - && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP3}" \ + && cd ${WRKDIR}/php-${VERSION_PHP} \ + && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP}" \ && CC="${CC}" \ CFLAGS="${CFLAGS}" \ CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" \ LDFLAGS=-L${PREFIX}/lib \ - ./configure ${PHP3_CONF_ARGS} \ - && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP3}" \ + ./configure ${PHP_CONF_ARGS} \ + && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP}" \ && ${MAKE} install \ && ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}" @@ -120,21 +120,21 @@ post-install: ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/php3.ini-dist ${PREFIX}/etc + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/php3.ini-dist ${PREFIX}/etc .for i in php2 php3 phpi phps - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/share/apache/icons + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/extra/icons/$i.gif ${PREFIX}/share/apache/icons .endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR} + ${MKDIR} ${APACHEDOCDIR} ${PHPDOCDIR} .for i in README LICENSE ABOUT_APACHE ${INSTALL_DATA} ${WRKSRC}/$i ${APACHEDOCDIR} .endfor .for i in CODING_STANDARDS LICENSE - ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/$i ${PHP3DOCDIR} + ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/$i ${PHPDOCDIR} .endfor @${ECHO} "Docs reside in ${APACHEDOCDIR}" - @${ECHO} "and in ${PHP3DOCDIR}" + @${ECHO} "and in ${PHPDOCDIR}" .endif # This was copied from bsd.port.mk because a missing post-clean target diff --git a/www/mod_php5/pkg-comment b/www/mod_php5/pkg-comment index a46b53a66014..2dd31d751a55 100644 --- a/www/mod_php5/pkg-comment +++ b/www/mod_php5/pkg-comment @@ -1 +1 @@ -Apache http server with database support via compiled in PHP3 module +Apache http server with database support via compiled in PHP module diff --git a/www/mod_php5/pkg-descr b/www/mod_php5/pkg-descr index 80ee014287cc..77d714015a70 100644 --- a/www/mod_php5/pkg-descr +++ b/www/mod_php5/pkg-descr @@ -1,5 +1,5 @@ -Apache 1.3 + PHP3 -================= +Apache 1.3 + PHP +================ Apache is an HTTP server designed as a plug-in replacement for the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in the @@ -7,7 +7,7 @@ NCSA server and includes many frequently requested new features, and has an API which allows it to be extended to meet users' needs more easily. -This version has PHP3 compiled in. PHP3 is a server-side, cross-platform, +This version has PHP compiled in. PHP is a server-side, cross-platform, HTML embedded scripting language which offers easy database integration. SSL support (mod_ssl + OpenSSL) is available as an option. @@ -15,6 +15,6 @@ Documentation ============= Apache: http://www.apache.org/ -PHP3: http://www.php.net/ +PHP: http://www.php.net/ mod_ssl: http://www.modssl.org/ OpenSSL: http://www.openssl.org/ diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist index 7810d9da701b..fa9eb38c83d0 100644 --- a/www/mod_php5/pkg-plist +++ b/www/mod_php5/pkg-plist @@ -323,8 +323,8 @@ share/apache/icons/world2.gif share/doc/apache/ABOUT_APACHE share/doc/apache/LICENSE share/doc/apache/README -share/doc/php3/CODING_STANDARDS -share/doc/php3/LICENSE +share/doc/php/CODING_STANDARDS +share/doc/php/LICENSE @dirrm etc/apache @dirrm include/apache @dirrm libexec/apache @@ -340,4 +340,4 @@ share/doc/php3/LICENSE @dirrm share/apache/icons @dirrm share/apache @dirrm share/doc/apache -@dirrm share/doc/php3 +@dirrm share/doc/php diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index 692ca50d4430..98819c3f86eb 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -9,18 +9,18 @@ fi Please select desired options:" -1 -1 14 \ tuning "Apache: performance tuning" OFF \ modssl "Apache: SSL support" OFF \ -GD "PHP3: GD library support" OFF \ -FreeType "PHP3: TrueType font rendering (implies GD)" OFF \ -zlib "PHP3: zlib library support" ON \ -mcrypt "PHP3: Encryption support" OFF \ -mhash "PHP3: Crypto-hashing support" OFF \ -pdflib "PHP3: pdflib support (implies zlib)" OFF \ -IMAP "PHP3: IMAP support" OFF \ -MySQL "PHP3: MySQL database support" ON \ -PostgreSQL "PHP3: PostgreSQL database support" OFF \ -mSQL "PHP3: mSQL database support" OFF \ -dBase "PHP3: dBase database support" OFF \ -OpenLDAP "PHP3: OpenLDAP support" 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 \ +pdflib "PHP: pdflib support (implies zlib)" OFF \ +IMAP "PHP: IMAP support" OFF \ +MySQL "PHP: MySQL database support" ON \ +PostgreSQL "PHP: PostgreSQL database support" OFF \ +mSQL "PHP: mSQL database support" OFF \ +dBase "PHP: dBase database support" OFF \ +OpenLDAP "PHP: OpenLDAP support" OFF \ 2> /tmp/checklist.tmp.$$ retval=$? @@ -49,65 +49,65 @@ while [ "$1" ]; do echo "APACHE_PERF_TUNING= YES" ;; \"GD\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" - echo "PHP3_CONF_ARGS+= --with-gd=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" + echo "PHP_CONF_ARGS+= --with-gd=\${PREFIX}" GD=1 ;; \"FreeType\") - echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" - echo "PHP3_CONF_ARGS+= --with-ttf=\${PREFIX}" + echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" + echo "PHP_CONF_ARGS+= --with-ttf=\${PREFIX}" if [ -z "$GD" ]; then set $* \"GD\" fi ;; \"zlib\") - echo "PHP3_CONF_ARGS+= --with-zlib" + echo "PHP_CONF_ARGS+= --with-zlib" ZLIB=1 ;; \"mcrypt\") - echo "LIB_DEPENDS+= mcrypt.2:\${PORTSDIR}/security/libmcrypt" - echo "PHP3_CONF_ARGS+= --with-mcrypt=\${PREFIX}" + echo "LIB_DEPENDS+= mcrypt.2:\${PORTSDIR}/security/libmcrypt" + echo "PHP_CONF_ARGS+= --with-mcrypt=\${PREFIX}" ;; \"mhash\") - echo "LIB_DEPENDS+= mhash.1:\${PORTSDIR}/security/mhash" - echo "PHP3_CONF_ARGS+= --with-mhash=\${PREFIX}" + echo "LIB_DEPENDS+= mhash.1:\${PORTSDIR}/security/mhash" + echo "PHP_CONF_ARGS+= --with-mhash=\${PREFIX}" ;; \"pdflib\") - echo "LIB_DEPENDS+= pdf.2:\${PORTSDIR}/print/pdflib" - echo "PHP3_CONF_ARGS+= --with-pdflib=\${PREFIX} \\" - echo " --with-jpeg-dir=\${PREFIX} \\" - echo " --with-tiff-dir=\${PREFIX}" + echo "LIB_DEPENDS+= pdf.2:\${PORTSDIR}/print/pdflib" + echo "PHP_CONF_ARGS+= --with-pdflib=\${PREFIX} \\" + echo " --with-jpeg-dir=\${PREFIX} \\" + echo " --with-tiff-dir=\${PREFIX}" if [ -z "$ZLIB" ]; then set $* \"zlib\" fi ;; \"IMAP\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw" - echo "PHP3_CONF_ARGS+= --with-imap=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw" + echo "PHP_CONF_ARGS+= --with-imap=\${PREFIX}" ;; \"MySQL\") - echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" - echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" + echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" + echo "PHP_CONF_ARGS+= --with-mysql=\${PREFIX}" ;; \"PostgreSQL\") - echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" - echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" + echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" + echo "PHP_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" ;; \"mSQL\") - echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" - echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" + echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" + echo "PHP_CONF_ARGS+= --with-msql=\${PREFIX}" ;; \"dBase\") - echo "PHP3_CONF_ARGS+= --with-dbase" + echo "PHP_CONF_ARGS+= --with-dbase" ;; \"OpenLDAP\") - echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" - echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" - echo "PHP3_CONF_ARGS+= --with-ldap=\${PREFIX}" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" + echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" + echo "PHP_CONF_ARGS+= --with-ldap=\${PREFIX}" ;; \"modssl\") cat << EOF -PKGNAME= apache+php3+mod_ssl-\${VERSION_APACHE}+\${VERSION_PHP3}+\${VERSION_MODSSL} +PKGNAME= apache+php+mod_ssl-\${VERSION_APACHE}+\${VERSION_PHP}+\${VERSION_MODSSL} MASTER_SITES+= http://www.modssl.org/source/ \\ ftp://ftp.modssl.org/source/ \\ ftp://ftp.ecrc.net/pub/security/mod_ssl/ \\ -- cgit v1.2.3