aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/mod_php3/Makefile46
-rw-r--r--www/mod_php3/distinfo5
-rw-r--r--www/mod_php3/pkg-plist7
-rw-r--r--www/mod_php3/scripts/configure.php65
-rw-r--r--www/mod_php4/Makefile46
-rw-r--r--www/mod_php4/distinfo5
-rw-r--r--www/mod_php4/pkg-plist7
-rw-r--r--www/mod_php4/scripts/configure.php65
-rw-r--r--www/mod_php5/Makefile46
-rw-r--r--www/mod_php5/distinfo5
-rw-r--r--www/mod_php5/pkg-plist7
-rw-r--r--www/mod_php5/scripts/configure.php65
12 files changed, 270 insertions, 99 deletions
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index b29a7040b6b3..71650662eeee 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -6,19 +6,17 @@
# $Id: Makefile,v 1.54 1998/09/13 17:18:11 andreas Exp $
#
-DISTNAME= apache_${APACHE_VER}
-PKGNAME= apache-php${PHP3_VER}-${APACHE_VER}
+DISTNAME= apache_${VERSION_APACHE}
+PKGNAME= apache-php${VERSION_PHP3}-${VERSION_APACHE}
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/ \
http://www.php.net/distributions/
-DISTFILES= apache_${APACHE_VER}.tar.gz php-${PHP3_VER}.tar.gz
+DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz
MAINTAINER= Dirk Froemberg <ibex@physik.TU-Berlin.DE>
-APACHE_VER= 1.3.1
-PHP3_VER= 3.0.3
-
-USE_PERL5= yes
+VERSION_APACHE= 1.3.2
+VERSION_PHP3= 3.0.4
IS_INTERACTIVE= yes
NO_PACKAGE= Support for different databases
@@ -36,21 +34,23 @@ CONFIGURE_ARGS= \
--datadir=${PREFIX}/www \
--proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
+ --without-confadjust \
--enable-shared=remain \
--enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm \
- --with-perl=${PERL5} \
--activate-module=src/modules/php3/libphp3.a
+# Currently perl version don't matter
+# --with-perl=${PERL5}
+
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
+CFLAGS+= -O6 -fomit-frame-pointer
.endif
CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
@@ -65,32 +65,34 @@ PHP3_CONF_ARGS= --prefix=${PREFIX} \
--with-system-regex \
--with-apache=${WRKSRC} \
--with-config-file-path=${PREFIX}/lib \
- --disable-debug
+ --disable-debug \
+ --enable-track-vars
-post-fetch:
+pre-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
-#post-patch:
-# @${PATCH} -s -d ${WRKDIR}/php-${PHP3_VER} < ${FILESDIR}/configure.patch
-
pre-configure:
- @( cd ${WRKSRC} \
+ @cd ${WRKSRC} \
&& ./configure > /dev/null \
- && cd ${WRKDIR}/php-${PHP3_VER} \
- && ${ECHO_MSG} "===> Configuring for PHP-${PHP3_VER}" \
+ && cd ${WRKDIR}/php-${VERSION_PHP3} \
+ && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP3}" \
&& CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \
- && ${ECHO_MSG} "===> Building for PHP-${PHP3_VER}" \
+ && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP3}" \
&& ${MAKE} install \
- && ${ECHO_MSG} "===> Configuring for Apache-${APACHE_VER}" )
+ && ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}"
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
${ECHO} "[ -d ${PREFIX}/pgsql/lib ] && ${LDCONFIG} -m ${PREFIX}/pgsql/lib" >> ${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; \
+ ${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}/lib
+.for i in php2 php3 phpi phps
+ ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/www/icons
+.endfor
.if !defined(NOPORTDOCS)
${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR}
@@ -105,7 +107,7 @@ post-install:
${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i
.endfor
.for i in CODING_STANDARDS EXTENSION_STATUS LICENSE
- ${INSTALL_DATA} ${WRKDIR}/php-${PHP3_VER}/$i ${PHP3DOCDIR}
+ ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/$i ${PHP3DOCDIR}
.endfor
@${ECHO} "Docs reside in ${APACHEDOCDIR}"
@${ECHO} "and in ${PHP3DOCDIR}"
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index a7bf61f78029..35c6478a5dff 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,2 +1,3 @@
-MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4
-MD5 (php-3.0.3.tar.gz) = 11c2b1b24642d097efea40e9ce787917
+MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f
+MD5 (php-3.0.4.tar.gz) = 64fd10379bb90c2c9552a55b5c2d16dd
+MD5 (mod_ssl-2.0.11-1.3.2.tar.gz) = 33b2c9c2d04c8d3fba6baa82e06bb2a9
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index c4b715f57c49..8628c1c97757 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -19,6 +19,7 @@ include/apache/ap_config.h
include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_md5.h
+include/apache/ap_mmn.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
@@ -42,6 +43,7 @@ include/apache/util_date.h
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+lib/php3.ini-dist
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
@@ -53,7 +55,6 @@ 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
sbin/ab
@@ -239,6 +240,10 @@ www/icons/movie.gif
www/icons/p.gif
www/icons/patch.gif
www/icons/pdf.gif
+www/icons/php2.gif
+www/icons/php3.gif
+www/icons/phpi.gif
+www/icons/phps.gif
www/icons/pie0.gif
www/icons/pie1.gif
www/icons/pie2.gif
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index e0519f423c8a..71c2d1ed6f30 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -4,16 +4,18 @@ if [ -f ${CURDIR}/Makefile.inc ]; then
exit
fi
-/usr/bin/dialog --title "PHP configuration options" --clear \
+/usr/bin/dialog --title "configuration options" --clear \
--checklist "\n\
Please select desired options:" -1 -1 9 \
-GD "GD library support" ON \
-FreeType "TrueType font rendering (implies GD)" OFF \
-zlib "zlib library support" ON \
-MySQL "MySQL database support" ON \
-PostgreSQL "PostgreSQL database support" OFF \
-mSQL "mSQL database support" OFF \
-dBase "dBase database support" OFF 2> /tmp/checklist.tmp.$$
+tuning "Apache: performance tuning" OFF \
+modssl "Apache: SSL support" OFF \
+GD "PHP3: GD library support" ON \
+FreeType "PHP3: TrueType font rendering (implies GD)" OFF \
+zlib "PHP3: zlib library support" ON \
+MySQL "PHP3: MySQL database support" ON \
+PostgreSQL "PHP3: PostgreSQL database support" OFF \
+mSQL "PHP3: mSQL database support" OFF \
+dBase "PHP3: dBase database support" OFF 2> /tmp/checklist.tmp.$$
retval=$?
@@ -36,6 +38,9 @@ esac
while [ "$1" ]; do
case $1 in
+ \"tuning\")
+ echo "APACHE_PERF_TUNING= YES" >> ${CURDIR}/Makefile.inc
+ ;;
\"GD\")
echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-gd" >> ${CURDIR}/Makefile.inc
@@ -65,6 +70,50 @@ while [ "$1" ]; do
\"dBase\")
echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc
;;
+ \"modssl\")
+ cat << EOF >> ${CURDIR}/Makefile.inc
+PKGNAME= apache-php\${VERSION_PHP3}-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
+MASTER_SITES+= http://www.engelschall.com/sw/mod_ssl/distrib/ \\
+ ftp://ftp.engelschall.com/sw/mod_ssl/ \\
+ ftp://ftp.ulpgc.es/pub/mod_ssl/ \\
+ ftp://glock.missouri.edu/pub/mod_ssl/
+DISTFILES+= mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
+
+BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
+ \${PREFIX}/lib/libssl.a:\${PORTSDIR}/security/SSLeay \\
+ \${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/SSLeay
+RUN_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay
+
+VERSION_MODSSL= 2.0.11
+
+RESTRICTED= "Contains cryptography"
+
+CONFIGURE_ARGS+=--enable-module=ssl
+CONFIGURE_ENV+= SSL_BASE='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}"
+
+PATCHDIR= \${.CURDIR}/patches.modssl
+PLIST= \${PKGDIR}/PLIST.modssl
+SSL= ssl
+
+pre-patch:
+ @cd \${WRKDIR}/mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE} \\
+ && \${ECHO_MSG} "===> Applying mod_ssl-\${VERSION_MODSSL} extension" \\
+ && ./configure --with-apache=../\${DISTNAME}
+
+post-patch:
+ @cd \${WRKSRC} \\
+ && find . -type f -name "*.orig" -print | xargs \${RM} -f
+
+post-build:
+ @cd \${WRKSRC} \\
+ && \${MAKE} certificate TYPE=dummy >/dev/null 2>&1
+
+certificate:
+ @cd \${WRKSRC} \\
+ && \${ECHO_MSG} "===> Creating Test Certificate for Server" \\
+ && \${MAKE} certificate TYPE=\$(TYPE) CRT=\$(CRT) KEY=\$(KEY)
+EOF
+ ;;
esac
shift
done
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index b29a7040b6b3..71650662eeee 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -6,19 +6,17 @@
# $Id: Makefile,v 1.54 1998/09/13 17:18:11 andreas Exp $
#
-DISTNAME= apache_${APACHE_VER}
-PKGNAME= apache-php${PHP3_VER}-${APACHE_VER}
+DISTNAME= apache_${VERSION_APACHE}
+PKGNAME= apache-php${VERSION_PHP3}-${VERSION_APACHE}
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/ \
http://www.php.net/distributions/
-DISTFILES= apache_${APACHE_VER}.tar.gz php-${PHP3_VER}.tar.gz
+DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz
MAINTAINER= Dirk Froemberg <ibex@physik.TU-Berlin.DE>
-APACHE_VER= 1.3.1
-PHP3_VER= 3.0.3
-
-USE_PERL5= yes
+VERSION_APACHE= 1.3.2
+VERSION_PHP3= 3.0.4
IS_INTERACTIVE= yes
NO_PACKAGE= Support for different databases
@@ -36,21 +34,23 @@ CONFIGURE_ARGS= \
--datadir=${PREFIX}/www \
--proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
+ --without-confadjust \
--enable-shared=remain \
--enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm \
- --with-perl=${PERL5} \
--activate-module=src/modules/php3/libphp3.a
+# Currently perl version don't matter
+# --with-perl=${PERL5}
+
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
+CFLAGS+= -O6 -fomit-frame-pointer
.endif
CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
@@ -65,32 +65,34 @@ PHP3_CONF_ARGS= --prefix=${PREFIX} \
--with-system-regex \
--with-apache=${WRKSRC} \
--with-config-file-path=${PREFIX}/lib \
- --disable-debug
+ --disable-debug \
+ --enable-track-vars
-post-fetch:
+pre-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
-#post-patch:
-# @${PATCH} -s -d ${WRKDIR}/php-${PHP3_VER} < ${FILESDIR}/configure.patch
-
pre-configure:
- @( cd ${WRKSRC} \
+ @cd ${WRKSRC} \
&& ./configure > /dev/null \
- && cd ${WRKDIR}/php-${PHP3_VER} \
- && ${ECHO_MSG} "===> Configuring for PHP-${PHP3_VER}" \
+ && cd ${WRKDIR}/php-${VERSION_PHP3} \
+ && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP3}" \
&& CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \
- && ${ECHO_MSG} "===> Building for PHP-${PHP3_VER}" \
+ && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP3}" \
&& ${MAKE} install \
- && ${ECHO_MSG} "===> Configuring for Apache-${APACHE_VER}" )
+ && ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}"
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
${ECHO} "[ -d ${PREFIX}/pgsql/lib ] && ${LDCONFIG} -m ${PREFIX}/pgsql/lib" >> ${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; \
+ ${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}/lib
+.for i in php2 php3 phpi phps
+ ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/www/icons
+.endfor
.if !defined(NOPORTDOCS)
${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR}
@@ -105,7 +107,7 @@ post-install:
${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i
.endfor
.for i in CODING_STANDARDS EXTENSION_STATUS LICENSE
- ${INSTALL_DATA} ${WRKDIR}/php-${PHP3_VER}/$i ${PHP3DOCDIR}
+ ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/$i ${PHP3DOCDIR}
.endfor
@${ECHO} "Docs reside in ${APACHEDOCDIR}"
@${ECHO} "and in ${PHP3DOCDIR}"
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index a7bf61f78029..35c6478a5dff 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1,3 @@
-MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4
-MD5 (php-3.0.3.tar.gz) = 11c2b1b24642d097efea40e9ce787917
+MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f
+MD5 (php-3.0.4.tar.gz) = 64fd10379bb90c2c9552a55b5c2d16dd
+MD5 (mod_ssl-2.0.11-1.3.2.tar.gz) = 33b2c9c2d04c8d3fba6baa82e06bb2a9
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index c4b715f57c49..8628c1c97757 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -19,6 +19,7 @@ include/apache/ap_config.h
include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_md5.h
+include/apache/ap_mmn.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
@@ -42,6 +43,7 @@ include/apache/util_date.h
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+lib/php3.ini-dist
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
@@ -53,7 +55,6 @@ 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
sbin/ab
@@ -239,6 +240,10 @@ www/icons/movie.gif
www/icons/p.gif
www/icons/patch.gif
www/icons/pdf.gif
+www/icons/php2.gif
+www/icons/php3.gif
+www/icons/phpi.gif
+www/icons/phps.gif
www/icons/pie0.gif
www/icons/pie1.gif
www/icons/pie2.gif
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index e0519f423c8a..71c2d1ed6f30 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -4,16 +4,18 @@ if [ -f ${CURDIR}/Makefile.inc ]; then
exit
fi
-/usr/bin/dialog --title "PHP configuration options" --clear \
+/usr/bin/dialog --title "configuration options" --clear \
--checklist "\n\
Please select desired options:" -1 -1 9 \
-GD "GD library support" ON \
-FreeType "TrueType font rendering (implies GD)" OFF \
-zlib "zlib library support" ON \
-MySQL "MySQL database support" ON \
-PostgreSQL "PostgreSQL database support" OFF \
-mSQL "mSQL database support" OFF \
-dBase "dBase database support" OFF 2> /tmp/checklist.tmp.$$
+tuning "Apache: performance tuning" OFF \
+modssl "Apache: SSL support" OFF \
+GD "PHP3: GD library support" ON \
+FreeType "PHP3: TrueType font rendering (implies GD)" OFF \
+zlib "PHP3: zlib library support" ON \
+MySQL "PHP3: MySQL database support" ON \
+PostgreSQL "PHP3: PostgreSQL database support" OFF \
+mSQL "PHP3: mSQL database support" OFF \
+dBase "PHP3: dBase database support" OFF 2> /tmp/checklist.tmp.$$
retval=$?
@@ -36,6 +38,9 @@ esac
while [ "$1" ]; do
case $1 in
+ \"tuning\")
+ echo "APACHE_PERF_TUNING= YES" >> ${CURDIR}/Makefile.inc
+ ;;
\"GD\")
echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-gd" >> ${CURDIR}/Makefile.inc
@@ -65,6 +70,50 @@ while [ "$1" ]; do
\"dBase\")
echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc
;;
+ \"modssl\")
+ cat << EOF >> ${CURDIR}/Makefile.inc
+PKGNAME= apache-php\${VERSION_PHP3}-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
+MASTER_SITES+= http://www.engelschall.com/sw/mod_ssl/distrib/ \\
+ ftp://ftp.engelschall.com/sw/mod_ssl/ \\
+ ftp://ftp.ulpgc.es/pub/mod_ssl/ \\
+ ftp://glock.missouri.edu/pub/mod_ssl/
+DISTFILES+= mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
+
+BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
+ \${PREFIX}/lib/libssl.a:\${PORTSDIR}/security/SSLeay \\
+ \${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/SSLeay
+RUN_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay
+
+VERSION_MODSSL= 2.0.11
+
+RESTRICTED= "Contains cryptography"
+
+CONFIGURE_ARGS+=--enable-module=ssl
+CONFIGURE_ENV+= SSL_BASE='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}"
+
+PATCHDIR= \${.CURDIR}/patches.modssl
+PLIST= \${PKGDIR}/PLIST.modssl
+SSL= ssl
+
+pre-patch:
+ @cd \${WRKDIR}/mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE} \\
+ && \${ECHO_MSG} "===> Applying mod_ssl-\${VERSION_MODSSL} extension" \\
+ && ./configure --with-apache=../\${DISTNAME}
+
+post-patch:
+ @cd \${WRKSRC} \\
+ && find . -type f -name "*.orig" -print | xargs \${RM} -f
+
+post-build:
+ @cd \${WRKSRC} \\
+ && \${MAKE} certificate TYPE=dummy >/dev/null 2>&1
+
+certificate:
+ @cd \${WRKSRC} \\
+ && \${ECHO_MSG} "===> Creating Test Certificate for Server" \\
+ && \${MAKE} certificate TYPE=\$(TYPE) CRT=\$(CRT) KEY=\$(KEY)
+EOF
+ ;;
esac
shift
done
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index b29a7040b6b3..71650662eeee 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -6,19 +6,17 @@
# $Id: Makefile,v 1.54 1998/09/13 17:18:11 andreas Exp $
#
-DISTNAME= apache_${APACHE_VER}
-PKGNAME= apache-php${PHP3_VER}-${APACHE_VER}
+DISTNAME= apache_${VERSION_APACHE}
+PKGNAME= apache-php${VERSION_PHP3}-${VERSION_APACHE}
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/ \
http://www.php.net/distributions/
-DISTFILES= apache_${APACHE_VER}.tar.gz php-${PHP3_VER}.tar.gz
+DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz
MAINTAINER= Dirk Froemberg <ibex@physik.TU-Berlin.DE>
-APACHE_VER= 1.3.1
-PHP3_VER= 3.0.3
-
-USE_PERL5= yes
+VERSION_APACHE= 1.3.2
+VERSION_PHP3= 3.0.4
IS_INTERACTIVE= yes
NO_PACKAGE= Support for different databases
@@ -36,21 +34,23 @@ CONFIGURE_ARGS= \
--datadir=${PREFIX}/www \
--proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
+ --without-confadjust \
--enable-shared=remain \
--enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm \
- --with-perl=${PERL5} \
--activate-module=src/modules/php3/libphp3.a
+# Currently perl version don't matter
+# --with-perl=${PERL5}
+
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
+CFLAGS+= -O6 -fomit-frame-pointer
.endif
CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
@@ -65,32 +65,34 @@ PHP3_CONF_ARGS= --prefix=${PREFIX} \
--with-system-regex \
--with-apache=${WRKSRC} \
--with-config-file-path=${PREFIX}/lib \
- --disable-debug
+ --disable-debug \
+ --enable-track-vars
-post-fetch:
+pre-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
-#post-patch:
-# @${PATCH} -s -d ${WRKDIR}/php-${PHP3_VER} < ${FILESDIR}/configure.patch
-
pre-configure:
- @( cd ${WRKSRC} \
+ @cd ${WRKSRC} \
&& ./configure > /dev/null \
- && cd ${WRKDIR}/php-${PHP3_VER} \
- && ${ECHO_MSG} "===> Configuring for PHP-${PHP3_VER}" \
+ && cd ${WRKDIR}/php-${VERSION_PHP3} \
+ && ${ECHO_MSG} "===> Configuring for PHP-${VERSION_PHP3}" \
&& CFLAGS= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" LDFLAGS=-L${PREFIX}/lib ./configure ${PHP3_CONF_ARGS} \
- && ${ECHO_MSG} "===> Building for PHP-${PHP3_VER}" \
+ && ${ECHO_MSG} "===> Building for PHP-${VERSION_PHP3}" \
&& ${MAKE} install \
- && ${ECHO_MSG} "===> Configuring for Apache-${APACHE_VER}" )
+ && ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}"
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
${ECHO} "[ -d ${PREFIX}/pgsql/lib ] && ${LDCONFIG} -m ${PREFIX}/pgsql/lib" >> ${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; \
+ ${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}/lib
+.for i in php2 php3 phpi phps
+ ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/www/icons
+.endfor
.if !defined(NOPORTDOCS)
${MKDIR} ${APACHEDOCDIR} ${PHP3DOCDIR}
@@ -105,7 +107,7 @@ post-install:
${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i
.endfor
.for i in CODING_STANDARDS EXTENSION_STATUS LICENSE
- ${INSTALL_DATA} ${WRKDIR}/php-${PHP3_VER}/$i ${PHP3DOCDIR}
+ ${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/$i ${PHP3DOCDIR}
.endfor
@${ECHO} "Docs reside in ${APACHEDOCDIR}"
@${ECHO} "and in ${PHP3DOCDIR}"
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index a7bf61f78029..35c6478a5dff 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1,3 @@
-MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4
-MD5 (php-3.0.3.tar.gz) = 11c2b1b24642d097efea40e9ce787917
+MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f
+MD5 (php-3.0.4.tar.gz) = 64fd10379bb90c2c9552a55b5c2d16dd
+MD5 (mod_ssl-2.0.11-1.3.2.tar.gz) = 33b2c9c2d04c8d3fba6baa82e06bb2a9
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index c4b715f57c49..8628c1c97757 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -19,6 +19,7 @@ include/apache/ap_config.h
include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_md5.h
+include/apache/ap_mmn.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
@@ -42,6 +43,7 @@ include/apache/util_date.h
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+lib/php3.ini-dist
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
@@ -53,7 +55,6 @@ 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
sbin/ab
@@ -239,6 +240,10 @@ www/icons/movie.gif
www/icons/p.gif
www/icons/patch.gif
www/icons/pdf.gif
+www/icons/php2.gif
+www/icons/php3.gif
+www/icons/phpi.gif
+www/icons/phps.gif
www/icons/pie0.gif
www/icons/pie1.gif
www/icons/pie2.gif
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index e0519f423c8a..71c2d1ed6f30 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -4,16 +4,18 @@ if [ -f ${CURDIR}/Makefile.inc ]; then
exit
fi
-/usr/bin/dialog --title "PHP configuration options" --clear \
+/usr/bin/dialog --title "configuration options" --clear \
--checklist "\n\
Please select desired options:" -1 -1 9 \
-GD "GD library support" ON \
-FreeType "TrueType font rendering (implies GD)" OFF \
-zlib "zlib library support" ON \
-MySQL "MySQL database support" ON \
-PostgreSQL "PostgreSQL database support" OFF \
-mSQL "mSQL database support" OFF \
-dBase "dBase database support" OFF 2> /tmp/checklist.tmp.$$
+tuning "Apache: performance tuning" OFF \
+modssl "Apache: SSL support" OFF \
+GD "PHP3: GD library support" ON \
+FreeType "PHP3: TrueType font rendering (implies GD)" OFF \
+zlib "PHP3: zlib library support" ON \
+MySQL "PHP3: MySQL database support" ON \
+PostgreSQL "PHP3: PostgreSQL database support" OFF \
+mSQL "PHP3: mSQL database support" OFF \
+dBase "PHP3: dBase database support" OFF 2> /tmp/checklist.tmp.$$
retval=$?
@@ -36,6 +38,9 @@ esac
while [ "$1" ]; do
case $1 in
+ \"tuning\")
+ echo "APACHE_PERF_TUNING= YES" >> ${CURDIR}/Makefile.inc
+ ;;
\"GD\")
echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-gd" >> ${CURDIR}/Makefile.inc
@@ -65,6 +70,50 @@ while [ "$1" ]; do
\"dBase\")
echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc
;;
+ \"modssl\")
+ cat << EOF >> ${CURDIR}/Makefile.inc
+PKGNAME= apache-php\${VERSION_PHP3}-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
+MASTER_SITES+= http://www.engelschall.com/sw/mod_ssl/distrib/ \\
+ ftp://ftp.engelschall.com/sw/mod_ssl/ \\
+ ftp://ftp.ulpgc.es/pub/mod_ssl/ \\
+ ftp://glock.missouri.edu/pub/mod_ssl/
+DISTFILES+= mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
+
+BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
+ \${PREFIX}/lib/libssl.a:\${PORTSDIR}/security/SSLeay \\
+ \${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/SSLeay
+RUN_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay
+
+VERSION_MODSSL= 2.0.11
+
+RESTRICTED= "Contains cryptography"
+
+CONFIGURE_ARGS+=--enable-module=ssl
+CONFIGURE_ENV+= SSL_BASE='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}"
+
+PATCHDIR= \${.CURDIR}/patches.modssl
+PLIST= \${PKGDIR}/PLIST.modssl
+SSL= ssl
+
+pre-patch:
+ @cd \${WRKDIR}/mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE} \\
+ && \${ECHO_MSG} "===> Applying mod_ssl-\${VERSION_MODSSL} extension" \\
+ && ./configure --with-apache=../\${DISTNAME}
+
+post-patch:
+ @cd \${WRKSRC} \\
+ && find . -type f -name "*.orig" -print | xargs \${RM} -f
+
+post-build:
+ @cd \${WRKSRC} \\
+ && \${MAKE} certificate TYPE=dummy >/dev/null 2>&1
+
+certificate:
+ @cd \${WRKSRC} \\
+ && \${ECHO_MSG} "===> Creating Test Certificate for Server" \\
+ && \${MAKE} certificate TYPE=\$(TYPE) CRT=\$(CRT) KEY=\$(KEY)
+EOF
+ ;;
esac
shift
done
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 16:19:10 +0000