Date: Sat, 01 Feb 2020 23:50:50 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 243648] www/tomcat85: Clean up port Message-ID: <bug-243648-7788-zP3ZZNws7H@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-243648-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-243648-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D243648 --- Comment #2 from VVD <vvd@unislabs.com> --- Comment on attachment 211101 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D211101 Patch against /usr/ports >Index: www/tomcat85/Makefile >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- www/tomcat85/Makefile (revision 524249) >+++ www/tomcat85/Makefile (working copy) >@@ -50,36 +50,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} >=20 > 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) >=20 > 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) >=20 >-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 >=20 > .include <bsd.port.mk> >Index: www/tomcat85/pkg-plist >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- www/tomcat85/pkg-plist (revision 524249) >+++ www/tomcat85/pkg-plist (working copy) >@@ -60,11 +60,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 --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-243648-7788-zP3ZZNws7H>