mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-31 05:41:08 +00:00
Code Issues Releases Activity

- Package installation fixed for exec's

Browse Source 
- Account for local web.xml file
- portrevision Bump (pkg-plist change)

PR:		ports/163032
Submitted by:	Jason Helfman <jhelfman@experts-exchange.com> (maintainer)
Feature safe:	yes
This commit is contained in:
Eitan Adler 2011-12-03 08:29:29 +00:00
parent 843a3ad7dc
commit 4555f14058
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=286798
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/axis2/Makefile
View File

@ -6,7 +6,7 @@
PORTNAME= axis2
PORTVERSION= 1.6.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= axis/${PORTNAME}/java/core/${PORTVERSION}/
@ -67,8 +67,10 @@ PORTEXAMPLES= *
do-install:
( ${MKDIR} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib && cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib)
( cd ${WRKSRC}/webapp && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME} )
( ${MKDIR} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes && cd ${WRKSRC}/webapp/WEB-INF/classes && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes )$
( ${MKDIR} ${APPHOME}/webapps/${PORTNAME}/axis2-web && cd ${WRKSRC}/webapp/axis2-web && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/axis2-web )
( cd ${WRKSRC}/repository && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/WEB-INF )
@${CHOWN} ${SHAREGRP}:${SHAREOWN} ${APPHOME}/webapps/${PORTNAME}
@install -d -g ${SHAREGRP} -o ${SHAREOWN} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf
@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
| while read a; do \
@ -81,6 +83,14 @@ do-install:
fi; \
done
${INSTALL_DATA} ${WRKSRC}/conf/*.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf
${MV} ${WRKSRC}/webapp/WEB-INF/web.xml ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT}
@if [ ! -e "${APPHOME}/webapps/axis2/WEB-INF/web.xml" ]; then \
${ECHO_MSG} " Installing local configuration file: ${APPHOME}/webapps/WEB-INF/web.xml"; \
${INSTALL_DATA} ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml; \
else \
${ECHO_MSG} " Preserving local configuration file: ${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml"; \
fi;
${INSTALL_DATA} ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF
.if !defined(NOPORTEXAMPLES)
cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \;
cd ${WRKSRC}/samples && ${FIND} . -type f -not -name '*.class' -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;

13
www/axis2/pkg-plist
View File

@ -2,6 +2,7 @@
@unexec if cmp -s %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml.%%CONF_EXT%%; then rm -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml; fi
@unexec if cmp -s %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties.%%CONF_EXT%%; then rm -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties; fi
@unexec if cmp -s %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties.%%CONF_EXT%%; then rm -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties; fi
@unexec if cmp -s %D%/%%APPHOME%%/webapps/axis2/WEB-INF/web.xml %D%/%%APPHOME%%/webapps/axis2/WEB-INF/web.xml.%%CONF_EXT%%; then rm -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/web.xml; fi
%%APPHOME%%/webapps/axis2/WEB-INF/lib/XmlSchema-1.4.7.jar
%%APPHOME%%/webapps/axis2/WEB-INF/lib/XmlSchema-LICENSE.txt
%%APPHOME%%/webapps/axis2/WEB-INF/lib/activation-1.1.jar
@ -117,13 +118,13 @@
%%APPHOME%%/webapps/axis2/WEB-INF/lib/xmlbeans-2.3.0.jar
%%APPHOME%%/webapps/axis2/WEB-INF/lib/xmlbeans-LICENSE.txt
%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy.%%CONF_EXT%%
@exec if [ ! -f %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy ]; then cp %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy.%%CONF_EXT%% %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy; fi
@exec if [ ! -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy ]; then cp %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy.%%CONF_EXT%% %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy; fi
%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml.%%CONF_EXT%%
@exec if [ ! -f %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml ]; then cp %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml.%%CONF_EXT%% %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml; fi
@exec if [ ! -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml ]; then cp %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml.%%CONF_EXT%% %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml; fi
%%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties.%%CONF_EXT%%
@exec if [ ! -f %%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties ]; then cp %%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties.%%CONF_EXT%% %%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties; fi
@exec if [ ! -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties ]; then cp %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties.%%CONF_EXT%% %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties; fi
%%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties.%%CONF_EXT%%
@exec if [ ! -f %%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties ]; then cp %%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties.%%CONF_EXT%% %%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties; fi
@exec if [ ! -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties ]; then cp %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties.%%CONF_EXT%% %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties; fi
%%APPHOME%%/webapps/axis2/WEB-INF/classes/META-INF/LICENSE
%%APPHOME%%/webapps/axis2/WEB-INF/classes/META-INF/NOTICE
%%APPHOME%%/webapps/axis2/WEB-INF/classes/commons-logging.properties
@ -131,7 +132,8 @@
%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/transport/http/AxisAdminServlet.class
%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/webapp/AdminAgent.class
%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/webapp/AxisAdminServlet.class
%%APPHOME%%/webapps/axis2/WEB-INF/web.xml
%%APPHOME%%/webapps/axis2/WEB-INF/web.xml.%%CONF_EXT%%
@exec if [ ! -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/web.xml ]; then cp %D%/%%APPHOME%%/webapps/axis2/WEB-INF/web.xml.%%CONF_EXT%% %D%/%%APPHOME%%/webapps/axis2/WEB-INF/web.xml; fi
%%APPHOME%%/webapps/axis2/axis2-web/ActivateService.jsp
%%APPHOME%%/webapps/axis2/axis2-web/EngageToServiceGroup.jsp
%%APPHOME%%/webapps/axis2/axis2-web/Error/AuthError.html
@ -183,7 +185,6 @@
%%APPHOME%%/webapps/axis2/axis2-web/viewServiceContext.jsp
%%APPHOME%%/webapps/axis2/axis2-web/viewServiceGroupContext.jsp
%%APPHOME%%/webapps/axis2/axis2-web/viewphases.jsp
%%APPHOME%%/webapps/axis2/build.xml
%%APPHOME%%/webapps/axis2/WEB-INF/modules/addressing-1.6.1.mar
%%APPHOME%%/webapps/axis2/WEB-INF/modules/mex-1.6.1.mar
%%APPHOME%%/webapps/axis2/WEB-INF/modules/modules.list