From owner-svn-ports-head@freebsd.org Sun Aug 11 21:24:00 2019 Return-Path: Delivered-To: svn-ports-head@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 0E8D9C31BB; Sun, 11 Aug 2019 21:24:00 +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 466Bmv6Yvnz4Pt8; Sun, 11 Aug 2019 21:23:59 +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 C0A5D1C57C; Sun, 11 Aug 2019 21:23:59 +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 x7BLNxKS090320; Sun, 11 Aug 2019 21:23:59 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7BLNxJV090319; Sun, 11 Aug 2019 21:23:59 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201908112123.x7BLNxJV090319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 11 Aug 2019 21:23:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508677 - head/graphics/barbecue X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: head/graphics/barbecue X-SVN-Commit-Revision: 508677 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Aug 2019 21:24:00 -0000 Author: rene Date: Sun Aug 11 21:23:59 2019 New Revision: 508677 URL: https://svnweb.freebsd.org/changeset/ports/508677 Log: graphics/barbecue: remove support for EOL tomcat6, bump PORTREVISION Modified: head/graphics/barbecue/Makefile Modified: head/graphics/barbecue/Makefile ============================================================================== --- head/graphics/barbecue/Makefile Sun Aug 11 21:21:52 2019 (r508676) +++ head/graphics/barbecue/Makefile Sun Aug 11 21:23:59 2019 (r508677) @@ -3,6 +3,7 @@ PORTNAME= barbecue DISTVERSION= 1.5-beta1 +PORTREVISION= 1 CATEGORIES= graphics print java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/ DIST_SUBDIR= java @@ -29,25 +30,13 @@ PORTEXAMPLES= * PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} -OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 -OPTIONS_DEFAULT= TOMCAT6 - OPTIONS_DEFINE= DOCS EXAMPLES .include -.if ${PORT_OPTIONS:MTOMCAT6} -TOMCATVER= apache-tomcat-6.0 -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 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 -.endif post-extract: ${MV} ${WRKSRC}/${JARFILES} ${WRKSRC}/${JARFILES:S|-${DISTVERSION}||} @@ -58,7 +47,7 @@ do-install: ${INSTALL_DATA} ${JARFILES:S|-${DISTVERSION}||:S|^|${WRKSRC}/|} \ ${STAGEDIR}${JAVAJARDIR} -.if ${PORT_OPTIONS:MTOMCAT6} || ${PORT_OPTIONS:MTOMCAT7} +.if ${PORT_OPTIONS:MTOMCAT7} ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${STAGEDIR}${WEBAPPDIR}/${PORTNAME} @(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . \ ${STAGEDIR}${WEBAPPDIR}/${PORTNAME})