From owner-svn-ports-all@freebsd.org Mon Jul 1 07:49:27 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BD1C15D82FA; Mon, 1 Jul 2019 07:49:27 +0000 (UTC) (envelope-from tobik@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 A6E856A7EB; Mon, 1 Jul 2019 07:49:26 +0000 (UTC) (envelope-from tobik@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 7EE579EFB; Mon, 1 Jul 2019 07:49:26 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x617nQon080676; Mon, 1 Jul 2019 07:49:26 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x617nQ1L080675; Mon, 1 Jul 2019 07:49:26 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201907010749.x617nQ1L080675@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 1 Jul 2019 07:49:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505550 - head/devel/gitblit X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/devel/gitblit X-SVN-Commit-Revision: 505550 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A6E856A7EB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.90 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.90)[-0.899,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jul 2019 07:49:27 -0000 Author: tobik Date: Mon Jul 1 07:49:26 2019 New Revision: 505550 URL: https://svnweb.freebsd.org/changeset/ports/505550 Log: www/gitblit: Drop non-default TOMCAT8 option www/tomcat8 is expiring. PR: 238542 Approved by: freebsd@dussan.org (maintainer timeout, ~2.5 weeks) Modified: head/devel/gitblit/Makefile Modified: head/devel/gitblit/Makefile ============================================================================== --- head/devel/gitblit/Makefile Mon Jul 1 07:43:32 2019 (r505549) +++ head/devel/gitblit/Makefile Mon Jul 1 07:49:26 2019 (r505550) @@ -34,10 +34,9 @@ OPTIONS_RADIO= SQL WEBSERVER OPTIONS_SINGLE= TOMCAT OPTIONS_RADIO_SQL= REDIS OPTIONS_RADIO_WEBSERVER=APACHE HIAWATHA LIGHTTPD NGINX -OPTIONS_SINGLE_TOMCAT= TOMCAT6 TOMCAT7 TOMCAT8 +OPTIONS_SINGLE_TOMCAT= TOMCAT6 TOMCAT7 HIAWATHA_DESC= Hiawatha server support NGINX_DESC= Nginx server support -TOMCAT8_DESC= Tomcat 8.x support OPTIONS_DEFAULT= TOMCAT7 REDIS_RUN_DEPENDS= redis-server:databases/redis @@ -59,9 +58,6 @@ RUN_DEPENDS+= ${LOCALBASE}/etc/rc.d/tomcat6:www/tomcat .elif ${PORT_OPTIONS:MTOMCAT7} GB_HOME= ${PREFIX}/apache-tomcat-7.0/webapps/${PORTNAME} RUN_DEPENDS+= ${LOCALBASE}/etc/rc.d/tomcat7:www/tomcat7 -.elif ${PORT_OPTIONS:MTOMCAT8} -GB_HOME= ${PREFIX}/apache-tomcat-8.0/webapps/${PORTNAME} -RUN_DEPENDS+= ${LOCALBASE}/etc/rc.d/tomcat8:www/tomcat8 .endif do-extract: