From owner-freebsd-ports-bugs@freebsd.org Sat Feb 1 23:50:50 2020 Return-Path: Delivered-To: freebsd-ports-bugs@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 D747F2307DB for ; Sat, 1 Feb 2020 23:50:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4899p25NpWz4DQr for ; Sat, 1 Feb 2020 23:50:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id B70662307DA; Sat, 1 Feb 2020 23:50:50 +0000 (UTC) Delivered-To: ports-bugs@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 B6CB82307D9 for ; Sat, 1 Feb 2020 23:50:50 +0000 (UTC) (envelope-from bugzilla-noreply@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 4899p24VvQz4DQq for ; Sat, 1 Feb 2020 23:50:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9618A6F32 for ; Sat, 1 Feb 2020 23:50:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 011NookX033103 for ; Sat, 1 Feb 2020 23:50:50 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 011Nooqx033102 for ports-bugs@FreeBSD.org; Sat, 1 Feb 2020 23:50:50 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 243648] www/tomcat85: Clean up port Date: Sat, 01 Feb 2020 23:50:50 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: vvd@unislabs.com X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: ports-bugs@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback+ X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Feb 2020 23:50:50 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D243648 --- Comment #2 from VVD --- 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 >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.=