Attachment #195590 for bug #229102

Lines 3-9 Link Here

(-)www/tomcat85/Makefile (-3 / +9 lines)
3		3
4	PORTNAME= tomcat	4	PORTNAME= tomcat
5	PORTVERSION= 8.5.30	5	PORTVERSION= 8.5.30
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= www java	7	CATEGORIES= www java
8	MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin	8	MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
9	PKGNAMESUFFIX= 85	9	PKGNAMESUFFIX= 85
Lines 53-66 Link Here
53	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat	53	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
54	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\	54	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
55	for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)	55	for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)
		56
		57	post-install-HOST_MANAGER-on:
56	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\	58	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
57	for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml \	59	for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \
58	manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
59	${MV} $$f $$f.sample; done)	60	${MV} $$f $$f.sample; done)
60		61
61	post-install-HOST_MANAGER-off:	62	post-install-HOST_MANAGER-off:
62	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager	63	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager
63		64
		65	post-install-MANAGER-on:
		66	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
		67	for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
		68	${MV} $$f $$f.sample; done)
		69
64	post-install-MANAGER-off:	70	post-install-MANAGER-off:
65	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager	71	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager
66		72




%%EXAMPLES%%%%T%%/webapps/examples/websocket/echo.xhtml
%%EXAMPLES%%%%T%%/webapps/examples/websocket/index.xhtml
%%EXAMPLES%%%%T%%/webapps/examples/websocket/snake.xhtml
%%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
%%HOST_MANAGER%%@sample %%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
%%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

%%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%%@sample %%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	@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml.sample	590	%%HOST_MANAGER%%@sample %%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	@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml.sample	594	%%HOST_MANAGER%%@sample %%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	@sample %%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml.sample	606	%%MANAGER%%@sample %%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	@sample %%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml.sample	615	%%MANAGER%%@sample %%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