svn commit: r508664 - head/www/madsonic

[Rene Ladan]

Author: rene
Date: Sun Aug 11 18:56:02 2019
New Revision: 508664
URL: https://svnweb.freebsd.org/changeset/ports/508664

Log:
  www/madsonic: remove optional dependency on expired www/tomcat6

Modified:
  head/www/madsonic/Makefile

Modified: head/www/madsonic/Makefile
==============================================================================
--- head/www/madsonic/Makefile	Sun Aug 11 18:53:02 2019	(r508663)
+++ head/www/madsonic/Makefile	Sun Aug 11 18:56:02 2019	(r508664)
@@ -16,9 +16,8 @@ LICENSE=	GPLv3
 
 OPTIONS_SINGLE=	APPSERVER
 APPSERVER_DESC=	Java Application Server
-OPTIONS_SINGLE_APPSERVER=	JETTY TOMCAT7 TOMCAT6 RESIN3
+OPTIONS_SINGLE_APPSERVER=	JETTY TOMCAT7 RESIN3
 TOMCAT7_DESC=	Use Tomcat 7.x
-TOMCAT6_DESC=	Use Tomcat 6.x
 JETTY_DESC=	Use Jetty
 RESIN3_DESC=	Use Resin 3
 
@@ -42,8 +41,6 @@ RUN_DEPENDS+=	${JAVALIBDIR}/servlet-api.jar:www/servle
 	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 TOMCAT7_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
 TOMCAT7_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
-TOMCAT6_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6
-TOMCAT6_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6
 JETTY_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
 JETTY_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
 RESIN3_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3
@@ -84,14 +81,6 @@ DISTVER=	tomcat
 PKGNAMESUFFIX=	-tomcat7
 SERVERDIR=	apache-tomcat-7.0
 SUB_LIST+=	CONTAINERFLAGS="tomcat7_java_opts"
-.endif
-
-.if ${PORT_OPTIONS:MTOMCAT6}
-APPPKGMESSAGE=	pkg-message-tomcat
-DISTVER=	tomcat
-PKGNAMESUFFIX=	-tomcat6
-SERVERDIR=	apache-tomcat-6.0
-SUB_LIST+=	CONTAINERFLAGS="tomcat60_java_opts"
 .endif
 
 .if ${PORT_OPTIONS:MJETTY}