From owner-svn-ports-all@freebsd.org  Sun Aug 11 21:17:37 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id C5037C2D98;
 Sun, 11 Aug 2019 21:17:37 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 466BdY4mvbz4P3k;
 Sun, 11 Aug 2019 21:17:37 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8139E1C3BD;
 Sun, 11 Aug 2019 21:17:37 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7BLHbCc084258;
 Sun, 11 Aug 2019 21:17:37 GMT (envelope-from rene@FreeBSD.org)
Received: (from rene@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7BLHbLF084257;
 Sun, 11 Aug 2019 21:17:37 GMT (envelope-from rene@FreeBSD.org)
Message-Id: <201908112117.x7BLHbLF084257@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rene set sender to
 rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 11 Aug 2019 21:17:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r508674 - head/graphics/deegree-wfs
X-SVN-Group: ports-head
X-SVN-Commit-Author: rene
X-SVN-Commit-Paths: head/graphics/deegree-wfs
X-SVN-Commit-Revision: 508674
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Aug 2019 21:17:37 -0000

Author: rene
Date: Sun Aug 11 21:17:37 2019
New Revision: 508674
URL: https://svnweb.freebsd.org/changeset/ports/508674

Log:
  graphics/deegree-wfs: drop support for EOL Tomcat6, bump PORTREVISION

Modified:
  head/graphics/deegree-wfs/Makefile

Modified: head/graphics/deegree-wfs/Makefile
==============================================================================
--- head/graphics/deegree-wfs/Makefile	Sun Aug 11 21:07:04 2019	(r508673)
+++ head/graphics/deegree-wfs/Makefile	Sun Aug 11 21:17:37 2019	(r508674)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wfs
 PORTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
@@ -27,26 +27,14 @@ PLIST_SUB=	TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWO
 SUB_FILES=	pkg-message
 SUB_LIST=	TCPORT=${TCPORT}
 
-OPTIONS_SINGLE=	AS
-OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
-OPTIONS_DEFAULT=	TOMCAT6
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTOMCAT6}
-TOMCATVER=	apache-tomcat-6.0
-TCPORT=		8180
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
-RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
-.endif
-
-.if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
-.endif
 
 post-extract:
 	@${MKDIR} ${WRKDIR}/${PKGBASE}