Index: soapui/Makefile
===================================================================
--- soapui/Makefile	(revision 333277)
+++ soapui/Makefile	(working copy)
@@ -2,43 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	soapui
-PORTVERSION=	4.5.1
+PORTVERSION=	4.6.1
 CATEGORIES=	devel java www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/4.5.1/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-linux-bin
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+DISTNAME=	SoapUI-${PORTVERSION}-linux-bin
 
 MAINTAINER=	fbsd-ports@opsec.eu
 COMMENT=	A web service, SOA, and SOAP testing tool
 
-USE_ZIP=	YES
-USE_JAVA=	1.5+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+USE_JAVA=	1.6+
+WRKSRC=		${WRKDIR}/SoapUI-${PORTVERSION}
 REINPLACE_ARGS=	-i ''
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-NO_STAGE=	yes
-do-build:
-	${REINPLACE_CMD} -e 's:%%SOAPUI_HOME%%:${DATADIR}:' \
-			-e 's:%%JAVA%%:${JAVA}:' ${WRKSRC}/bin/${PORTNAME}.sh
+post-patch:
+	${REINPLACE_CMD} -e 's|\(SOAPUI_HOME=\).*$$|\1${DATADIR}| ; \
+		/-Dsoapui\.jxbrowser\.disable=true/s/^#// ; \
+		s|^java |exec ${JAVA} | ; /^cd $$DIRNAME/d' ${WRKSRC}/bin/*.sh
 
 .include <bsd.port.options.mk>
 
 do-install:
 .for dir in bin lib
-	( cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${DATADIR}/${dir} )
+	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}.sh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MEXAMPLES}
-	( cd ${WRKSRC}/Tutorials && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/Tutorials )
+	cd ${WRKSRC} && ${COPYTREE_SHARE} Tutorials ${STAGEDIR}${EXAMPLESDIR}
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.	for i in ${PORTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.	for i in README.md RELEASENOTES.txt
+		${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .	endfor
-	( cd ${WRKSRC}/licenses && ${COPYTREE_SHARE} . ${DOCSDIR}/licenses )
+	cd ${WRKSRC} && ${COPYTREE_SHARE} licenses ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: soapui/distinfo
===================================================================
--- soapui/distinfo	(revision 333277)
+++ soapui/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (soapui-4.5.1-linux-bin.zip) = cf02977020f17c0ce0fc0e4bb540279336f7f7210f09d6f8e71b9f2066fc62d5
-SIZE (soapui-4.5.1-linux-bin.zip) = 106489976
+SHA256 (SoapUI-4.6.1-linux-bin.tar.gz) = 29626466d41706c29cd98029c4cf98eb190292f09076e41bc437bddbdde2723d
+SIZE (SoapUI-4.6.1-linux-bin.tar.gz) = 75942695
Index: soapui/files/patch-aa
===================================================================
--- soapui/files/patch-aa	(revision 333277)
+++ soapui/files/patch-aa	(working copy)
@@ -1,63 +0,0 @@
---- bin/soapui.sh.orig	2010-03-01 17:37:32.000000000 +0100
-+++ bin/soapui.sh	2010-04-01 16:29:19.000000000 +0200
-@@ -5,25 +5,7 @@
- ##                                                                          ##
- ### ====================================================================== ###
- 
--### $Id$ ###
--
--DIRNAME=`dirname $0`
--
--# OS specific support (must be 'true' or 'false').
--cygwin=false;
--case "`uname`" in
--    CYGWIN*)
--        cygwin=true
--        ;;
--esac
--
--# Setup SOAPUI_HOME
--if [ "x$SOAPUI_HOME" = "x" ];
--then
--    # get the full path (without any relative bits)
--    SOAPUI_HOME=`cd $DIRNAME/..; pwd`
--fi
--export SOAPUI_HOME
-+export SOAPUI_HOME=%%SOAPUI_HOME%%
- 
- export SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-3.5.jar
-                     export SOAPUI_CLASSPATH=$SOAPUI_CLASSPATH:$SOAPUI_HOME/lib/activation-1.1.jar
-@@ -99,7 +81,7 @@
- 
- export SOAPUI_CLASSPATH
- 
--JAVA_OPTS="-Xms128m -Xmx1024m -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME"
-+JAVA_OPTS=" ${JAVA_OPTS} -Xms128m -Xmx384m -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME"
- 
- if [ $SOAPUI_HOME != "" ] 
- then
-@@ -110,22 +92,15 @@
- 	JAVA_OPTS="$JAVA_OPTS -Dwsi.dir=$SOAPUI_HOME/wsi-test-tools"
-     JAVA_OPTS="$JAVA_OPTS -DGRE_HOME=$SOAPUI_HOME/xulrunner-linux"
- #uncomment to disable browser component
--#   JAVA_OPTS="$JAVA_OPTS -Dsoapui.jxbrowser.disable=true"
-+    JAVA_OPTS="$JAVA_OPTS -Dsoapui.jxbrowser.disable=true"
- fi
- 
- export JAVA_OPTS
- 
--# For Cygwin, switch paths to Windows format before running java
--if [ $cygwin = "true" ] 
--then
--    SOAPUI_HOME=`cygpath --path --dos "$SOAPUI_HOME"`
--    SOAPUI_CLASSPATH=`cygpath --path --dos "$SOAPUI_CLASSPATH"`
--fi
--
- echo ================================
- echo =
- echo = SOAPUI_HOME = $SOAPUI_HOME
- echo =
- echo ================================
- 
--java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@"
-+%%JAVA%% $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@"
Index: soapui/pkg-plist
===================================================================
--- soapui/pkg-plist	(revision 333277)
+++ soapui/pkg-plist	(working copy)
@@ -1,4 +1,6 @@
 bin/soapui.sh
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/RSyntaxTextArea-LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/activation-LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/bcprov-LICENSE.txt
@@ -68,11 +70,12 @@
 %%DATADIR%%/bin/loadtestrunner.sh
 %%DATADIR%%/bin/mockservicerunner.sh
 %%DATADIR%%/bin/securitytestrunner.sh
-%%DATADIR%%/bin/soapui-4.5.1.jar
+%%DATADIR%%/bin/soapui-4.6.1.jar
+%%DATADIR%%/bin/soapui-errors.log
 %%DATADIR%%/bin/soapui-log4j.xml
+%%DATADIR%%/bin/soapui-splash.png
+%%DATADIR%%/bin/soapui.log
 %%DATADIR%%/bin/soapui.sh
-%%DATADIR%%/bin/soapui.sh.orig
-%%DATADIR%%/bin/soapui32.png
 %%DATADIR%%/bin/starter-page.html
 %%DATADIR%%/bin/testrunner.sh
 %%DATADIR%%/bin/toolrunner.sh
@@ -82,6 +85,7 @@
 %%DATADIR%%/lib/bcprov-jdk15-144.jar
 %%DATADIR%%/lib/binding-2.0.1.jar
 %%DATADIR%%/lib/cajo-1.142.jar
+%%DATADIR%%/lib/comfyj-2.9.jar
 %%DATADIR%%/lib/commons-beanutils-1.7.0.jar
 %%DATADIR%%/lib/commons-cli-1.0.jar
 %%DATADIR%%/lib/commons-codec-1.3.jar
@@ -91,10 +95,11 @@
 %%DATADIR%%/lib/commons-lang-2.4.jar
 %%DATADIR%%/lib/commons-logging-1.1.1.jar
 %%DATADIR%%/lib/cssparser-0.9.5.jar
-%%DATADIR%%/lib/engine-gecko-3.0.jar
-%%DATADIR%%/lib/engine-ie-3.0.jar
-%%DATADIR%%/lib/engine-webkit-3.0.jar
-%%DATADIR%%/lib/ext-xmlbeans-1.2.jar
+%%DATADIR%%/lib/dom4j-1.6.1.jar
+%%DATADIR%%/lib/engine-gecko-3.3.jar
+%%DATADIR%%/lib/engine-gecko15-3.3.jar
+%%DATADIR%%/lib/engine-ie-3.3.jar
+%%DATADIR%%/lib/engine-webkit-3.3.jar
 %%DATADIR%%/lib/ezmorph-1.0.5.jar
 %%DATADIR%%/lib/flex-messaging-common-1.0.jar
 %%DATADIR%%/lib/flex-messaging-core-1.0.jar
@@ -103,7 +108,8 @@
 %%DATADIR%%/lib/flex-messaging-remoting-1.0.jar
 %%DATADIR%%/lib/forms-1.0.7.jar
 %%DATADIR%%/lib/groovy-all-1.8.0.jar
-%%DATADIR%%/lib/guava-11.0.jar
+%%DATADIR%%/lib/guava-14.0.jar
+%%DATADIR%%/lib/hamcrest-core-1.1.jar
 %%DATADIR%%/lib/hermes-1.14.jar
 %%DATADIR%%/lib/htmlunit-2.7.jar
 %%DATADIR%%/lib/htmlunit-core-js-2.7.jar
@@ -112,29 +118,30 @@
 %%DATADIR%%/lib/httpcore-4.1.1.jar
 %%DATADIR%%/lib/httpcore-nio-4.1.1.jar
 %%DATADIR%%/lib/httpmime-4.1.1.jar
-%%DATADIR%%/lib/j2ee-xmlbeans-1.4.jar
-%%DATADIR%%/lib/javamail-1.4.jar
+%%DATADIR%%/lib/jaxen-1.1-beta-8.jar
 %%DATADIR%%/lib/jcifs-1.2.9.jar
+%%DATADIR%%/lib/jdom-1.0.jar
 %%DATADIR%%/lib/jetty-6.1.26.jar
 %%DATADIR%%/lib/jetty-util-6.1.26.jar
 %%DATADIR%%/lib/jms-1.1.jar
+%%DATADIR%%/lib/jniwrap-3.8.4.jar
 %%DATADIR%%/lib/joda-time-1.6.2.jar
 %%DATADIR%%/lib/js-1.7R2.jar
 %%DATADIR%%/lib/json-lib-2.2.2-jdk15.jar
-%%DATADIR%%/lib/jsr173_1.0_api-xmlbeans-2.4.0.jar
+%%DATADIR%%/lib/jsr173_api-1.0.jar
 %%DATADIR%%/lib/jtidy-r872-jdk15.jar
-%%DATADIR%%/lib/junit-4.8.2.jar
-%%DATADIR%%/lib/jxbrowser-3.0.jar
+%%DATADIR%%/lib/junit-4.10.jar
+%%DATADIR%%/lib/jxbrowser-3.3.jar
 %%DATADIR%%/lib/l2fprod-common-directorychooser-7.3.jar
 %%DATADIR%%/lib/l2fprod-common-fontchooser-7.3.jar
 %%DATADIR%%/lib/log4j-1.2.14.jar
 %%DATADIR%%/lib/looks-2.2.0.jar
-%%DATADIR%%/lib/mockito-all-1.8.5.jar
+%%DATADIR%%/lib/mail-1.4.jar
+%%DATADIR%%/lib/maven-plugin-api-2.0.jar
 %%DATADIR%%/lib/nekohtml-1.9.14.jar
 %%DATADIR%%/lib/not-yet-commons-ssl-0.3.11.jar
-%%DATADIR%%/lib/opensaml-2.5.1.jar
-%%DATADIR%%/lib/openws-1.4.2-1.jar
-%%DATADIR%%/lib/policy-xmlbeans-1.5.jar
+%%DATADIR%%/lib/opensaml-2.4.1.jar
+%%DATADIR%%/lib/openws-1.4.1.jar
 %%DATADIR%%/lib/rsyntaxtextarea-2.0.1.jar
 %%DATADIR%%/lib/sac-1.3.jar
 %%DATADIR%%/lib/saxon-9.1.0.8j.jar
@@ -141,13 +148,9 @@
 %%DATADIR%%/lib/saxon-dom-9.1.0.8j.jar
 %%DATADIR%%/lib/serializer-2.7.1.jar
 %%DATADIR%%/lib/servlet-api-2.5-20081211.jar
-%%DATADIR%%/lib/slf4j-api-1.5.8.jar
-%%DATADIR%%/lib/slf4j-log4j12-1.5.8.jar
-%%DATADIR%%/lib/soap-xmlbeans-1.2.jar
-%%DATADIR%%/lib/soapui-xmlbeans-4.5.1.jar
+%%DATADIR%%/lib/slf4j-api-1.6.1.jar
 %%DATADIR%%/lib/swingx-soapui.jar
-%%DATADIR%%/lib/wadl-xmlbeans-1.1.jar
-%%DATADIR%%/lib/winpack-3.8.2.jar
+%%DATADIR%%/lib/winpack-3.8.3.jar
 %%DATADIR%%/lib/ws-commons-util-1.0.2.jar
 %%DATADIR%%/lib/wsdl4j-1.6.2-fixed.jar
 %%DATADIR%%/lib/wss4j-1.6.2.jar
@@ -155,7 +158,9 @@
 %%DATADIR%%/lib/xbean-fixed-2.4.0.jar
 %%DATADIR%%/lib/xbean_xpath-2.4.0.jar
 %%DATADIR%%/lib/xercesImpl-2.9.1.jar
+%%DATADIR%%/lib/xml-apis-1.0.b2.jar
 %%DATADIR%%/lib/xml-apis-2.9.1.jar
+%%DATADIR%%/lib/xmlParserAPIs-2.6.2.jar
 %%DATADIR%%/lib/xmlpublic-2.4.0.jar
 %%DATADIR%%/lib/xmlsec-1.4.5.jar
 %%DATADIR%%/lib/xmltooling-1.3.1.jar
@@ -162,10 +167,8 @@
 %%DATADIR%%/lib/xmlunit-1.2.jar
 %%DATADIR%%/lib/xom-1.1.jar
 %%DATADIR%%/lib/xstream-1.3.1.jar
-%%DATADIR%%/lib/xulrunner-linux-3.0.jar
-%%DATADIR%%/lib/xulrunner-linux64-3.0.jar
-%%DATADIR%%/lib/xulrunner-mac-3.0.jar
-%%DATADIR%%/lib/xulrunner-windows-3.0.jar
+%%DATADIR%%/lib/xulrunner-linux-3.3.jar
+%%DATADIR%%/lib/xulrunner-linux64-3.3.jar
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/bin/listeners
 @dirrm %%DATADIR%%/bin/ext