Bug 183815 - [PATCH] devel/soapui update to 4.6.1 support staging
Summary: [PATCH] devel/soapui update to 4.6.1 support staging
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-09 17:10 UTC by Vladimir Kondratiev
Modified: 2013-11-10 10:40 UTC (History)
0 users

See Also:


Attachments
file.diff (9.74 KB, patch)
2013-11-09 17:10 UTC, Vladimir Kondratiev
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Vladimir Kondratiev 2013-11-09 17:10:00 UTC
1. update to 4.6.1
2. support staging
3. add license

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2013-11-09 17:10:08 UTC
Maintainer of devel/soapui,

Please note that PR ports/183815 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183815

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer 2013-11-09 17:10:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Kurt Jaeger 2013-11-09 20:13:40 UTC
Hi!

> Maintainer of devel/soapui,
> 
> Please note that PR ports/183815 has just been submitted.

I tested it and I approve! Thanks very much!

-- 
pi@opsec.eu            +49 171 3101372                         7 years to go !
Comment 4 William Grzybowski freebsd_committer 2013-11-09 20:15:41 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 5 William Grzybowski freebsd_committer 2013-11-10 10:30:12 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 6 dfilter service freebsd_committer 2013-11-10 10:30:17 UTC
Author: wg
Date: Sun Nov 10 10:30:08 2013
New Revision: 333371
URL: http://svnweb.freebsd.org/changeset/ports/333371

Log:
  devel/soapui: update to 4.6.1
  
  - Update to 4.6.1
  - Allow staging
  - Add LICENSE (GPLv2)
  
  PR:		ports/183815
  Submitted by:	Vladimir Kondratiev <wulf mail.mipt.ru>
  Approved by:	maintainer

Deleted:
  head/devel/soapui/files/
Modified:
  head/devel/soapui/Makefile
  head/devel/soapui/distinfo
  head/devel/soapui/pkg-plist

Modified: head/devel/soapui/Makefile
==============================================================================
--- head/devel/soapui/Makefile	Sun Nov 10 10:16:54 2013	(r333370)
+++ head/devel/soapui/Makefile	Sun Nov 10 10:30:08 2013	(r333371)
@@ -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
+COMMENT=	Web service, SOA, and SOAP testing tool
 
-USE_ZIP=	YES
-USE_JAVA=	1.5+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+LICENSE=	GPLv2
+
+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 )
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	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>

Modified: head/devel/soapui/distinfo
==============================================================================
--- head/devel/soapui/distinfo	Sun Nov 10 10:16:54 2013	(r333370)
+++ head/devel/soapui/distinfo	Sun Nov 10 10:30:08 2013	(r333371)
@@ -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

Modified: head/devel/soapui/pkg-plist
==============================================================================
--- head/devel/soapui/pkg-plist	Sun Nov 10 10:16:54 2013	(r333370)
+++ head/devel/soapui/pkg-plist	Sun Nov 10 10:30:08 2013	(r333371)
@@ -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 @@ bin/soapui.sh
 %%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 @@ bin/soapui.sh
 %%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 @@ bin/soapui.sh
 %%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 @@ bin/soapui.sh
 %%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,42 +118,39 @@ bin/soapui.sh
 %%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
 %%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,17 +158,17 @@ bin/soapui.sh
 %%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
 %%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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"