From owner-svn-ports-all@freebsd.org Sun Aug 5 20:13:03 2018 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 DA58A105CACF; Sun, 5 Aug 2018 20:13:02 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8709F75E1F; Sun, 5 Aug 2018 20:13:02 +0000 (UTC) (envelope-from dbaio@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 64C2C22F80; Sun, 5 Aug 2018 20:13:02 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w75KD2o5044164; Sun, 5 Aug 2018 20:13:02 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w75KD2Dt044162; Sun, 5 Aug 2018 20:13:02 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201808052013.w75KD2Dt044162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sun, 5 Aug 2018 20:13:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476472 - head/www/tomcat9 X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: head/www/tomcat9 X-SVN-Commit-Revision: 476472 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.27 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: Sun, 05 Aug 2018 20:13:03 -0000 Author: dbaio Date: Sun Aug 5 20:13:01 2018 New Revision: 476472 URL: https://svnweb.freebsd.org/changeset/ports/476472 Log: www/tomcat9: Fix plist when using options HOST_MANAGER and MANAGER PR: 229973 Submitted by: VVD (maintainer) Modified: head/www/tomcat9/Makefile head/www/tomcat9/pkg-plist Modified: head/www/tomcat9/Makefile ============================================================================== --- head/www/tomcat9/Makefile Sun Aug 5 20:11:49 2018 (r476471) +++ head/www/tomcat9/Makefile Sun Aug 5 20:13:01 2018 (r476472) @@ -3,7 +3,7 @@ PORTNAME= tomcat PORTVERSION= 9.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 9 @@ -53,13 +53,19 @@ post-install: @${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat (cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\ for f in $$(find . -type f); do ${MV} $$f $$f.sample; done) + +post-install-HOST_MANAGER-on: (cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\ - for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml \ - manager/META-INF/context.xml manager/WEB-INF/web.xml; do \ + for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \ ${MV} $$f $$f.sample; done) post-install-HOST_MANAGER-off: @${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager + +post-install-MANAGER-on: + (cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\ + for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \ + ${MV} $$f $$f.sample; done) post-install-MANAGER-off: @${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager Modified: head/www/tomcat9/pkg-plist ============================================================================== --- head/www/tomcat9/pkg-plist Sun Aug 5 20:11:49 2018 (r476471) +++ head/www/tomcat9/pkg-plist Sun Aug 5 20:13:01 2018 (r476472) @@ -591,16 +591,16 @@ %%EXAMPLES%%%%T%%/webapps/examples/websocket/echo.xhtml %%EXAMPLES%%%%T%%/webapps/examples/websocket/index.xhtml %%EXAMPLES%%%%T%%/webapps/examples/websocket/snake.xhtml -@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml.sample +%%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/META-INF/context.xml.sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp -@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml.sample +%%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/web.xml.sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/tomcat.gif %%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp %%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml -@sample %%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml.sample +%%MANAGER%%@sample %%T%%/webapps/manager/META-INF/context.xml.sample %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/401.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/403.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/404.jsp @@ -609,7 +609,7 @@ %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp -@sample %%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml.sample +%%MANAGER%%@sample %%T%%/webapps/manager/WEB-INF/web.xml.sample %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg %%MANAGER%%%%T%%/webapps/manager/images/tomcat.gif %%MANAGER%%%%T%%/webapps/manager/index.jsp