Attachment #195379 for bug #229102

Lines 4-10 Link Here

(-)www/tomcat85/Makefile (-2 / +6 lines)
4	PORTNAME= tomcat	4	PORTNAME= tomcat
5	PORTVERSION= 8.5.30	5	PORTVERSION= 8.5.30
6	CATEGORIES= www java	6	CATEGORIES= www java
7	MASTER_SITES= APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin	7	MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
8	PKGNAMESUFFIX= 85	8	PKGNAMESUFFIX= 85
9	DISTNAME= apache-${PORTNAME}-${PORTVERSION}	9	DISTNAME= apache-${PORTNAME}-${PORTVERSION}
10		10
Lines 19-25 Link Here
19	CPE_VENDOR= apache	19	CPE_VENDOR= apache
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.7+	21	JAVA_VERSION= 1.7+
22	USE_RC_SUBR= ${PKGBASE}	22	USE_RC_SUBR= ${PKGBASE:C/-/_/}
23		23
24	NO_ARCH= yes	24	NO_ARCH= yes
25	NO_BUILD= yes	25	NO_BUILD= yes
Lines 52-57 Link Here
52	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat	52	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
53	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\	53	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
54	for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)	54	for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)
		55	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
		56	for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml \
		57	manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
		58	${MV} $$f $$f.sample; done)
55		59
56	post-install-HOST_MANAGER-off:	60	post-install-HOST_MANAGER-off:
57	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager	61	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager




%%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%%%%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%%%%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

%%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
@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

%%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%%%%T%%/webapps/manager/images/add.gif
%%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg
%%MANAGER%%%%T%%/webapps/manager/images/code.gif

Return to bug 229102

Lines 587-597 Link Here

(-)www/tomcat85/pkg-plist (-4 / +4 lines)
587	%%EXAMPLES%%%%T%%/webapps/examples/websocket/echo.xhtml	587	%%EXAMPLES%%%%T%%/webapps/examples/websocket/echo.xhtml
588	%%EXAMPLES%%%%T%%/webapps/examples/websocket/index.xhtml	588	%%EXAMPLES%%%%T%%/webapps/examples/websocket/index.xhtml
589	%%EXAMPLES%%%%T%%/webapps/examples/websocket/snake.xhtml	589	%%EXAMPLES%%%%T%%/webapps/examples/websocket/snake.xhtml
590	%%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml	590	@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml.sample
591	%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp	591	%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp
592	%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp	592	%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp
593	%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp	593	%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp
594	%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml	594	@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml.sample
595	%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/add.gif	595	%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/add.gif
596	%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg	596	%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg
597	%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/code.gif	597	%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/code.gif
Lines 603-609 Link Here
603	%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/void.gif	603	%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/void.gif
604	%%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp	604	%%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp
605	%%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml	605	%%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml
606	%%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml	606	@sample %%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml.sample
607	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/401.jsp	607	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/401.jsp
608	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/403.jsp	608	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/403.jsp
609	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/404.jsp	609	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/404.jsp
Lines 612-618 Link Here
612	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp	612	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
613	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp	613	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
614	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp	614	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
615	%%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml	615	@sample %%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml.sample
616	%%MANAGER%%%%T%%/webapps/manager/images/add.gif	616	%%MANAGER%%%%T%%/webapps/manager/images/add.gif
617	%%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg	617	%%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg
618	%%MANAGER%%%%T%%/webapps/manager/images/code.gif	618	%%MANAGER%%%%T%%/webapps/manager/images/code.gif