- fix package installations, %D% => %D

- bump PORTREVISION

Sponsored by: Experts-Exchange, LLC.

2 files changed, 11 insertions, 11 deletions

diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index 2afe6439450b..8d7afb4de565 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	axis2
 PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	axis/${PORTNAME}/java/core/${PORTVERSION}/
diff --git a/www/axis2/pkg-plist b/www/axis2/pkg-plist
index 3ebb88220cd7..d08d45b5d714 100644
--- a/www/axis2/pkg-plist
+++ b/www/axis2/pkg-plist
@@ -1,8 +1,8 @@
-@unexec if cmp -s %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy.%%CONF_EXT%%; then rm -f %D%/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy; fi
-@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
+@unexec if cmp -s %D/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy %D/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy.%%CONF_EXT%%; then rm -f %D/%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy; fi
+@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
@@ -118,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 %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
+@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 %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
+@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 %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
+@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 %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
+@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
@@ -133,7 +133,7 @@
 %%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.%%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
+@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