Attachment 211305 Details for Bug 243648 – www/tomcat9

[patch] www/tomcat9

tomcat9-cleanup.patch (text/plain), 2.26 KB, created by Michael Osipov on 2020-02-02 21:46:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2020-02-02 21:46:33 UTC

Size: 2.26 KB

patch

obsolete

>Index: www/tomcat9/Makefile
>===================================================================
>--- www/tomcat9/Makefile	(revision 525004)
>+++ www/tomcat9/Makefile	(working copy)
>@@ -52,36 +52,21 @@
> do-install:
> 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
> 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
>-	${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
>+	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
> 
> 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}/conf &&\
>+		for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done)
> 
> post-install-HOST_MANAGER-on:
>-	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
>+	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
> 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \
> 			${MV} $$f $$f.sample; done)
> 
>-post-install-HOST_MANAGER-off:
>-	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager
>-
> post-install-MANAGER-on:
>-	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
>+	@(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
> 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
> 			${MV} $$f $$f.sample; done)
>-
>-post-install-MANAGER-off:
>-	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager
>-
>-post-install-DOCS-off:
>-	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/docs
>-
>-post-install-EXAMPLES-off:
>-	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/examples
>-
>-post-install-ROOT-off:
>-	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/ROOT
> 
> .include <bsd.port.mk>
>Index: www/tomcat9/pkg-plist
>===================================================================
>--- www/tomcat9/pkg-plist	(revision 525004)
>+++ www/tomcat9/pkg-plist	(working copy)
>@@ -64,11 +64,11 @@
> @sample %%T%%/conf/catalina.properties.sample
> @sample %%T%%/conf/context.xml.sample
> @sample %%T%%/conf/jaspic-providers.xml.sample
>-@sample %%T%%/conf/jaspic-providers.xsd.sample
>+%%T%%/conf/jaspic-providers.xsd
> @sample %%T%%/conf/logging.properties.sample
> @sample %%T%%/conf/server.xml.sample
> @sample %%T%%/conf/tomcat-users.xml.sample
>-@sample %%T%%/conf/tomcat-users.xsd.sample
>+%%T%%/conf/tomcat-users.xsd
> @sample %%T%%/conf/web.xml.sample
> %%T%%/temp/safeToDelete.tmp
> %%DOCS%%%%T%%/webapps/docs/BUILDING.txt

Flags:

koobs: maintainer-approval? (vvd)

Actions: View | Diff

Attachments on bug 243648: 211101 | 211305