svn commit: r475384 - head/www/tomcat85

[Steve Wills]

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 <vvd at unislabs.com> (maintainer)
  Reported by:	Michael Osipov <1983-01-06 at 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
+ at 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
+ at 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
+ at 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
+ at 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