Update to 1.7.4

PR:		213792
Submitted by:	Danilo G. Baio <dbaio@bsd.com.br> (maintainer)
MFH:		2016Q4
Security:	ac18046c-9b08-11e6-8011-005056925db4

3 files changed, 17 insertions, 24 deletions

diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index 047a119f7cd..2f07710b393 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	axis2
-PORTVERSION=	1.7.3
+PORTVERSION=	1.7.4
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/axis/${PORTNAME}/java/core/${PORTVERSION}/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-bin.zip ${PORTNAME}-${PORTVERSION}-war.zip
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	dbaio@bsd.com.br
 COMMENT=	Provides a Web Services,SOAP and WSDL engine from Apache
@@ -39,17 +39,14 @@ PLIST_SUB+=	APPHOME=${APPHOME:S|^${PREFIX}/||} \
 	PORTVERSION=${PORTVERSION}
 
 do-install:
-	( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib && cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib )
-	( ${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}/WEB-INF && cd ${WRKSRC}/webapp/WEB-INF && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF )
+	( cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib )
 	( ${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 )
-	${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
-	@${TAR} -C ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/ \
-		-xf ${WRKDIR}/${PORTNAME}.war WEB-INF/include/ WEB-INF/views/
+	${MV} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml.sample
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/www/axis2/distinfo b/www/axis2/distinfo
index 5b9535a19da..8120316a82a 100644
--- a/www/axis2/distinfo
+++ b/www/axis2/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1476566283
-SHA256 (axis2-1.7.3-bin.zip) = 9605e2726af535a0bc6007dff59d6a4d03dab0c2b119b234ad1d5b34b77f5d2d
-SIZE (axis2-1.7.3-bin.zip) = 22315355
-SHA256 (axis2-1.7.3-war.zip) = 73625e6a462f93e4b996e8f78bf63286e6e071cc8e42495c5cea3d2034c2f211
-SIZE (axis2-1.7.3-war.zip) = 20191858
+TIMESTAMP = 1477438541
+SHA256 (axis2-1.7.4-bin.zip) = 84da15ac8bfe1ddf16078052cb41fc6304ef1b2f8ada86fcfcc48adcba297e0e
+SIZE (axis2-1.7.4-bin.zip) = 22701868
diff --git a/www/axis2/pkg-plist b/www/axis2/pkg-plist
index ec9777a586b..70c1352304d 100644
--- a/www/axis2/pkg-plist
+++ b/www/axis2/pkg-plist
@@ -37,10 +37,10 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/apache-mime4j-core-0.7.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/apache-mime4j-core-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-1.2.19.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-1.2.19.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.19.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-jaxb-1.2.19.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-1.2.20.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-1.2.20.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.20.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-jaxb-1.2.20.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-%%PORTVERSION%%.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-codegen-%%PORTVERSION%%.jar
@@ -100,9 +100,9 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/geronimo-ws-metadata_2.0_spec-1.1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/gson-2.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/gson-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpclient-4.2.5.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpclient-4.5.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/httpclient-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpcore-4.2.5.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpcore-4.4.4.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/httpcore-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jalopy-1.5rc3.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jalopy-LICENSE.txt
@@ -160,7 +160,9 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/modules/soapmonitor-%%PORTVERSION%%.mar
 %%APPHOME%%/webapps/axis2/WEB-INF/services/services.list
 %%APPHOME%%/webapps/axis2/WEB-INF/services/version.aar
-@mode 644
+%%APPHOME%%/webapps/axis2/WEB-INF/tags/status.tag
+%%APPHOME%%/webapps/axis2/WEB-INF/views/listFaultyService.jsp
+%%APPHOME%%/webapps/axis2/WEB-INF/views/listServices.jsp
 %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/Login.jsp
 %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/SelectService.jsp
 %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/activateService.jsp
@@ -184,7 +186,6 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/viewServiceContext.jsp
 %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/viewServiceGroupContext.jsp
 %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/viewphases.jsp
-@mode
 @sample %%APPHOME%%/webapps/axis2/WEB-INF/web.xml.sample
 %%APPHOME%%/webapps/axis2/axis2-web/Error/AuthError.html
 %%APPHOME%%/webapps/axis2/axis2-web/Error/GenError.html
@@ -199,9 +200,6 @@
 %%APPHOME%%/webapps/axis2/axis2-web/images/axis.jpg
 %%APPHOME%%/webapps/axis2/axis2-web/images/axis_l.jpg
 %%APPHOME%%/webapps/axis2/axis2-web/index.jsp
-%%APPHOME%%/webapps/axis2/axis2-web/listFaultyService.jsp
-%%APPHOME%%/webapps/axis2/axis2-web/listGroupService.jsp
-%%APPHOME%%/webapps/axis2/axis2-web/listServices.jsp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/databinding/README.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/databinding/StockQuote.xsd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/databinding/StockQuoteService.wsdl