From 8f644dd76a425812edaa724440d4357f635fb7f6 Mon Sep 17 00:00:00 2001 From: clement Date: Fri, 9 Jan 2004 23:11:17 +0000 Subject: 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) --- www/apache20/Makefile | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'www/apache20') 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 +# 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" -- cgit