From owner-svn-ports-all@freebsd.org Mon Feb 17 10:43:53 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CD76254C0D; Mon, 17 Feb 2020 10:43:53 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48LgZc6x8Kz3JSp; Mon, 17 Feb 2020 10:43:52 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E669F5B55; Mon, 17 Feb 2020 10:43:52 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01HAhqHC020400; Mon, 17 Feb 2020 10:43:52 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01HAhqoC020396; Mon, 17 Feb 2020 10:43:52 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <202002171043.01HAhqoC020396@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 17 Feb 2020 10:43:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r526359 - in branches/2020Q1/www: tomcat85 tomcat9 X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in branches/2020Q1/www: tomcat85 tomcat9 X-SVN-Commit-Revision: 526359 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Feb 2020 10:43:53 -0000 Author: koobs Date: Mon Feb 17 10:43:51 2020 New Revision: 526359 URL: https://svnweb.freebsd.org/changeset/ports/526359 Log: MFH: r526349 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 Approved by: VVD Approved by: ports-secteam (blanket: ports compliance, bugfixes) Modified: branches/2020Q1/www/tomcat85/Makefile branches/2020Q1/www/tomcat85/pkg-plist branches/2020Q1/www/tomcat9/Makefile branches/2020Q1/www/tomcat9/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/tomcat85/Makefile ============================================================================== --- branches/2020Q1/www/tomcat85/Makefile Mon Feb 17 10:16:51 2020 (r526358) +++ branches/2020Q1/www/tomcat85/Makefile Mon Feb 17 10:43:51 2020 (r526359) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 8.5.49 +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 Modified: branches/2020Q1/www/tomcat85/pkg-plist ============================================================================== --- branches/2020Q1/www/tomcat85/pkg-plist Mon Feb 17 10:16:51 2020 (r526358) +++ branches/2020Q1/www/tomcat85/pkg-plist Mon Feb 17 10:43:51 2020 (r526359) @@ -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: branches/2020Q1/www/tomcat9/Makefile ============================================================================== --- branches/2020Q1/www/tomcat9/Makefile Mon Feb 17 10:16:51 2020 (r526358) +++ branches/2020Q1/www/tomcat9/Makefile Mon Feb 17 10:43:51 2020 (r526359) @@ -3,7 +3,7 @@ PORTNAME= tomcat PORTVERSION= 9.0.29 -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 Modified: branches/2020Q1/www/tomcat9/pkg-plist ============================================================================== --- branches/2020Q1/www/tomcat9/pkg-plist Mon Feb 17 10:16:51 2020 (r526358) +++ branches/2020Q1/www/tomcat9/pkg-plist Mon Feb 17 10:43:51 2020 (r526359) @@ -63,11 +63,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