- Update to 1.6.2

- shorten MASTER_SITES
- move default to tomcat6

Changes: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10611&version=12317875
Sponsored by: Experts-Exchange, LLC.

3 files changed, 40 insertions, 39 deletions

diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index 8d7afb4de565..e6981ed3f546 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	axis2
-PORTVERSION=	1.6.1
-PORTREVISION=	3
+PORTVERSION=	1.6.2
 CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	axis/${PORTNAME}/java/core/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
@@ -21,8 +20,8 @@ USE_ZIP=	yes
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
-OPTIONS=		TOMCAT5 "Enable Tomcat 5.x support"     on \
-			TOMCAT6 "Enable Tomcat 6.x support"     off \
+OPTIONS=		TOMCAT5 "Enable Tomcat 5.x support"     off \
+			TOMCAT6 "Enable Tomcat 6.x support"     on \
 			TOMCAT7 "Enable Tomcat 7.x support"     off
 
 .include <bsd.port.options.mk>
diff --git a/www/axis2/distinfo b/www/axis2/distinfo
index 2241734bc83f..30635b336d1b 100644
--- a/www/axis2/distinfo
+++ b/www/axis2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (axis2-1.6.1-bin.zip) = c4cc091d53b5596ade4810376bbb6a5f060f85713bfee3c76e44a404714117a8
-SIZE (axis2-1.6.1-bin.zip) = 20417941
+SHA256 (axis2-1.6.2-bin.zip) = d79d0432402c922acbcfbcff81a17f65c510165b01941810c5a5e919c276260a
+SIZE (axis2-1.6.2-bin.zip) = 20592286
diff --git a/www/axis2/pkg-plist b/www/axis2/pkg-plist
index d08d45b5d714..ffaa07e5ea16 100644
--- a/www/axis2/pkg-plist
+++ b/www/axis2/pkg-plist
@@ -9,34 +9,36 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/activation-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/antlr-2-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/antlr-2.7.7.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-1.2.12.jar
+%%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-api-1.2.13.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-1.2.12.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-1.2.13.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.12.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.13.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-codegen-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-ant-plugin-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-clustering-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-codegen-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-corba-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-fastinfoset-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-java2wsdl-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxbri-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxws-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jibx-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-json-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-kernel-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-metadata-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-mtompolicy-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-saaj-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-soapmonitor-servlet-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-spring-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-http-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-local-1.6.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-xmlbeans-1.6.1.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-codegen-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-ant-plugin-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-clustering-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-codegen-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-corba-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-fastinfoset-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-java2wsdl-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxbri-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxws-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jibx-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-json-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-kernel-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-metadata-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-mtompolicy-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-saaj-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-soapmonitor-servlet-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-spring-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-http-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-local-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-xmlbeans-1.6.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/bcel-5.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/bcel-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-cli-1.2.jar
@@ -94,8 +96,8 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/log4j-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/mail-1.4.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/mail-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/mex-1.6.1-impl.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/neethi-3.0.1.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/mex-1.6.2-impl.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/neethi-3.0.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/neethi-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/regexp-1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/regexp-LICENSE.txt
@@ -185,13 +187,13 @@
 %%APPHOME%%/webapps/axis2/axis2-web/viewServiceContext.jsp
 %%APPHOME%%/webapps/axis2/axis2-web/viewServiceGroupContext.jsp
 %%APPHOME%%/webapps/axis2/axis2-web/viewphases.jsp
-%%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/addressing-1.6.2.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/mex-1.6.2.mar
 %%APPHOME%%/webapps/axis2/WEB-INF/modules/modules.list
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/mtompolicy-1.6.1.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/ping-1.6.1.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/scripting-1.6.1.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/soapmonitor-1.6.1.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/mtompolicy-1.6.2.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/ping-1.6.2.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/scripting-1.6.2.mar
+%%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