ports/163032: [patch][maintainer-update] www/axis2: support packaged installation fix, account for local web.xml
Jason Helfman
jhelfman at experts-exchange.com
Sat Dec 3 00:40:10 UTC 2011
>Number: 163032
>Category: ports
>Synopsis: [patch][maintainer-update] www/axis2: support packaged installation fix, account for local web.xml
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 03 00:40:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011 root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Package installation fixed for exec's
Account for local web.xml file
Builds cleanly in Tinderbox => http://jgh.devio.us/files/logs/axis2-1.6.1_2.log
portrevision Bump.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/jhelfman/ncvs/ports/www/axis2/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 1 Dec 2011 20:04:07 -0000 1.4
+++ Makefile 3 Dec 2011 00:19:27 -0000
@@ -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 @@
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 @@
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}/{} \;
Index: pkg-plist
===================================================================
RCS file: /home/jhelfman/ncvs/ports/www/axis2/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist 1 Dec 2011 20:04:07 -0000 1.2
+++ pkg-plist 3 Dec 2011 00:24:14 -0000
@@ -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
+ at 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%%
- at 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
+ at 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%%
- at 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
+ at 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%%
- at 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
+ at 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%%
- at 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
+ at 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%%
+ at 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
@@ -212,4 +213,4 @@
@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/lib/endorsed
@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/lib
@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF
- at dirrmtry %%APPHOME%%/webapps/axis2
\ No newline at end of file
+ at dirrmtry %%APPHOME%%/webapps/axis2
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list