2 files changed, 12 insertions, 50 deletions

diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index 889782815133..506989a61537 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 
 USES=		cpe zip
 CPE_VENDOR=	apache
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
 OPTIONS_SINGLE=	AS
@@ -52,23 +52,15 @@ do-install:
 	( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes && cd ${WRKSRC}/webapp/WEB-INF/classes && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes )$
 	( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/axis2-web && cd ${WRKSRC}/webapp/axis2-web && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/axis2-web )
 	( cd ${WRKSRC}/repository && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF )
-	@${CHOWN} ${SHAREGRP}:${SHAREOWN} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}
-	@${INSTALL} -d -g ${SHAREGRP} -o ${SHAREOWN} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf
-	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
-		| while read a; do \
-			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
-			${ECHO_CMD} "@unexec if cmp -s ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a.${CONF_EXT}; then rm -f ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a; fi" >> ${TMPPLIST}; \
-			${ECHO_CMD} "@exec cp -n ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a" >> ${TMPPLIST}; \
-		done
-	${INSTALL_DATA} ${WRKSRC}/conf/*.${CONF_EXT} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf
-	${MV} ${WRKSRC}/webapp/WEB-INF/web.xml ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT}
-	${INSTALL_DATA} ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF
-	${ECHO_CMD} "${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT}"
-	${ECHO_CMD} "@unexec if cmp -s ${APPHOME}/webapps/axis2/WEB-INF/web.xml ${APPHOME}/webapps/axis2/WEB-INF/web.xml.${CONF_EXT}; then rm -f ${APPHOME}/webapps/axis2/WEB-INF/web.xml; fi" >> ${TMPPLIST}
-	${ECHO_CMD} "@exec cp -n ${APPHOME}/webapps/axis2/WEB-INF/web.xml.${CONF_EXT} ${APPHOME}/webapps/axis2/WEB-INF/web.xml" >> ${TMPPLIST}
+	${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf
+.for f in axis2.policy axis2.xml commons-logging.properties log4j.properties
+	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf/${f}.sample
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/webapp/WEB-INF/web.xml ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml.sample
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \;
+	${FIND} -s ${STAGEDIR}${EXAMPLESDIR} -type d -empty -delete
 	cd ${WRKSRC}/samples && ${FIND} . -type f -not -name '*.class' -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
 .endif
 
diff --git a/www/axis2/pkg-plist b/www/axis2/pkg-plist
index ffaa07e5ea16..22136ea6bf8e 100644
--- a/www/axis2/pkg-plist
+++ b/www/axis2/pkg-plist
@@ -1,8 +1,3 @@
-@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
@@ -119,14 +114,10 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xml-resolver-LICENSE.txt
 %%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
-%%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
-%%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
-%%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
+@sample %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy.sample
+@sample %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml.sample
+@sample %%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties.sample
+@sample %%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties.sample
 %%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
@@ -134,8 +125,7 @@
 %%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.%%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
+@sample %%APPHOME%%/webapps/axis2/WEB-INF/web.xml.sample
 %%APPHOME%%/webapps/axis2/axis2-web/ActivateService.jsp
 %%APPHOME%%/webapps/axis2/axis2-web/EngageToServiceGroup.jsp
 %%APPHOME%%/webapps/axis2/axis2-web/Error/AuthError.html
@@ -196,23 +186,3 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/modules/soapmonitor-1.6.2.mar
 %%APPHOME%%/webapps/axis2/WEB-INF/services/services.list
 %%APPHOME%%/webapps/axis2/WEB-INF/services/version.aar
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/services
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/modules
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/conf
-@dirrmtry %%APPHOME%%/webapps/axis2/axis2-web/include
-@dirrmtry %%APPHOME%%/webapps/axis2/axis2-web/images
-@dirrmtry %%APPHOME%%/webapps/axis2/axis2-web/css
-@dirrmtry %%APPHOME%%/webapps/axis2/axis2-web/Error
-@dirrmtry %%APPHOME%%/webapps/axis2/axis2-web
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/webapp
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/transport/http
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/transport
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/classes/org
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/classes/META-INF
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/classes
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/lib/endorsed
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/lib
-@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF
-@dirrmtry %%APPHOME%%/webapps/axis2