summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--www/mod_php3/Makefile22
-rw-r--r--www/mod_php3/distinfo2
-rw-r--r--www/mod_php3/pkg-message9
-rw-r--r--www/mod_php3/pkg-plist1
-rw-r--r--www/mod_php3/scripts/configure.php57
-rw-r--r--www/mod_php4/Makefile22
-rw-r--r--www/mod_php4/distinfo2
-rw-r--r--www/mod_php4/pkg-message9
-rw-r--r--www/mod_php4/pkg-plist1
-rw-r--r--www/mod_php4/scripts/configure.php57
-rw-r--r--www/mod_php5/Makefile22
-rw-r--r--www/mod_php5/distinfo2
-rw-r--r--www/mod_php5/pkg-message9
-rw-r--r--www/mod_php5/pkg-plist1
-rw-r--r--www/mod_php5/scripts/configure.php57
15 files changed, 183 insertions, 90 deletions
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index e6d94e4b5098..46ebd302bbed 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
# Date created: So 21 Jun 1998 16:09:39 CEST
# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
-# $Id: Makefile,v 1.59 1998/12/05 09:36:59 obrien Exp $
+# $Id: Makefile,v 1.58 1998/12/02 20:32:02 billf Exp $
#
DISTNAME= apache_${VERSION_APACHE}
@@ -18,14 +18,11 @@ MASTER_SITES= ftp://www.apache.org/apache/dist/ \
http://www.php3.de/distributions/
DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz
-MAINTAINER= Dirk Froemberg <ibex@physik.TU-Berlin.DE>
+MAINTAINER= dirk@FreeBSD.ORG
VERSION_APACHE= 1.3.3
VERSION_PHP3= 3.0.5
-IS_INTERACTIVE= yes
-NO_PACKAGE= Support for different databases
-
#
# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
#
@@ -74,14 +71,21 @@ PHP3_CONF_ARGS= --prefix=${PREFIX} \
--enable-track-vars
pre-fetch:
+.if !defined(BATCH)
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
+.endif
pre-configure:
@cd ${WRKSRC} \
&& ./configure > /dev/null \
&& 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} \
+ && CC="${CC}" \
+ ac_cv_path_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}" \
&& ${MAKE} install \
&& ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}"
@@ -132,9 +136,9 @@ clean:
${ECHO_MSG} "===> ${WRKDIR} not writable, skipping"; \
fi; \
fi
- @${RM} -f Makefile.inc
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-.if exists(Makefile.inc)
-.include "Makefile.inc"
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
.include <bsd.port.mk>
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index 17aa8a15baff..ad5089dc145a 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,3 +1,3 @@
MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
MD5 (php-3.0.5.tar.gz) = f5d78d425bfe642a25871ff3e375fec2
-MD5 (mod_ssl-2.0.14-1.3.3.tar.gz) = 0a60f9b131d7ce93c3ff3ebbc524e75c
+MD5 (mod_ssl-2.1.3-1.3.3.tar.gz) = 76bd1f0d5f5c9623a71fea336312a753
diff --git a/www/mod_php3/pkg-message b/www/mod_php3/pkg-message
new file mode 100644
index 000000000000..03d6311ac5a9
--- /dev/null
+++ b/www/mod_php3/pkg-message
@@ -0,0 +1,9 @@
+*****************************************************************************
+You have just installed the apache13-php3 package.
+
+Have a look at the apache13-php3 port if you need additional support for
+databases or SSL.
+
+You can find it at
+ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/apache13-php3.tar
+*****************************************************************************
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index 8628c1c97757..f87fa9c662eb 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -274,6 +274,7 @@ www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif
+@exec mkdir -p %D/www/proxy
@dirrm etc/apache
@dirrm include/apache
@dirrm libexec/apache
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 8241d9244726..5db50034679a 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -1,12 +1,12 @@
#!/bin/sh
-if [ -f ${CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
exit
fi
/usr/bin/dialog --title "configuration options" --clear \
--checklist "\n\
-Please select desired options:" -1 -1 9 \
+Please select desired options:" -1 -1 10 \
tuning "Apache: performance tuning" OFF \
modssl "Apache: SSL support" OFF \
GD "PHP3: GD library support" ON \
@@ -15,7 +15,9 @@ 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.$$
+dBase "PHP3: dBase database support" OFF \
+OpenLDAP "PHP3: OpenLDAP support" OFF \
+2> /tmp/checklist.tmp.$$
retval=$?
@@ -34,49 +36,61 @@ case $retval in
;;
esac
-> ${CURDIR}/Makefile.inc
+mkdir -p ${WRKDIRPREFIX}${CURDIR}
+> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
while [ "$1" ]; do
case $1 in
\"tuning\")
- echo "APACHE_PERF_TUNING= YES" >> ${CURDIR}/Makefile.inc
+ echo "APACHE_PERF_TUNING= YES" >> ${WRKDIRPREFIX}${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
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-gd" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
GD=1
;;
\"FreeType\")
- echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" >> ${CURDIR}/Makefile.inc
+ echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
if [ -z "$GD" ]; then
set $* \"GD\"
fi
;;
\"zlib\")
- echo "PHP3_CONF_ARGS+= --with-zlib" >> ${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")
- echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"mSQL\")
- echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"dBase\")
- echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-dbase" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ ;;
+ \"OpenLDAP\")
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-ldap=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"modssl\")
- cat << EOF >> ${CURDIR}/Makefile.inc
+ cat << EOF >> ${WRKDIRPREFIX}${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.nvg.ntnu.no/pub/unix/mod_ssl/ \\
ftp://ftp.ulpgc.es/pub/mod_ssl/ \\
- ftp://glock.missouri.edu/pub/mod_ssl/
+ ftp://glock.missouri.edu/pub/mod_ssl/ \\
+ ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/mod_ssl/ \\
+ ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/ \\
+ ftp://ftp.blatzheim.com/pub/mod_ssl/ \\
+ ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \\
+ ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
DISTFILES+= mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
@@ -84,7 +98,7 @@ BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/SSLeay
RUN_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay
-VERSION_MODSSL= 2.0.14
+VERSION_MODSSL= 2.1.3
RESTRICTED= "Contains cryptography"
@@ -98,7 +112,7 @@ SSL= ssl
pre-patch:
@cd \${WRKDIR}/mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE} \\
&& \${ECHO_MSG} "===> Applying mod_ssl-\${VERSION_MODSSL} extension" \\
- && ./configure --with-apache=../\${DISTNAME}
+ && ./configure --with-apache=../\${DISTNAME} --expert
post-patch:
@cd \${WRKSRC} \\
@@ -106,12 +120,15 @@ post-patch:
post-build:
@cd \${WRKSRC} \\
+ && \${ECHO_MSG} "===> Creating Dummy Certificate for Server (SnakeOil)" \\
+ && \${ECHO_MSG} " [use 'make certificate' to create a real one]" \\
&& \${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
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index e6d94e4b5098..46ebd302bbed 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
# Date created: So 21 Jun 1998 16:09:39 CEST
# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
-# $Id: Makefile,v 1.59 1998/12/05 09:36:59 obrien Exp $
+# $Id: Makefile,v 1.58 1998/12/02 20:32:02 billf Exp $
#
DISTNAME= apache_${VERSION_APACHE}
@@ -18,14 +18,11 @@ MASTER_SITES= ftp://www.apache.org/apache/dist/ \
http://www.php3.de/distributions/
DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz
-MAINTAINER= Dirk Froemberg <ibex@physik.TU-Berlin.DE>
+MAINTAINER= dirk@FreeBSD.ORG
VERSION_APACHE= 1.3.3
VERSION_PHP3= 3.0.5
-IS_INTERACTIVE= yes
-NO_PACKAGE= Support for different databases
-
#
# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
#
@@ -74,14 +71,21 @@ PHP3_CONF_ARGS= --prefix=${PREFIX} \
--enable-track-vars
pre-fetch:
+.if !defined(BATCH)
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
+.endif
pre-configure:
@cd ${WRKSRC} \
&& ./configure > /dev/null \
&& 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} \
+ && CC="${CC}" \
+ ac_cv_path_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}" \
&& ${MAKE} install \
&& ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}"
@@ -132,9 +136,9 @@ clean:
${ECHO_MSG} "===> ${WRKDIR} not writable, skipping"; \
fi; \
fi
- @${RM} -f Makefile.inc
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-.if exists(Makefile.inc)
-.include "Makefile.inc"
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
.include <bsd.port.mk>
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 17aa8a15baff..ad5089dc145a 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,3 +1,3 @@
MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
MD5 (php-3.0.5.tar.gz) = f5d78d425bfe642a25871ff3e375fec2
-MD5 (mod_ssl-2.0.14-1.3.3.tar.gz) = 0a60f9b131d7ce93c3ff3ebbc524e75c
+MD5 (mod_ssl-2.1.3-1.3.3.tar.gz) = 76bd1f0d5f5c9623a71fea336312a753
diff --git a/www/mod_php4/pkg-message b/www/mod_php4/pkg-message
new file mode 100644
index 000000000000..03d6311ac5a9
--- /dev/null
+++ b/www/mod_php4/pkg-message
@@ -0,0 +1,9 @@
+*****************************************************************************
+You have just installed the apache13-php3 package.
+
+Have a look at the apache13-php3 port if you need additional support for
+databases or SSL.
+
+You can find it at
+ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/apache13-php3.tar
+*****************************************************************************
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index 8628c1c97757..f87fa9c662eb 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -274,6 +274,7 @@ www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif
+@exec mkdir -p %D/www/proxy
@dirrm etc/apache
@dirrm include/apache
@dirrm libexec/apache
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 8241d9244726..5db50034679a 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -1,12 +1,12 @@
#!/bin/sh
-if [ -f ${CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
exit
fi
/usr/bin/dialog --title "configuration options" --clear \
--checklist "\n\
-Please select desired options:" -1 -1 9 \
+Please select desired options:" -1 -1 10 \
tuning "Apache: performance tuning" OFF \
modssl "Apache: SSL support" OFF \
GD "PHP3: GD library support" ON \
@@ -15,7 +15,9 @@ 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.$$
+dBase "PHP3: dBase database support" OFF \
+OpenLDAP "PHP3: OpenLDAP support" OFF \
+2> /tmp/checklist.tmp.$$
retval=$?
@@ -34,49 +36,61 @@ case $retval in
;;
esac
-> ${CURDIR}/Makefile.inc
+mkdir -p ${WRKDIRPREFIX}${CURDIR}
+> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
while [ "$1" ]; do
case $1 in
\"tuning\")
- echo "APACHE_PERF_TUNING= YES" >> ${CURDIR}/Makefile.inc
+ echo "APACHE_PERF_TUNING= YES" >> ${WRKDIRPREFIX}${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
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-gd" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
GD=1
;;
\"FreeType\")
- echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" >> ${CURDIR}/Makefile.inc
+ echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
if [ -z "$GD" ]; then
set $* \"GD\"
fi
;;
\"zlib\")
- echo "PHP3_CONF_ARGS+= --with-zlib" >> ${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")
- echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"mSQL\")
- echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"dBase\")
- echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-dbase" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ ;;
+ \"OpenLDAP\")
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-ldap=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"modssl\")
- cat << EOF >> ${CURDIR}/Makefile.inc
+ cat << EOF >> ${WRKDIRPREFIX}${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.nvg.ntnu.no/pub/unix/mod_ssl/ \\
ftp://ftp.ulpgc.es/pub/mod_ssl/ \\
- ftp://glock.missouri.edu/pub/mod_ssl/
+ ftp://glock.missouri.edu/pub/mod_ssl/ \\
+ ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/mod_ssl/ \\
+ ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/ \\
+ ftp://ftp.blatzheim.com/pub/mod_ssl/ \\
+ ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \\
+ ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
DISTFILES+= mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
@@ -84,7 +98,7 @@ BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/SSLeay
RUN_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay
-VERSION_MODSSL= 2.0.14
+VERSION_MODSSL= 2.1.3
RESTRICTED= "Contains cryptography"
@@ -98,7 +112,7 @@ SSL= ssl
pre-patch:
@cd \${WRKDIR}/mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE} \\
&& \${ECHO_MSG} "===> Applying mod_ssl-\${VERSION_MODSSL} extension" \\
- && ./configure --with-apache=../\${DISTNAME}
+ && ./configure --with-apache=../\${DISTNAME} --expert
post-patch:
@cd \${WRKSRC} \\
@@ -106,12 +120,15 @@ post-patch:
post-build:
@cd \${WRKSRC} \\
+ && \${ECHO_MSG} "===> Creating Dummy Certificate for Server (SnakeOil)" \\
+ && \${ECHO_MSG} " [use 'make certificate' to create a real one]" \\
&& \${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
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index e6d94e4b5098..46ebd302bbed 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
# Date created: So 21 Jun 1998 16:09:39 CEST
# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
-# $Id: Makefile,v 1.59 1998/12/05 09:36:59 obrien Exp $
+# $Id: Makefile,v 1.58 1998/12/02 20:32:02 billf Exp $
#
DISTNAME= apache_${VERSION_APACHE}
@@ -18,14 +18,11 @@ MASTER_SITES= ftp://www.apache.org/apache/dist/ \
http://www.php3.de/distributions/
DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP3}.tar.gz
-MAINTAINER= Dirk Froemberg <ibex@physik.TU-Berlin.DE>
+MAINTAINER= dirk@FreeBSD.ORG
VERSION_APACHE= 1.3.3
VERSION_PHP3= 3.0.5
-IS_INTERACTIVE= yes
-NO_PACKAGE= Support for different databases
-
#
# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
#
@@ -74,14 +71,21 @@ PHP3_CONF_ARGS= --prefix=${PREFIX} \
--enable-track-vars
pre-fetch:
+.if !defined(BATCH)
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
+.endif
pre-configure:
@cd ${WRKSRC} \
&& ./configure > /dev/null \
&& 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} \
+ && CC="${CC}" \
+ ac_cv_path_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}" \
&& ${MAKE} install \
&& ${ECHO_MSG} "===> Configuring for Apache-${VERSION_APACHE}"
@@ -132,9 +136,9 @@ clean:
${ECHO_MSG} "===> ${WRKDIR} not writable, skipping"; \
fi; \
fi
- @${RM} -f Makefile.inc
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-.if exists(Makefile.inc)
-.include "Makefile.inc"
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
.include <bsd.port.mk>
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 17aa8a15baff..ad5089dc145a 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,3 +1,3 @@
MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
MD5 (php-3.0.5.tar.gz) = f5d78d425bfe642a25871ff3e375fec2
-MD5 (mod_ssl-2.0.14-1.3.3.tar.gz) = 0a60f9b131d7ce93c3ff3ebbc524e75c
+MD5 (mod_ssl-2.1.3-1.3.3.tar.gz) = 76bd1f0d5f5c9623a71fea336312a753
diff --git a/www/mod_php5/pkg-message b/www/mod_php5/pkg-message
new file mode 100644
index 000000000000..03d6311ac5a9
--- /dev/null
+++ b/www/mod_php5/pkg-message
@@ -0,0 +1,9 @@
+*****************************************************************************
+You have just installed the apache13-php3 package.
+
+Have a look at the apache13-php3 port if you need additional support for
+databases or SSL.
+
+You can find it at
+ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/apache13-php3.tar
+*****************************************************************************
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index 8628c1c97757..f87fa9c662eb 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -274,6 +274,7 @@ www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif
+@exec mkdir -p %D/www/proxy
@dirrm etc/apache
@dirrm include/apache
@dirrm libexec/apache
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 8241d9244726..5db50034679a 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -1,12 +1,12 @@
#!/bin/sh
-if [ -f ${CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
exit
fi
/usr/bin/dialog --title "configuration options" --clear \
--checklist "\n\
-Please select desired options:" -1 -1 9 \
+Please select desired options:" -1 -1 10 \
tuning "Apache: performance tuning" OFF \
modssl "Apache: SSL support" OFF \
GD "PHP3: GD library support" ON \
@@ -15,7 +15,9 @@ 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.$$
+dBase "PHP3: dBase database support" OFF \
+OpenLDAP "PHP3: OpenLDAP support" OFF \
+2> /tmp/checklist.tmp.$$
retval=$?
@@ -34,49 +36,61 @@ case $retval in
;;
esac
-> ${CURDIR}/Makefile.inc
+mkdir -p ${WRKDIRPREFIX}${CURDIR}
+> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
while [ "$1" ]; do
case $1 in
\"tuning\")
- echo "APACHE_PERF_TUNING= YES" >> ${CURDIR}/Makefile.inc
+ echo "APACHE_PERF_TUNING= YES" >> ${WRKDIRPREFIX}${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
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-gd" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
GD=1
;;
\"FreeType\")
- echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" >> ${CURDIR}/Makefile.inc
+ echo "LIB_DEPENDS+= ttf.3:\${PORTSDIR}/print/freetype" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
if [ -z "$GD" ]; then
set $* \"GD\"
fi
;;
\"zlib\")
- echo "PHP3_CONF_ARGS+= --with-zlib" >> ${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")
- echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= \${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-pgsql=\${PREFIX}/pgsql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"mSQL\")
- echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${CURDIR}/Makefile.inc
- echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-msql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"dBase\")
- echo "PHP3_CONF_ARGS+= --with-dbase" >> ${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-dbase" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ ;;
+ \"OpenLDAP\")
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "BUILD_DEPENDS+= \${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ echo "PHP3_CONF_ARGS+= --with-ldap=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"modssl\")
- cat << EOF >> ${CURDIR}/Makefile.inc
+ cat << EOF >> ${WRKDIRPREFIX}${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.nvg.ntnu.no/pub/unix/mod_ssl/ \\
ftp://ftp.ulpgc.es/pub/mod_ssl/ \\
- ftp://glock.missouri.edu/pub/mod_ssl/
+ ftp://glock.missouri.edu/pub/mod_ssl/ \\
+ ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/mod_ssl/ \\
+ ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/ \\
+ ftp://ftp.blatzheim.com/pub/mod_ssl/ \\
+ ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \\
+ ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
DISTFILES+= mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
@@ -84,7 +98,7 @@ BUILD_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay \\
\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/SSLeay
RUN_DEPENDS+= ssleay:\${PORTSDIR}/security/SSLeay
-VERSION_MODSSL= 2.0.14
+VERSION_MODSSL= 2.1.3
RESTRICTED= "Contains cryptography"
@@ -98,7 +112,7 @@ SSL= ssl
pre-patch:
@cd \${WRKDIR}/mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE} \\
&& \${ECHO_MSG} "===> Applying mod_ssl-\${VERSION_MODSSL} extension" \\
- && ./configure --with-apache=../\${DISTNAME}
+ && ./configure --with-apache=../\${DISTNAME} --expert
post-patch:
@cd \${WRKSRC} \\
@@ -106,12 +120,15 @@ post-patch:
post-build:
@cd \${WRKSRC} \\
+ && \${ECHO_MSG} "===> Creating Dummy Certificate for Server (SnakeOil)" \\
+ && \${ECHO_MSG} " [use 'make certificate' to create a real one]" \\
&& \${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