FreeBSD Bugzilla – Attachment 195379 Details for
Bug 229102
www/tomcat85: mark additional config files with @sample
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Added requested files as samples and made small refactoring in Makefile
tomcat85_sample.diff (text/plain), 2.92 KB, created by
Vladimir Druzenko
on 2018-07-23 01:11:57 UTC
(
hide
)
Description:
Added requested files as samples and made small refactoring in Makefile
Filename:
MIME Type:
Creator:
Vladimir Druzenko
Created:
2018-07-23 01:11:57 UTC
Size:
2.92 KB
patch
obsolete
>diff -ur www/tomcat85.orig/Makefile www/tomcat85/Makefile >--- www/tomcat85.orig/Makefile >+++ www/tomcat85/Makefile >@@ -4,7 +4,7 @@ > PORTNAME= tomcat > PORTVERSION= 8.5.30 > CATEGORIES= www java >-MASTER_SITES= APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin >+MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin > PKGNAMESUFFIX= 85 > DISTNAME= apache-${PORTNAME}-${PORTVERSION} > >@@ -19,7 +19,7 @@ > CPE_VENDOR= apache > USE_JAVA= yes > JAVA_VERSION= 1.7+ >-USE_RC_SUBR= ${PKGBASE} >+USE_RC_SUBR= ${PKGBASE:C/-/_/} > > NO_ARCH= yes > NO_BUILD= yes >@@ -52,6 +52,10 @@ > @${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}/webapps &&\ >+ for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml \ >+ manager/META-INF/context.xml manager/WEB-INF/web.xml; do \ >+ ${MV} $$f $$f.sample; done) > > post-install-HOST_MANAGER-off: > @${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager >diff -ur www/tomcat85.orig/pkg-plist www/tomcat85/pkg-plist >--- www/tomcat85.orig/pkg-plist >+++ www/tomcat85/pkg-plist >@@ -587,11 +587,11 @@ > %%EXAMPLES%%%%T%%/webapps/examples/websocket/echo.xhtml > %%EXAMPLES%%%%T%%/webapps/examples/websocket/index.xhtml > %%EXAMPLES%%%%T%%/webapps/examples/websocket/snake.xhtml >-%%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml >+@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml.sample > %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp > %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp > %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp >-%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml >+@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml.sample > %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/add.gif > %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg > %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/code.gif >@@ -603,7 +603,7 @@ > %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/void.gif > %%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp > %%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml >-%%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml >+@sample %%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml.sample > %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/401.jsp > %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/403.jsp > %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/404.jsp >@@ -612,7 +612,7 @@ > %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp > %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp > %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp >-%%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml >+@sample %%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml.sample > %%MANAGER%%%%T%%/webapps/manager/images/add.gif > %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg > %%MANAGER%%%%T%%/webapps/manager/images/code.gif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
vvd
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 229102
: 195379 |
195562
|
195590