diff options
| -rw-r--r-- | www/axis/Makefile | 4 | ||||
| -rw-r--r-- | www/extsm/Makefile | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/www/axis/Makefile b/www/axis/Makefile index b0b818f6904c..c5e70ad10d2e 100644 --- a/www/axis/Makefile +++ b/www/axis/Makefile @@ -30,10 +30,6 @@ RUN_DEPENDS+= ${LOCALBASE}/jakarta-tomcat5:${PORTSDIR}/www/jakarta-tomcat5 WEBAPPDIR= ${PREFIX}/jakarta-tomcat4.1/webapps BUILD_DEPENDS+= ${LOCALBASE}/jakarta-tomcat4.1:${PORTSDIR}/www/tomcat41 RUN_DEPENDS+= ${LOCALBASE}/jakarta-tomcat4.1:${PORTSDIR}/www/tomcat41 -.elif exists(${LOCALBASE}/jakarta-tomcat4.0.6/webapps) -WEBAPPDIR= ${PREFIX}/jakarta-tomcat4.0.6/webapps -BUILD_DEPENDS+= ${LOCALBASE}/jakarta-tomcat4.0.6:${PORTSDIR}/www/jakarta-tomcat4 -RUN_DEPENDS+= ${LOCALBASE}/jakarta-tomcat4.0.6:${PORTSDIR}/www/jakarta-tomcat4 .else WEBAPPDIR= ${PREFIX}/tomcat5.5/webapps BUILD_DEPENDS+= ${LOCALBASE}/tomcat5.5:${PORTSDIR}/www/tomcat55 diff --git a/www/extsm/Makefile b/www/extsm/Makefile index 1142ae4f17fb..948df10a027b 100644 --- a/www/extsm/Makefile +++ b/www/extsm/Makefile @@ -21,8 +21,7 @@ USE_JAVA= yes JAVA_VERSION= 1.4+ NO_BUILD= yes -OPTIONS= TOMCAT4 "Use Jakarta Tomcat 4" off \ - TOMCAT41 "Use Jakarta Tomcat 4.1" off \ +OPTIONS= TOMCAT41 "Use Jakarta Tomcat 4.1" off \ TOMCAT5 "Use Jakarta Tomcat 5" on \ TOMCAT55 "Use Jakarta Tomcat 5.55" off \ RESIN2 "Use Resin 2" off \ @@ -31,11 +30,6 @@ OPTIONS= TOMCAT4 "Use Jakarta Tomcat 4" off \ .include <bsd.port.pre.mk> WEBAPP_DIRS= #empty -.if defined(WITH_TOMCAT4) -WEBAPP_DIRS+= jakarta-tomcat4.0 -RUN_DEPENDS+= ${PREFIX}/jakarta-tomcat4.0/bin/bootstrap.jar:${PORTSDIR}/www/jakarta-tomcat4 -.endif - .if defined(WITH_TOMCAT41) WEBAPP_DIRS+= tomcat4.1 RUN_DEPENDS+= ${PREFIX}/tomcat4.1/bin/bootstrap.jar:${PORTSDIR}/www/tomcat41 |