svn commit: r508685 - head/www/jspwiki

[Rene Ladan]

Author: rene
Date: Sun Aug 11 21:45:34 2019
New Revision: 508685
URL: https://svnweb.freebsd.org/changeset/ports/508685

Log:
  www/jspwiki: remove support for EOL tomcat6, bump PORTREVISION

Modified:
  head/www/jspwiki/Makefile

Modified: head/www/jspwiki/Makefile
==============================================================================
--- head/www/jspwiki/Makefile	Sun Aug 11 21:44:26 2019	(r508684)
+++ head/www/jspwiki/Makefile	Sun Aug 11 21:45:34 2019	(r508685)
@@ -3,7 +3,7 @@
 
 PORTNAME=	jspwiki
 PORTVERSION=	2.8.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	http://www.ecyrd.com/~jalkanen/JSPWiki/${PORTVERSION}/
 DISTNAME=	JSPWiki-${PORTVERSION}-bin
@@ -29,21 +29,11 @@ PORTDOCS=	ChangeLog README ReleaseNotes JSPWiki-*.zip
 PLIST_SUB=	TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||}
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_SINGLE=	AS
-OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
-OPTIONS_DEFAULT=	TOMCAT6
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTOMCAT6}
-TOMCATVER=	apache-tomcat-6.0
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
-.endif
-
-.if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
-.endif
 
 post-extract:
 	@${MV} ${WRKDIR}/${WEBAPP} ${WRKDIR}/${PORTNAME}