Date: Mon, 17 Feb 2020 08:30:00 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526349 - in head/www: tomcat85 tomcat9 Message-ID: <202002170830.01H8U0JC030452@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Mon Feb 17 08:30:00 2020 New Revision: 526349 URL: https://svnweb.freebsd.org/changeset/ports/526349 Log: www/tomcat85,9: Improve port quality - Don't echo automatic actions unlike other manual actions - Don't perform ${RM} -R because the OPTIONS system takes @comment parts in pkg-plist into account, poudriere build does not complain. - Don't provide samples for XML schema files, these are NOT intended to be modified by the user PR: 243648 Submitted by: Michael Osipov <michael.osipov siemens com> Approved by: VVD <vvd unislabs com> MFH: 2020Q1 (blanket: ports compliance, bugfixes) Modified: head/www/tomcat85/Makefile head/www/tomcat85/pkg-plist head/www/tomcat9/Makefile head/www/tomcat9/pkg-plist Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Mon Feb 17 08:00:54 2020 (r526348) +++ head/www/tomcat85/Makefile Mon Feb 17 08:30:00 2020 (r526349) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 8.5.50 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 @@ -50,36 +51,21 @@ post-patch: 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> Modified: head/www/tomcat85/pkg-plist ============================================================================== --- head/www/tomcat85/pkg-plist Mon Feb 17 08:00:54 2020 (r526348) +++ head/www/tomcat85/pkg-plist Mon Feb 17 08:30:00 2020 (r526349) @@ -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 Modified: head/www/tomcat9/Makefile ============================================================================== --- head/www/tomcat9/Makefile Mon Feb 17 08:00:54 2020 (r526348) +++ head/www/tomcat9/Makefile Mon Feb 17 08:30:00 2020 (r526349) @@ -3,7 +3,7 @@ PORTNAME= tomcat PORTVERSION= 9.0.30 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 9 @@ -52,36 +52,21 @@ post-patch: 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> Modified: head/www/tomcat9/pkg-plist ============================================================================== --- head/www/tomcat9/pkg-plist Mon Feb 17 08:00:54 2020 (r526348) +++ head/www/tomcat9/pkg-plist Mon Feb 17 08:30:00 2020 (r526349) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002170830.01H8U0JC030452>