diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2000-02-25 23:43:27 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2000-02-25 23:43:27 +0000 |
| commit | 76b2502c1a8d5221dd35980ded7f8a1cf7ab2acb (patch) | |
| tree | e9b0cb3abf89c0ca0c733705a10e85644405cf49 | |
| parent | -p is already included in ${MKDIR}. (diff) | |
Merge openssl related changes from apache13-php3.
Notes
Notes:
svn path=/head/; revision=26294
| -rw-r--r-- | www/mod_php4/Makefile | 6 | ||||
| -rw-r--r-- | www/mod_php4/scripts/configure.php | 14 | ||||
| -rw-r--r-- | www/mod_php5/Makefile | 6 | ||||
| -rw-r--r-- | www/mod_php5/scripts/configure.php | 14 |
4 files changed, 26 insertions, 14 deletions
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index 5286218b36d2..53f80b4d8301 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -171,4 +171,10 @@ clean: .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif + +# Modssl needs to include bsd.port.pre.mk, so correct for this situation. +.if defined(_PREMKINCLUDED) +.include <bsd.port.post.mk> +.else .include <bsd.port.mk> +.endif diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index 93cd6b666041..b639c1284e45 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -133,21 +133,21 @@ while [ "$1" ]; do PKGNAME= apache+php+mod_ssl-\${VERSION_APACHE}+\${VERSION_PHP}+\${VERSION_MODSSL} DISTFILES+= mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX} -BUILD_DEPENDS+= openssl:\${PORTSDIR}/security/openssl \\ - mm-config:\${PORTSDIR}/devel/mm \\ +USE_OPENSSL= RSA + +.include <bsd.port.pre.mk> + +BUILD_DEPENDS+= mm-config:\${PORTSDIR}/devel/mm \\ \${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm -LIB_DEPENDS+= crypto.1:\${PORTSDIR}/security/openssl \\ - ssl.1:\${PORTSDIR}/security/openssl -RUN_DEPENDS+= openssl:\${PORTSDIR}/security/openssl VERSION_MODSSL= 2.5.0 -RESTRICTED= "Contains cryptography" - CONFIGURE_ARGS+=--enable-module=ssl \\ --enable-module=define CONFIGURE_ENV+= SSL_BASE='SYSTEM' EAPI_MM='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}" +EXTRA_PATCHES+= \${PATCHDIR}/ssl_patch-aa + PLIST= \${PKGDIR}/PLIST.modssl SSL= ssl diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index 5286218b36d2..53f80b4d8301 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -171,4 +171,10 @@ clean: .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif + +# Modssl needs to include bsd.port.pre.mk, so correct for this situation. +.if defined(_PREMKINCLUDED) +.include <bsd.port.post.mk> +.else .include <bsd.port.mk> +.endif diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index 93cd6b666041..b639c1284e45 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -133,21 +133,21 @@ while [ "$1" ]; do PKGNAME= apache+php+mod_ssl-\${VERSION_APACHE}+\${VERSION_PHP}+\${VERSION_MODSSL} DISTFILES+= mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX} -BUILD_DEPENDS+= openssl:\${PORTSDIR}/security/openssl \\ - mm-config:\${PORTSDIR}/devel/mm \\ +USE_OPENSSL= RSA + +.include <bsd.port.pre.mk> + +BUILD_DEPENDS+= mm-config:\${PORTSDIR}/devel/mm \\ \${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm -LIB_DEPENDS+= crypto.1:\${PORTSDIR}/security/openssl \\ - ssl.1:\${PORTSDIR}/security/openssl -RUN_DEPENDS+= openssl:\${PORTSDIR}/security/openssl VERSION_MODSSL= 2.5.0 -RESTRICTED= "Contains cryptography" - CONFIGURE_ARGS+=--enable-module=ssl \\ --enable-module=define CONFIGURE_ENV+= SSL_BASE='SYSTEM' EAPI_MM='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}" +EXTRA_PATCHES+= \${PATCHDIR}/ssl_patch-aa + PLIST= \${PKGDIR}/PLIST.modssl SSL= ssl |