svn commit: r504073 - head/devel/opengrok

[Tobias Kortkamp]

Author: tobik
Date: Thu Jun 13 09:30:01 2019
New Revision: 504073
URL: https://svnweb.freebsd.org/changeset/ports/504073

Log:
  devel/opengrok: Remove TOMCAT8 option, enable TOMCAT85 by default
  
  www/tomcat8 is expiring on 2019-06-30 and has been EOL for ~1 year.
  
  - Remove superfluous TOMCAT85_DESC while here
  
  PR:		230326

Modified:
  head/devel/opengrok/Makefile

Modified: head/devel/opengrok/Makefile
==============================================================================
--- head/devel/opengrok/Makefile	Thu Jun 13 09:04:51 2019	(r504072)
+++ head/devel/opengrok/Makefile	Thu Jun 13 09:30:01 2019	(r504073)
@@ -2,6 +2,7 @@
 
 PORTNAME=	opengrok
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/OpenGrok/OpenGrok/releases/download/${PORTVERSION}/
 
@@ -29,15 +30,11 @@ PLIST_SUB=	T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		AS
-OPTIONS_SINGLE_AS=	TOMCAT85 TOMCAT8 TOMCAT7 TOMCAT6 RESIN3
-OPTIONS_DEFAULT=	TOMCAT8
+OPTIONS_SINGLE_AS=	TOMCAT85 TOMCAT7 TOMCAT6 RESIN3
+OPTIONS_DEFAULT=	TOMCAT85
 
-TOMCAT8_DESC=		Tomcat 8.x support
-TOMCAT85_DESC=		Tomcat 8.5.x support
-
 TOMCAT6_VARS=	WEBAPP_HOME=${LOCALBASE}/apache-tomcat-6.0
 TOMCAT7_VARS=	WEBAPP_HOME=${LOCALBASE}/apache-tomcat-7.0
-TOMCAT8_VARS=	WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.0
 TOMCAT85_VARS=	WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.5
 RESIN3_VARS=	WEBAPP_HOME=${LOCALBASE}/resin3
 
@@ -45,8 +42,6 @@ TOMCAT6_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.ja
 TOMCAT6_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6
 TOMCAT7_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7
 TOMCAT7_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7
-TOMCAT8_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat8
-TOMCAT8_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat8
 TOMCAT85_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85
 TOMCAT85_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85
 RESIN3_BUILD_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:www/resin3