diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2004-01-09 23:11:17 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2004-01-09 23:11:17 +0000 |
| commit | 7433b9218c52d69fddba3c202381c87670046206 (patch) | |
| tree | 09444e9c03508abd11859247b6424f0e27fc98b6 /www | |
| parent | Update to 2004.01.09. (diff) | |
Mark apache2 as broken when devel/apr is installed and WITH_APR_FROM_PORTS
is not defined.
This workaround should avoid weird apache behaviours when apache is
linked against the wrong apr* libraries.
Time to add CONFLICTS_BUILD option to bsd.port.mk ?
Approved by: erwin (mentor) (implicity)
Notes
Notes:
svn path=/head/; revision=97816
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 26 | ||||
| -rw-r--r-- | www/apache20/Makefile | 26 |
2 files changed, 32 insertions, 20 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index ee695f8166e2..c9e0bb9b0ef6 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -74,16 +74,6 @@ 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} @@ -100,6 +90,22 @@ CONFIGURE_ARGS+= --with-ldap \ .include <bsd.port.pre.mk> +# 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 +.else +. if exists(${LOCALBASE}/lib/libapr-0.so) +BROKEN= "apr is installed and may conflict with apache one\ + (if you want to use apr port define WITH_APR_FROM_PORTS,\ + at your own risk)" +. endif +.endif + .include "${APACHEDIR}/Makefile.doc" .include "${APACHEDIR}/Makefile.modules" diff --git a/www/apache20/Makefile b/www/apache20/Makefile index ee695f8166e2..c9e0bb9b0ef6 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -74,16 +74,6 @@ 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} @@ -100,6 +90,22 @@ CONFIGURE_ARGS+= --with-ldap \ .include <bsd.port.pre.mk> +# 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 +.else +. if exists(${LOCALBASE}/lib/libapr-0.so) +BROKEN= "apr is installed and may conflict with apache one\ + (if you want to use apr port define WITH_APR_FROM_PORTS,\ + at your own risk)" +. endif +.endif + .include "${APACHEDIR}/Makefile.doc" .include "${APACHEDIR}/Makefile.modules" |