From owner-svn-ports-head@freebsd.org Thu Jul 26 16:12:06 2018 Return-Path: Delivered-To: svn-ports-head@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 0BDE510538FB; Thu, 26 Jul 2018 16:12:06 +0000 (UTC) (envelope-from swills@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 B600A9648A; Thu, 26 Jul 2018 16:12:05 +0000 (UTC) (envelope-from swills@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 97198394C; Thu, 26 Jul 2018 16:12:05 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QGC5gk006989; Thu, 26 Jul 2018 16:12:05 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QGC53N006988; Thu, 26 Jul 2018 16:12:05 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201807261612.w6QGC53N006988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 26 Jul 2018 16:12:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475384 - head/www/tomcat85 X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: head/www/tomcat85 X-SVN-Commit-Revision: 475384 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.27 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: Thu, 26 Jul 2018 16:12:06 -0000 Author: swills Date: Thu Jul 26 16:12:04 2018 New Revision: 475384 URL: https://svnweb.freebsd.org/changeset/ports/475384 Log: www/tomcat85: mark additional config files with @sample PR: 229102 Submitted by: VVD (maintainer) Reported by: Michael Osipov <1983-01-06@gmx.net> Modified: head/www/tomcat85/Makefile (contents, props changed) head/www/tomcat85/pkg-plist (contents, props changed) Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Thu Jul 26 15:44:57 2018 (r475383) +++ head/www/tomcat85/Makefile Thu Jul 26 16:12:04 2018 (r475384) @@ -4,7 +4,7 @@ PORTNAME= tomcat PORTVERSION= 8.5.30 CATEGORIES= www java -MASTER_SITES= APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin +MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 DISTNAME= apache-${PORTNAME}-${PORTVERSION} @@ -19,7 +19,7 @@ USES= cpe CPE_VENDOR= apache USE_JAVA= yes JAVA_VERSION= 1.7+ -USE_RC_SUBR= ${PKGBASE} +USE_RC_SUBR= ${PKGBASE:C/-/_/} NO_ARCH= yes NO_BUILD= yes @@ -52,6 +52,10 @@ 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) + (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 \ + ${MV} $$f $$f.sample; done) post-install-HOST_MANAGER-off: @${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager Modified: head/www/tomcat85/pkg-plist ============================================================================== --- head/www/tomcat85/pkg-plist Thu Jul 26 15:44:57 2018 (r475383) +++ head/www/tomcat85/pkg-plist Thu Jul 26 16:12:04 2018 (r475384) @@ -587,11 +587,11 @@ %%EXAMPLES%%%%T%%/webapps/examples/websocket/echo.xhtml %%EXAMPLES%%%%T%%/webapps/examples/websocket/index.xhtml %%EXAMPLES%%%%T%%/webapps/examples/websocket/snake.xhtml -%%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml +@sample %%HOST_MANAGER%%%%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 -%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml +@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml.sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/add.gif %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/code.gif @@ -603,7 +603,7 @@ %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/void.gif %%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp %%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml -%%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml +@sample %%MANAGER%%%%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 @@ -612,7 +612,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 -%%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml +@sample %%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml.sample %%MANAGER%%%%T%%/webapps/manager/images/add.gif %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg %%MANAGER%%%%T%%/webapps/manager/images/code.gif