aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2018-07-26 16:12:04 +0000
committerSteve Wills <swills@FreeBSD.org>2018-07-26 16:12:04 +0000
commit45b5c370d79da0e91b3be70247242be59a21882d (patch)
treea830edbe9e473fd9fdf1085e546e2a40ac3eb8d5 /www
parent5eaaaa1a6aeb1395083b0c710523934b43dfa406 (diff)
downloadports-45b5c370d79da0e91b3be70247242be59a21882d.tar.gz
ports-45b5c370d79da0e91b3be70247242be59a21882d.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/tomcat85/Makefile8
-rw-r--r--www/tomcat85/pkg-plist8
2 files changed, 10 insertions, 6 deletions
diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
index 829af68f897a..08fc07a6de98 100644
--- a/www/tomcat85/Makefile
+++ b/www/tomcat85/Makefile
@@ -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
diff --git a/www/tomcat85/pkg-plist b/www/tomcat85/pkg-plist
index 019d20403b56..1c03011bff0a 100644
--- a/www/tomcat85/pkg-plist
+++ b/www/tomcat85/pkg-plist
@@ -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