diff options
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 10 | ||||
| -rw-r--r-- | www/apache2/Makefile.modules | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 016f21202d60..ee695f8166e2 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -74,6 +74,16 @@ USE_OPENSSL= yes CONFIGURE_ARGS+= --enable-static-support .endif +# Untested and may fail ! +.if defined(WITH_APR_FROM_PORTS) +. if defined (WITH_BDB) || defined(WITH_BERKELEYDB) +BROKEN= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined" +.endif +LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr +CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \ + --with-apr-util=${LOCALBASE}/bin/apr-config +.endif + # for slave ports .if !defined(MASTERDIR) APACHEDIR= ${.CURDIR} diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules index a22e33382e43..a0ab7fa38106 100644 --- a/www/apache2/Makefile.modules +++ b/www/apache2/Makefile.modules @@ -42,7 +42,7 @@ PLIST_SUB+= PREFORK="@comment " WORKER="@comment " # xDBM section # .if !defined(WITH_DBM) && defined(WITH_BERKELEYDB) -WITH_DBM=db +WITH_DBM=bdb .endif .if defined(WITH_DBM) && !defined(WITH_BERKELEYDB) WITH_BERKELEYDB= FreeBSD @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-dbm=sdbm . elif ${WITH_DBM:L} == "gdbm" LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE} -. elif ${WITH_DBM:L} == "db" +. elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb" . if ${WITH_BERKELEYDB} == "FreeBSD" CONFIGURE_ARGS+= --with-dbm=db185 \ --with-berkeley-db=/usr @@ -182,6 +182,9 @@ _APACHE_MODULES+= ${WITH_CUSTOM_THREADS} _APACHE_MODULES+= ${SSL_MODULE} CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} RC_SUB+= -e 's,@@SSL@@,ssl,g' +. if ${OPENSSLBASE} == /usr && ${OSVERSION} < 500000 +CFLAGS+= -DSSL_EXPERIMENTAL_ENGINE +. endif .else RC_SUB+= -e 's,@@SSL@@,,g' .endif |