aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/mod_php3/Makefile134
-rw-r--r--www/mod_php3/distinfo2
-rw-r--r--www/mod_php3/pkg-descr7
-rw-r--r--www/mod_php3/pkg-plist125
-rw-r--r--www/mod_php4/Makefile134
-rw-r--r--www/mod_php4/distinfo2
-rw-r--r--www/mod_php4/pkg-descr7
-rw-r--r--www/mod_php4/pkg-plist125
-rw-r--r--www/mod_php5/Makefile134
-rw-r--r--www/mod_php5/distinfo2
-rw-r--r--www/mod_php5/pkg-descr7
-rw-r--r--www/mod_php5/pkg-plist125
12 files changed, 600 insertions, 204 deletions
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 09a291150026..43b3ea5dc85b 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -1,50 +1,75 @@
-# New ports collection makefile for: apache HTTPD / php
-# Version required: 1.2.6 / 3.0
-# Date created: Wed Sep 3 18:28:20 CEST 1997
-# Whom: Andreas Klemm <andreas@klemm.gtn.com>
+# New ports collection makefile for: apache HTTPD / php3
+# Version required: 1.3.0 / 3.0.2
+# Date created: So 21 Jun 1998 16:09:39 CEST
+# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
-# $Id: Makefile,v 1.47 1998/07/11 20:52:36 andreas Exp $
+# $Id$
#
-DISTNAME= apache_1.2.6
-PKGNAME= apache-1.2.6-php3.0.2
+DISTNAME= apache_1.3.0
+PKGNAME= apache-php3.0.2-1.3.0
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.2.tar.gz
+ http://www.php.net/distributions/
+DISTFILES= apache_1.3.0.tar.gz php-3.0.2.tar.gz
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= stefan@asterix.webaffairs.net
BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
- gmake:${PORTSDIR}/devel/gmake \
- ${PREFIX}/include/freetype.h:${PORTSDIR}/print/freetype
+ perl5:${PORTSDIR}/lang/perl5
NO_PACKAGE= "Support for different databases via make-variable"
-MAN1= htpasswd.1
-MAN8= httpd.8
-DOCDIR= ${PREFIX}/share/doc/apache
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= \
+ --sysconfdir=${PREFIX}/etc/apache \
+ --includedir=${PREFIX}/include/apache \
+ --logfiledir=/var/log \
+ --runtimedir=/var/run \
+ --datadir=${PREFIX}/www \
+ --proxycachedir=${PREFIX}/www/proxy \
+ --libexecdir=${PREFIX}/libexec/apache \
+ --enable-shared=remain \
+ --enable-module=most \
+ --enable-module=auth_db \
+ --disable-module=auth_dbm \
+ --with-perl=${PREFIX}/bin/perl5 \
+ --activate-module=src/modules/php3/libphp3.a
-.if defined(PATCH_DEBUG)
-PATCH_DIST_ARGS= -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
.endif
-# Set it for local-supplied patch, f.e.
-VERS_ID = PHP-3.0.2
+CONFIGURE_ENV= OPTIM='${OPTIM}'
+
+MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
+MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8
-PHP3_CONF_ARGS= --prefix=${PREFIX} --with-gd=${PREFIX} \
- --with-system-regex --with-apache=${WRKSRC} \
- --with-config-file-path=${PREFIX}/lib --disable-debug \
- --libdir=${PREFIX}/lib --includedir=${PREFIX}/include
+APACHEDOCDIR= ${PREFIX}/share/doc/apache
+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 && ${PHP3_DBTYPE} != dbase
+.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=[ dbase | msql | mysql | pgsql ]"
+ @ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]"
@ ${FALSE}
.elif defined(PHP3_DBTYPE)
.if ${PHP3_DBTYPE} == msql
@@ -56,53 +81,52 @@ 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
-.elif ${PHP3_DBTYPE} == dbase
-PHP3_CONF_ARGS+= --with-dbase
.endif
.endif
-.if defined(VERS_ID)
post-patch:
- @cd ${WRKSRC}/src && \
- ${MV} Configuration Configuration.old && \
- ${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
- < Configuration.old > Configuration
-.endif
+ @ ${PATCH} -s -d ${WRKDIR}/php-3.0.2 < ${FILESDIR}/configure.patch
pre-configure:
- ( cd ${WRKDIR}/php-3.0.2 \
- && CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS=-I${PREFIX}/include ./configure ${PHP3_CONF_ARGS} \
- && ${GMAKE} install )
- ${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration
+ @( cd ${WRKDIR}/php-3.0.2 \
+ && ${ECHO_MSG} "===> Configuring for PHP-3.0.2" \
+ && CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \
+ && ${ECHO_MSG} "===> Building for PHP-3.0.2" \
+ && ${MAKE} install \
+ && ${ECHO_MSG} "===> Configuring for Apache-1.3.0" )
.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/lib -lmsql -lgd -lm'
.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -I${PREFIX}/include/gd -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-L${PREFIX}/lib/mysql -L${PREFIX}/lib -lmysqlclient -lm -lgd'
.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
-.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == dbase
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a libdbf.a -L${PREFIX}/lib -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm'
.endif
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
- ${SED} 's;PREFIX;${PREFIX};' < ${FILESDIR}/apache.sh.tmpl > \
- ${PREFIX}/etc/rc.d/apache.sh; \
+ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+ ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
fi
-.for i in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man1
-.endfor
-.for i in ${MAN8}
- ${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man8
-.endfor
+
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCDIR}
+ ${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR}
.for i in README LICENSE ABOUT_APACHE
- ${INSTALL_DATA} ${WRKSRC}/$i ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/$i ${APACHEDOCDIR}
+.endfor
+ (cd ${WRKSRC}/htdocs && tar cf - *) |\
+ (cd ${APACHEDOCDIR} && tar xf -); \
+ 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
+.endfor
+.for i in CODING_STANDARDS EXTENSION_STATUS LICENSE
+ ${INSTALL_DATA} ${WRKDIR}/php-3.0.2/$i ${PHP3DOCDIR}
.endfor
- @cd ${WRKSRC}/htdocs; tar cf - . | (cd ${DOCDIR}; tar xf -)
+ @ ${ECHO} "Docs reside in ${APACHEDOCDIR}"
+ @ ${ECHO} "and in ${PHP3DOCDIR}"
.endif
.include <bsd.port.mk>
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index cb2cfe981349..57c7819970bc 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44
+MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308
MD5 (php-3.0.2.tar.gz) = bd47e73a3d300263bafa8781ec766377
diff --git a/www/mod_php3/pkg-descr b/www/mod_php3/pkg-descr
index 84830d32b0b0..efa8baf74d90 100644
--- a/www/mod_php3/pkg-descr
+++ b/www/mod_php3/pkg-descr
@@ -1,9 +1,16 @@
+
+What is it?
+-----------
+
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
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.
+Documentation
+-------------
+
The documentation available as of the date of this release is also
included, in HTML format, in the htdocs/manual/ directory. For the
most up-to-date documentation, visit us on the WWW, at:
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index a02a9383df1d..e79cb19b65a1 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -1,58 +1,123 @@
-etc/apache/access.conf-dist
-etc/apache/httpd.conf-dist
-etc/apache/mime.types-dist
-etc/apache/srm.conf-dist
+bin/dbmmanage
+bin/htdigest
+bin/htpasswd
+etc/apache/access.conf.default
+etc/apache/httpd.conf.default
+etc/apache/magic.default
+etc/apache/mime.types.default
+etc/apache/srm.conf.default
etc/rc.d/apache.sh
+include/apache/alloc.h
+include/apache/ap.h
+include/apache/ap_config.h
+include/apache/ap_md5.h
+include/apache/buff.h
+include/apache/compat.h
+include/apache/conf.h
+include/apache/explain.h
+include/apache/fnmatch.h
+include/apache/hsregex.h
+include/apache/http_conf_globals.h
+include/apache/http_config.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/multithread.h
+include/apache/os.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+include/apache/util_date.h
+include/apache/util_md5.h
+include/apache/util_script.h
+include/apache/util_uri.h
+libexec/apache/libproxy.so
+libexec/apache/mod_auth_anon.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_digest.so
+libexec/apache/mod_expires.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_info.so
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_speling.so
+libexec/apache/mod_status.so
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_usertrack.so
+man/man1/ab.1.gz
+man/man1/apachectl.1.gz
+man/man1/dbmmanage.1.gz
+man/man1/htdigest.1.gz
man/man1/htpasswd.1.gz
+man/man8/apxs.8.gz
man/man8/httpd.8.gz
+man/man8/logresolve.8.gz
+man/man8/rotatelogs.8.gz
+sbin/ab
+sbin/apachectl
+sbin/apxs
sbin/httpd
+sbin/logresolve
+sbin/rotatelogs
share/doc/apache/ABOUT_APACHE
share/doc/apache/LICENSE
share/doc/apache/README
share/doc/apache/apache_pb.gif
share/doc/apache/index.html
share/doc/apache/manual/LICENSE
-share/doc/apache/manual/TODO
share/doc/apache/manual/bind.html
share/doc/apache/manual/cgi_path.html
share/doc/apache/manual/content-negotiation.html
share/doc/apache/manual/custom-error.html
share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/ebcdic.html
share/doc/apache/manual/env.html
share/doc/apache/manual/footer.html
share/doc/apache/manual/handler.html
share/doc/apache/manual/header.html
-share/doc/apache/manual/host.html
+share/doc/apache/manual/images/custom_errordocs.gif
share/doc/apache/manual/images/home.gif
share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/mod_rewrite_fig1.fig
+share/doc/apache/manual/images/mod_rewrite_fig1.gif
+share/doc/apache/manual/images/mod_rewrite_fig2.fig
+share/doc/apache/manual/images/mod_rewrite_fig2.gif
share/doc/apache/manual/images/sub.gif
share/doc/apache/manual/index.html
share/doc/apache/manual/install.html
-share/doc/apache/manual/install_1_1.html
share/doc/apache/manual/invoking.html
share/doc/apache/manual/keepalive.html
share/doc/apache/manual/location.html
share/doc/apache/manual/man-template.html
share/doc/apache/manual/misc/API.html
share/doc/apache/manual/misc/FAQ.html
+share/doc/apache/manual/misc/HTTP_Features.tsv
share/doc/apache/manual/misc/client_block_api.html
share/doc/apache/manual/misc/compat_notes.html
+share/doc/apache/manual/misc/custom_errordocs.html
share/doc/apache/manual/misc/descriptors.html
share/doc/apache/manual/misc/fin_wait_2.html
share/doc/apache/manual/misc/footer.html
share/doc/apache/manual/misc/header.html
share/doc/apache/manual/misc/howto.html
share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_bugs.html
share/doc/apache/manual/misc/known_client_problems.html
share/doc/apache/manual/misc/nopgp.html
share/doc/apache/manual/misc/perf-bsd44.html
share/doc/apache/manual/misc/perf-dec.html
+share/doc/apache/manual/misc/perf-hp.html
+share/doc/apache/manual/misc/perf-tuning.html
share/doc/apache/manual/misc/perf.html
share/doc/apache/manual/misc/security_tips.html
share/doc/apache/manual/misc/vif-info.html
share/doc/apache/manual/misc/windoz_keepalive.html
share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/directive-dict.html
share/doc/apache/manual/mod/directives.html
share/doc/apache/manual/mod/footer.html
share/doc/apache/manual/mod/header.html
@@ -65,7 +130,7 @@ share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_msql.html
+share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
share/doc/apache/manual/mod/mod_cgi.html
@@ -73,6 +138,7 @@ share/doc/apache/manual/mod/mod_cookies.html
share/doc/apache/manual/mod/mod_digest.html
share/doc/apache/manual/mod/mod_dir.html
share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_dll.html
share/doc/apache/manual/mod/mod_env.html
share/doc/apache/manual/mod/mod_example.html
share/doc/apache/manual/mod/mod_expires.html
@@ -80,27 +146,56 @@ share/doc/apache/manual/mod/mod_headers.html
share/doc/apache/manual/mod/mod_imap.html
share/doc/apache/manual/mod/mod_include.html
share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_isapi.html
share/doc/apache/manual/mod/mod_log_agent.html
share/doc/apache/manual/mod/mod_log_common.html
share/doc/apache/manual/mod/mod_log_config.html
share/doc/apache/manual/mod/mod_log_referer.html
share/doc/apache/manual/mod/mod_mime.html
+share/doc/apache/manual/mod/mod_mime_magic.html
+share/doc/apache/manual/mod/mod_mmap_static.html
share/doc/apache/manual/mod/mod_negotiation.html
share/doc/apache/manual/mod/mod_proxy.html
share/doc/apache/manual/mod/mod_rewrite.html
+share/doc/apache/manual/mod/mod_setenvif.html
+share/doc/apache/manual/mod/mod_so.html
+share/doc/apache/manual/mod/mod_speling.html
share/doc/apache/manual/mod/mod_status.html
+share/doc/apache/manual/mod/mod_unique_id.html
share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
share/doc/apache/manual/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/new_features_1_3.html
share/doc/apache/manual/process-model.html
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/sourcereorg.html
share/doc/apache/manual/stopping.html
share/doc/apache/manual/suexec.html
share/doc/apache/manual/unixware.html
-share/doc/apache/manual/vhosts-in-depth.html
-share/doc/apache/manual/virtual-host.html
+share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/vhosts/examples.html
+share/doc/apache/manual/vhosts/fd-limits.html
+share/doc/apache/manual/vhosts/footer.html
+share/doc/apache/manual/vhosts/header.html
+share/doc/apache/manual/vhosts/host.html
+share/doc/apache/manual/vhosts/index.html
+share/doc/apache/manual/vhosts/ip-based.html
+share/doc/apache/manual/vhosts/name-based.html
+share/doc/apache/manual/vhosts/vhosts-in-depth.html
+share/doc/apache/manual/vhosts/virtual-host.html
+share/doc/apache/manual/windows.html
+share/doc/php3/CODING_STANDARDS
+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
@@ -177,13 +272,19 @@ www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif
-@exec mkdir -p %D/www/cgi-bin %D/www/data
+@unexec [ -h %D/www/data/manual ] && rm %D/www/data/manual
+@dirrm etc/apache
+@dirrm include/apache
+@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
@dirrm share/doc/apache/manual/misc
@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/vhosts
@dirrm share/doc/apache/manual
@dirrm share/doc/apache
+@dirrm share/doc/php3
@dirrm www/cgi-bin
@dirrm www/data
@dirrm www/icons
+@dirrm www/proxy
@dirrm www
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 09a291150026..43b3ea5dc85b 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -1,50 +1,75 @@
-# New ports collection makefile for: apache HTTPD / php
-# Version required: 1.2.6 / 3.0
-# Date created: Wed Sep 3 18:28:20 CEST 1997
-# Whom: Andreas Klemm <andreas@klemm.gtn.com>
+# New ports collection makefile for: apache HTTPD / php3
+# Version required: 1.3.0 / 3.0.2
+# Date created: So 21 Jun 1998 16:09:39 CEST
+# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
-# $Id: Makefile,v 1.47 1998/07/11 20:52:36 andreas Exp $
+# $Id$
#
-DISTNAME= apache_1.2.6
-PKGNAME= apache-1.2.6-php3.0.2
+DISTNAME= apache_1.3.0
+PKGNAME= apache-php3.0.2-1.3.0
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.2.tar.gz
+ http://www.php.net/distributions/
+DISTFILES= apache_1.3.0.tar.gz php-3.0.2.tar.gz
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= stefan@asterix.webaffairs.net
BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
- gmake:${PORTSDIR}/devel/gmake \
- ${PREFIX}/include/freetype.h:${PORTSDIR}/print/freetype
+ perl5:${PORTSDIR}/lang/perl5
NO_PACKAGE= "Support for different databases via make-variable"
-MAN1= htpasswd.1
-MAN8= httpd.8
-DOCDIR= ${PREFIX}/share/doc/apache
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= \
+ --sysconfdir=${PREFIX}/etc/apache \
+ --includedir=${PREFIX}/include/apache \
+ --logfiledir=/var/log \
+ --runtimedir=/var/run \
+ --datadir=${PREFIX}/www \
+ --proxycachedir=${PREFIX}/www/proxy \
+ --libexecdir=${PREFIX}/libexec/apache \
+ --enable-shared=remain \
+ --enable-module=most \
+ --enable-module=auth_db \
+ --disable-module=auth_dbm \
+ --with-perl=${PREFIX}/bin/perl5 \
+ --activate-module=src/modules/php3/libphp3.a
-.if defined(PATCH_DEBUG)
-PATCH_DIST_ARGS= -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
.endif
-# Set it for local-supplied patch, f.e.
-VERS_ID = PHP-3.0.2
+CONFIGURE_ENV= OPTIM='${OPTIM}'
+
+MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
+MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8
-PHP3_CONF_ARGS= --prefix=${PREFIX} --with-gd=${PREFIX} \
- --with-system-regex --with-apache=${WRKSRC} \
- --with-config-file-path=${PREFIX}/lib --disable-debug \
- --libdir=${PREFIX}/lib --includedir=${PREFIX}/include
+APACHEDOCDIR= ${PREFIX}/share/doc/apache
+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 && ${PHP3_DBTYPE} != dbase
+.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=[ dbase | msql | mysql | pgsql ]"
+ @ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]"
@ ${FALSE}
.elif defined(PHP3_DBTYPE)
.if ${PHP3_DBTYPE} == msql
@@ -56,53 +81,52 @@ 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
-.elif ${PHP3_DBTYPE} == dbase
-PHP3_CONF_ARGS+= --with-dbase
.endif
.endif
-.if defined(VERS_ID)
post-patch:
- @cd ${WRKSRC}/src && \
- ${MV} Configuration Configuration.old && \
- ${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
- < Configuration.old > Configuration
-.endif
+ @ ${PATCH} -s -d ${WRKDIR}/php-3.0.2 < ${FILESDIR}/configure.patch
pre-configure:
- ( cd ${WRKDIR}/php-3.0.2 \
- && CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS=-I${PREFIX}/include ./configure ${PHP3_CONF_ARGS} \
- && ${GMAKE} install )
- ${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration
+ @( cd ${WRKDIR}/php-3.0.2 \
+ && ${ECHO_MSG} "===> Configuring for PHP-3.0.2" \
+ && CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \
+ && ${ECHO_MSG} "===> Building for PHP-3.0.2" \
+ && ${MAKE} install \
+ && ${ECHO_MSG} "===> Configuring for Apache-1.3.0" )
.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/lib -lmsql -lgd -lm'
.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -I${PREFIX}/include/gd -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-L${PREFIX}/lib/mysql -L${PREFIX}/lib -lmysqlclient -lm -lgd'
.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
-.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == dbase
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a libdbf.a -L${PREFIX}/lib -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm'
.endif
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
- ${SED} 's;PREFIX;${PREFIX};' < ${FILESDIR}/apache.sh.tmpl > \
- ${PREFIX}/etc/rc.d/apache.sh; \
+ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+ ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
fi
-.for i in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man1
-.endfor
-.for i in ${MAN8}
- ${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man8
-.endfor
+
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCDIR}
+ ${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR}
.for i in README LICENSE ABOUT_APACHE
- ${INSTALL_DATA} ${WRKSRC}/$i ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/$i ${APACHEDOCDIR}
+.endfor
+ (cd ${WRKSRC}/htdocs && tar cf - *) |\
+ (cd ${APACHEDOCDIR} && tar xf -); \
+ 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
+.endfor
+.for i in CODING_STANDARDS EXTENSION_STATUS LICENSE
+ ${INSTALL_DATA} ${WRKDIR}/php-3.0.2/$i ${PHP3DOCDIR}
.endfor
- @cd ${WRKSRC}/htdocs; tar cf - . | (cd ${DOCDIR}; tar xf -)
+ @ ${ECHO} "Docs reside in ${APACHEDOCDIR}"
+ @ ${ECHO} "and in ${PHP3DOCDIR}"
.endif
.include <bsd.port.mk>
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index cb2cfe981349..57c7819970bc 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44
+MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308
MD5 (php-3.0.2.tar.gz) = bd47e73a3d300263bafa8781ec766377
diff --git a/www/mod_php4/pkg-descr b/www/mod_php4/pkg-descr
index 84830d32b0b0..efa8baf74d90 100644
--- a/www/mod_php4/pkg-descr
+++ b/www/mod_php4/pkg-descr
@@ -1,9 +1,16 @@
+
+What is it?
+-----------
+
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
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.
+Documentation
+-------------
+
The documentation available as of the date of this release is also
included, in HTML format, in the htdocs/manual/ directory. For the
most up-to-date documentation, visit us on the WWW, at:
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index a02a9383df1d..e79cb19b65a1 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -1,58 +1,123 @@
-etc/apache/access.conf-dist
-etc/apache/httpd.conf-dist
-etc/apache/mime.types-dist
-etc/apache/srm.conf-dist
+bin/dbmmanage
+bin/htdigest
+bin/htpasswd
+etc/apache/access.conf.default
+etc/apache/httpd.conf.default
+etc/apache/magic.default
+etc/apache/mime.types.default
+etc/apache/srm.conf.default
etc/rc.d/apache.sh
+include/apache/alloc.h
+include/apache/ap.h
+include/apache/ap_config.h
+include/apache/ap_md5.h
+include/apache/buff.h
+include/apache/compat.h
+include/apache/conf.h
+include/apache/explain.h
+include/apache/fnmatch.h
+include/apache/hsregex.h
+include/apache/http_conf_globals.h
+include/apache/http_config.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/multithread.h
+include/apache/os.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+include/apache/util_date.h
+include/apache/util_md5.h
+include/apache/util_script.h
+include/apache/util_uri.h
+libexec/apache/libproxy.so
+libexec/apache/mod_auth_anon.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_digest.so
+libexec/apache/mod_expires.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_info.so
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_speling.so
+libexec/apache/mod_status.so
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_usertrack.so
+man/man1/ab.1.gz
+man/man1/apachectl.1.gz
+man/man1/dbmmanage.1.gz
+man/man1/htdigest.1.gz
man/man1/htpasswd.1.gz
+man/man8/apxs.8.gz
man/man8/httpd.8.gz
+man/man8/logresolve.8.gz
+man/man8/rotatelogs.8.gz
+sbin/ab
+sbin/apachectl
+sbin/apxs
sbin/httpd
+sbin/logresolve
+sbin/rotatelogs
share/doc/apache/ABOUT_APACHE
share/doc/apache/LICENSE
share/doc/apache/README
share/doc/apache/apache_pb.gif
share/doc/apache/index.html
share/doc/apache/manual/LICENSE
-share/doc/apache/manual/TODO
share/doc/apache/manual/bind.html
share/doc/apache/manual/cgi_path.html
share/doc/apache/manual/content-negotiation.html
share/doc/apache/manual/custom-error.html
share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/ebcdic.html
share/doc/apache/manual/env.html
share/doc/apache/manual/footer.html
share/doc/apache/manual/handler.html
share/doc/apache/manual/header.html
-share/doc/apache/manual/host.html
+share/doc/apache/manual/images/custom_errordocs.gif
share/doc/apache/manual/images/home.gif
share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/mod_rewrite_fig1.fig
+share/doc/apache/manual/images/mod_rewrite_fig1.gif
+share/doc/apache/manual/images/mod_rewrite_fig2.fig
+share/doc/apache/manual/images/mod_rewrite_fig2.gif
share/doc/apache/manual/images/sub.gif
share/doc/apache/manual/index.html
share/doc/apache/manual/install.html
-share/doc/apache/manual/install_1_1.html
share/doc/apache/manual/invoking.html
share/doc/apache/manual/keepalive.html
share/doc/apache/manual/location.html
share/doc/apache/manual/man-template.html
share/doc/apache/manual/misc/API.html
share/doc/apache/manual/misc/FAQ.html
+share/doc/apache/manual/misc/HTTP_Features.tsv
share/doc/apache/manual/misc/client_block_api.html
share/doc/apache/manual/misc/compat_notes.html
+share/doc/apache/manual/misc/custom_errordocs.html
share/doc/apache/manual/misc/descriptors.html
share/doc/apache/manual/misc/fin_wait_2.html
share/doc/apache/manual/misc/footer.html
share/doc/apache/manual/misc/header.html
share/doc/apache/manual/misc/howto.html
share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_bugs.html
share/doc/apache/manual/misc/known_client_problems.html
share/doc/apache/manual/misc/nopgp.html
share/doc/apache/manual/misc/perf-bsd44.html
share/doc/apache/manual/misc/perf-dec.html
+share/doc/apache/manual/misc/perf-hp.html
+share/doc/apache/manual/misc/perf-tuning.html
share/doc/apache/manual/misc/perf.html
share/doc/apache/manual/misc/security_tips.html
share/doc/apache/manual/misc/vif-info.html
share/doc/apache/manual/misc/windoz_keepalive.html
share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/directive-dict.html
share/doc/apache/manual/mod/directives.html
share/doc/apache/manual/mod/footer.html
share/doc/apache/manual/mod/header.html
@@ -65,7 +130,7 @@ share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_msql.html
+share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
share/doc/apache/manual/mod/mod_cgi.html
@@ -73,6 +138,7 @@ share/doc/apache/manual/mod/mod_cookies.html
share/doc/apache/manual/mod/mod_digest.html
share/doc/apache/manual/mod/mod_dir.html
share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_dll.html
share/doc/apache/manual/mod/mod_env.html
share/doc/apache/manual/mod/mod_example.html
share/doc/apache/manual/mod/mod_expires.html
@@ -80,27 +146,56 @@ share/doc/apache/manual/mod/mod_headers.html
share/doc/apache/manual/mod/mod_imap.html
share/doc/apache/manual/mod/mod_include.html
share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_isapi.html
share/doc/apache/manual/mod/mod_log_agent.html
share/doc/apache/manual/mod/mod_log_common.html
share/doc/apache/manual/mod/mod_log_config.html
share/doc/apache/manual/mod/mod_log_referer.html
share/doc/apache/manual/mod/mod_mime.html
+share/doc/apache/manual/mod/mod_mime_magic.html
+share/doc/apache/manual/mod/mod_mmap_static.html
share/doc/apache/manual/mod/mod_negotiation.html
share/doc/apache/manual/mod/mod_proxy.html
share/doc/apache/manual/mod/mod_rewrite.html
+share/doc/apache/manual/mod/mod_setenvif.html
+share/doc/apache/manual/mod/mod_so.html
+share/doc/apache/manual/mod/mod_speling.html
share/doc/apache/manual/mod/mod_status.html
+share/doc/apache/manual/mod/mod_unique_id.html
share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
share/doc/apache/manual/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/new_features_1_3.html
share/doc/apache/manual/process-model.html
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/sourcereorg.html
share/doc/apache/manual/stopping.html
share/doc/apache/manual/suexec.html
share/doc/apache/manual/unixware.html
-share/doc/apache/manual/vhosts-in-depth.html
-share/doc/apache/manual/virtual-host.html
+share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/vhosts/examples.html
+share/doc/apache/manual/vhosts/fd-limits.html
+share/doc/apache/manual/vhosts/footer.html
+share/doc/apache/manual/vhosts/header.html
+share/doc/apache/manual/vhosts/host.html
+share/doc/apache/manual/vhosts/index.html
+share/doc/apache/manual/vhosts/ip-based.html
+share/doc/apache/manual/vhosts/name-based.html
+share/doc/apache/manual/vhosts/vhosts-in-depth.html
+share/doc/apache/manual/vhosts/virtual-host.html
+share/doc/apache/manual/windows.html
+share/doc/php3/CODING_STANDARDS
+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
@@ -177,13 +272,19 @@ www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif
-@exec mkdir -p %D/www/cgi-bin %D/www/data
+@unexec [ -h %D/www/data/manual ] && rm %D/www/data/manual
+@dirrm etc/apache
+@dirrm include/apache
+@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
@dirrm share/doc/apache/manual/misc
@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/vhosts
@dirrm share/doc/apache/manual
@dirrm share/doc/apache
+@dirrm share/doc/php3
@dirrm www/cgi-bin
@dirrm www/data
@dirrm www/icons
+@dirrm www/proxy
@dirrm www
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 09a291150026..43b3ea5dc85b 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -1,50 +1,75 @@
-# New ports collection makefile for: apache HTTPD / php
-# Version required: 1.2.6 / 3.0
-# Date created: Wed Sep 3 18:28:20 CEST 1997
-# Whom: Andreas Klemm <andreas@klemm.gtn.com>
+# New ports collection makefile for: apache HTTPD / php3
+# Version required: 1.3.0 / 3.0.2
+# Date created: So 21 Jun 1998 16:09:39 CEST
+# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
-# $Id: Makefile,v 1.47 1998/07/11 20:52:36 andreas Exp $
+# $Id$
#
-DISTNAME= apache_1.2.6
-PKGNAME= apache-1.2.6-php3.0.2
+DISTNAME= apache_1.3.0
+PKGNAME= apache-php3.0.2-1.3.0
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.2.tar.gz
+ http://www.php.net/distributions/
+DISTFILES= apache_1.3.0.tar.gz php-3.0.2.tar.gz
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= stefan@asterix.webaffairs.net
BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
- gmake:${PORTSDIR}/devel/gmake \
- ${PREFIX}/include/freetype.h:${PORTSDIR}/print/freetype
+ perl5:${PORTSDIR}/lang/perl5
NO_PACKAGE= "Support for different databases via make-variable"
-MAN1= htpasswd.1
-MAN8= httpd.8
-DOCDIR= ${PREFIX}/share/doc/apache
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= \
+ --sysconfdir=${PREFIX}/etc/apache \
+ --includedir=${PREFIX}/include/apache \
+ --logfiledir=/var/log \
+ --runtimedir=/var/run \
+ --datadir=${PREFIX}/www \
+ --proxycachedir=${PREFIX}/www/proxy \
+ --libexecdir=${PREFIX}/libexec/apache \
+ --enable-shared=remain \
+ --enable-module=most \
+ --enable-module=auth_db \
+ --disable-module=auth_dbm \
+ --with-perl=${PREFIX}/bin/perl5 \
+ --activate-module=src/modules/php3/libphp3.a
-.if defined(PATCH_DEBUG)
-PATCH_DIST_ARGS= -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
.endif
-# Set it for local-supplied patch, f.e.
-VERS_ID = PHP-3.0.2
+CONFIGURE_ENV= OPTIM='${OPTIM}'
+
+MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
+MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8
-PHP3_CONF_ARGS= --prefix=${PREFIX} --with-gd=${PREFIX} \
- --with-system-regex --with-apache=${WRKSRC} \
- --with-config-file-path=${PREFIX}/lib --disable-debug \
- --libdir=${PREFIX}/lib --includedir=${PREFIX}/include
+APACHEDOCDIR= ${PREFIX}/share/doc/apache
+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 && ${PHP3_DBTYPE} != dbase
+.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=[ dbase | msql | mysql | pgsql ]"
+ @ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]"
@ ${FALSE}
.elif defined(PHP3_DBTYPE)
.if ${PHP3_DBTYPE} == msql
@@ -56,53 +81,52 @@ 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
-.elif ${PHP3_DBTYPE} == dbase
-PHP3_CONF_ARGS+= --with-dbase
.endif
.endif
-.if defined(VERS_ID)
post-patch:
- @cd ${WRKSRC}/src && \
- ${MV} Configuration Configuration.old && \
- ${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
- < Configuration.old > Configuration
-.endif
+ @ ${PATCH} -s -d ${WRKDIR}/php-3.0.2 < ${FILESDIR}/configure.patch
pre-configure:
- ( cd ${WRKDIR}/php-3.0.2 \
- && CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS=-I${PREFIX}/include ./configure ${PHP3_CONF_ARGS} \
- && ${GMAKE} install )
- ${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration
+ @( cd ${WRKDIR}/php-3.0.2 \
+ && ${ECHO_MSG} "===> Configuring for PHP-3.0.2" \
+ && CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \
+ && ${ECHO_MSG} "===> Building for PHP-3.0.2" \
+ && ${MAKE} install \
+ && ${ECHO_MSG} "===> Configuring for Apache-1.3.0" )
.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/lib -lmsql -lgd -lm'
.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -I${PREFIX}/include/gd -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-L${PREFIX}/lib/mysql -L${PREFIX}/lib -lmysqlclient -lm -lgd'
.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
-.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == dbase
- ${ECHO} "EXTRA_LIBS=-lmd libphp3.a libdbf.a -L${PREFIX}/lib -lgd -lm -lttf" >> ${WRKSRC}/src/Configuration
+CONFIGURE_ENV+= LIBS='-lmd -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm'
.endif
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
- ${SED} 's;PREFIX;${PREFIX};' < ${FILESDIR}/apache.sh.tmpl > \
- ${PREFIX}/etc/rc.d/apache.sh; \
+ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+ ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
fi
-.for i in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man1
-.endfor
-.for i in ${MAN8}
- ${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man8
-.endfor
+
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCDIR}
+ ${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR}
.for i in README LICENSE ABOUT_APACHE
- ${INSTALL_DATA} ${WRKSRC}/$i ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/$i ${APACHEDOCDIR}
+.endfor
+ (cd ${WRKSRC}/htdocs && tar cf - *) |\
+ (cd ${APACHEDOCDIR} && tar xf -); \
+ 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
+.endfor
+.for i in CODING_STANDARDS EXTENSION_STATUS LICENSE
+ ${INSTALL_DATA} ${WRKDIR}/php-3.0.2/$i ${PHP3DOCDIR}
.endfor
- @cd ${WRKSRC}/htdocs; tar cf - . | (cd ${DOCDIR}; tar xf -)
+ @ ${ECHO} "Docs reside in ${APACHEDOCDIR}"
+ @ ${ECHO} "and in ${PHP3DOCDIR}"
.endif
.include <bsd.port.mk>
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index cb2cfe981349..57c7819970bc 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44
+MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308
MD5 (php-3.0.2.tar.gz) = bd47e73a3d300263bafa8781ec766377
diff --git a/www/mod_php5/pkg-descr b/www/mod_php5/pkg-descr
index 84830d32b0b0..efa8baf74d90 100644
--- a/www/mod_php5/pkg-descr
+++ b/www/mod_php5/pkg-descr
@@ -1,9 +1,16 @@
+
+What is it?
+-----------
+
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
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.
+Documentation
+-------------
+
The documentation available as of the date of this release is also
included, in HTML format, in the htdocs/manual/ directory. For the
most up-to-date documentation, visit us on the WWW, at:
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index a02a9383df1d..e79cb19b65a1 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -1,58 +1,123 @@
-etc/apache/access.conf-dist
-etc/apache/httpd.conf-dist
-etc/apache/mime.types-dist
-etc/apache/srm.conf-dist
+bin/dbmmanage
+bin/htdigest
+bin/htpasswd
+etc/apache/access.conf.default
+etc/apache/httpd.conf.default
+etc/apache/magic.default
+etc/apache/mime.types.default
+etc/apache/srm.conf.default
etc/rc.d/apache.sh
+include/apache/alloc.h
+include/apache/ap.h
+include/apache/ap_config.h
+include/apache/ap_md5.h
+include/apache/buff.h
+include/apache/compat.h
+include/apache/conf.h
+include/apache/explain.h
+include/apache/fnmatch.h
+include/apache/hsregex.h
+include/apache/http_conf_globals.h
+include/apache/http_config.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/multithread.h
+include/apache/os.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+include/apache/util_date.h
+include/apache/util_md5.h
+include/apache/util_script.h
+include/apache/util_uri.h
+libexec/apache/libproxy.so
+libexec/apache/mod_auth_anon.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_digest.so
+libexec/apache/mod_expires.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_info.so
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_speling.so
+libexec/apache/mod_status.so
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_usertrack.so
+man/man1/ab.1.gz
+man/man1/apachectl.1.gz
+man/man1/dbmmanage.1.gz
+man/man1/htdigest.1.gz
man/man1/htpasswd.1.gz
+man/man8/apxs.8.gz
man/man8/httpd.8.gz
+man/man8/logresolve.8.gz
+man/man8/rotatelogs.8.gz
+sbin/ab
+sbin/apachectl
+sbin/apxs
sbin/httpd
+sbin/logresolve
+sbin/rotatelogs
share/doc/apache/ABOUT_APACHE
share/doc/apache/LICENSE
share/doc/apache/README
share/doc/apache/apache_pb.gif
share/doc/apache/index.html
share/doc/apache/manual/LICENSE
-share/doc/apache/manual/TODO
share/doc/apache/manual/bind.html
share/doc/apache/manual/cgi_path.html
share/doc/apache/manual/content-negotiation.html
share/doc/apache/manual/custom-error.html
share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/ebcdic.html
share/doc/apache/manual/env.html
share/doc/apache/manual/footer.html
share/doc/apache/manual/handler.html
share/doc/apache/manual/header.html
-share/doc/apache/manual/host.html
+share/doc/apache/manual/images/custom_errordocs.gif
share/doc/apache/manual/images/home.gif
share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/mod_rewrite_fig1.fig
+share/doc/apache/manual/images/mod_rewrite_fig1.gif
+share/doc/apache/manual/images/mod_rewrite_fig2.fig
+share/doc/apache/manual/images/mod_rewrite_fig2.gif
share/doc/apache/manual/images/sub.gif
share/doc/apache/manual/index.html
share/doc/apache/manual/install.html
-share/doc/apache/manual/install_1_1.html
share/doc/apache/manual/invoking.html
share/doc/apache/manual/keepalive.html
share/doc/apache/manual/location.html
share/doc/apache/manual/man-template.html
share/doc/apache/manual/misc/API.html
share/doc/apache/manual/misc/FAQ.html
+share/doc/apache/manual/misc/HTTP_Features.tsv
share/doc/apache/manual/misc/client_block_api.html
share/doc/apache/manual/misc/compat_notes.html
+share/doc/apache/manual/misc/custom_errordocs.html
share/doc/apache/manual/misc/descriptors.html
share/doc/apache/manual/misc/fin_wait_2.html
share/doc/apache/manual/misc/footer.html
share/doc/apache/manual/misc/header.html
share/doc/apache/manual/misc/howto.html
share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_bugs.html
share/doc/apache/manual/misc/known_client_problems.html
share/doc/apache/manual/misc/nopgp.html
share/doc/apache/manual/misc/perf-bsd44.html
share/doc/apache/manual/misc/perf-dec.html
+share/doc/apache/manual/misc/perf-hp.html
+share/doc/apache/manual/misc/perf-tuning.html
share/doc/apache/manual/misc/perf.html
share/doc/apache/manual/misc/security_tips.html
share/doc/apache/manual/misc/vif-info.html
share/doc/apache/manual/misc/windoz_keepalive.html
share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/directive-dict.html
share/doc/apache/manual/mod/directives.html
share/doc/apache/manual/mod/footer.html
share/doc/apache/manual/mod/header.html
@@ -65,7 +130,7 @@ share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_msql.html
+share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
share/doc/apache/manual/mod/mod_cgi.html
@@ -73,6 +138,7 @@ share/doc/apache/manual/mod/mod_cookies.html
share/doc/apache/manual/mod/mod_digest.html
share/doc/apache/manual/mod/mod_dir.html
share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_dll.html
share/doc/apache/manual/mod/mod_env.html
share/doc/apache/manual/mod/mod_example.html
share/doc/apache/manual/mod/mod_expires.html
@@ -80,27 +146,56 @@ share/doc/apache/manual/mod/mod_headers.html
share/doc/apache/manual/mod/mod_imap.html
share/doc/apache/manual/mod/mod_include.html
share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_isapi.html
share/doc/apache/manual/mod/mod_log_agent.html
share/doc/apache/manual/mod/mod_log_common.html
share/doc/apache/manual/mod/mod_log_config.html
share/doc/apache/manual/mod/mod_log_referer.html
share/doc/apache/manual/mod/mod_mime.html
+share/doc/apache/manual/mod/mod_mime_magic.html
+share/doc/apache/manual/mod/mod_mmap_static.html
share/doc/apache/manual/mod/mod_negotiation.html
share/doc/apache/manual/mod/mod_proxy.html
share/doc/apache/manual/mod/mod_rewrite.html
+share/doc/apache/manual/mod/mod_setenvif.html
+share/doc/apache/manual/mod/mod_so.html
+share/doc/apache/manual/mod/mod_speling.html
share/doc/apache/manual/mod/mod_status.html
+share/doc/apache/manual/mod/mod_unique_id.html
share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
share/doc/apache/manual/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/new_features_1_3.html
share/doc/apache/manual/process-model.html
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/sourcereorg.html
share/doc/apache/manual/stopping.html
share/doc/apache/manual/suexec.html
share/doc/apache/manual/unixware.html
-share/doc/apache/manual/vhosts-in-depth.html
-share/doc/apache/manual/virtual-host.html
+share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/vhosts/examples.html
+share/doc/apache/manual/vhosts/fd-limits.html
+share/doc/apache/manual/vhosts/footer.html
+share/doc/apache/manual/vhosts/header.html
+share/doc/apache/manual/vhosts/host.html
+share/doc/apache/manual/vhosts/index.html
+share/doc/apache/manual/vhosts/ip-based.html
+share/doc/apache/manual/vhosts/name-based.html
+share/doc/apache/manual/vhosts/vhosts-in-depth.html
+share/doc/apache/manual/vhosts/virtual-host.html
+share/doc/apache/manual/windows.html
+share/doc/php3/CODING_STANDARDS
+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
@@ -177,13 +272,19 @@ www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif
-@exec mkdir -p %D/www/cgi-bin %D/www/data
+@unexec [ -h %D/www/data/manual ] && rm %D/www/data/manual
+@dirrm etc/apache
+@dirrm include/apache
+@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
@dirrm share/doc/apache/manual/misc
@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/vhosts
@dirrm share/doc/apache/manual
@dirrm share/doc/apache
+@dirrm share/doc/php3
@dirrm www/cgi-bin
@dirrm www/data
@dirrm www/icons
+@dirrm www/proxy
@dirrm www
generated by cgit (git 2.34.1) at 2024-12-12 12:05:03 +0800