diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2005-09-20 08:39:50 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2005-09-20 08:39:50 +0000 |
| commit | d3a79088766feb4cc1364b032bd2fba5881598ec (patch) | |
| tree | 554652c014c52a679170330a1a71a9dff77793d4 | |
| parent | Add p5-CGI-Ajax 0.38, a module for writing AJAX/DHTML-based web apps. (diff) | |
- Apply openssl 0.9.8 fix by default. OpenSSL 0.9.8 is now the default
from ports
Reported by: erwin
Notes
Notes:
svn path=/head/; revision=143197
| -rw-r--r-- | www/apache2/Makefile | 6 | ||||
| -rw-r--r-- | www/apache20/Makefile | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 3d78739b5f57..44d4547d564e 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -33,6 +33,8 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* # patch files +EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta + .if defined (WITH_WINDOWSUPDATEFIX) EXTRA_PATCHES+= ${FILESDIR}/exp-windowsupdate.patch .endif @@ -45,10 +47,6 @@ IGNORE= : Please define WITH_KQUEUE_SUPPORT instead EXTRA_PATCHES+= ${FILESDIR}/exp-apr-kqueue.patch .endif -.if defined(WITH_OPENSSL_BETA) -EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta -.endif - SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ diff --git a/www/apache20/Makefile b/www/apache20/Makefile index a200c77dd2b9..0288452d68db 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -33,6 +33,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* # patch files +EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta .if defined (WITH_WINDOWSUPDATEFIX) EXTRA_PATCHES+= ${FILESDIR}/exp-windowsupdate.patch .endif @@ -45,10 +46,6 @@ IGNORE= : Please define WITH_KQUEUE_SUPPORT instead EXTRA_PATCHES+= ${FILESDIR}/exp-apr-kqueue.patch .endif -.if defined(WITH_OPENSSL_BETA) -EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta -.endif - SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ |