cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r526349 www/tomcat85,9: Improve port quality

Browse Source 
- 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>

Approved by:	ports-secteam (blanket: ports compliance, bugfixes)
This commit is contained in:
Kubilay Kocak 2020-02-17 10:43:51 +00:00
parent e7111d1687
commit 4e3fe60565
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=526359
4 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
www/tomcat85/Makefile
View File

@ -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 <bsd.port.mk>

4
www/tomcat85/pkg-plist
View File

@ -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

27
www/tomcat9/Makefile
View File

@ -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 <bsd.port.mk>

4
www/tomcat9/pkg-plist
View File

@ -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