- Update to 4.5.1 [1]

- Convert to optionsNG and add DOCS,EXAMPLES options
- Add some pkg-plist entries not present in submitted patch
- Fix PORTDOCS,PORTEXAMPLES dirrm in pkg-plist
- Replace hardcoded DATADIR and DOCSDIR paths in pkg-plist

PR:		ports/169508 [1]
Submitted by:	Kurt Jaeger <fbsd-ports@opsec.eu> (maintainer)
Approved by:	culot (mentor)

3 files changed, 132 insertions, 126 deletions

diff --git a/devel/soapui/Makefile b/devel/soapui/Makefile
index 0c675a3f423d..74ec814373b8 100644
--- a/devel/soapui/Makefile
+++ b/devel/soapui/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	soapui
-PORTVERSION=	4.5.0
+PORTVERSION=	4.5.1
 CATEGORIES=	devel java www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/4.5/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/4.5.1/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-linux-bin
 
 MAINTAINER=	fbsd-ports@opsec.eu
@@ -17,20 +17,25 @@ USE_ZIP=	YES
 USE_JAVA=	1.5+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 REINPLACE_ARGS=	-i ''
-SOAPUI_HOME=	${JAVASHAREDIR}/${PORTNAME}
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-build:
-	${REINPLACE_CMD} -e 's:%%SOAPUI_HOME%%:${SOAPUI_HOME}:' \
+	${REINPLACE_CMD} -e 's:%%SOAPUI_HOME%%:${DATADIR}:' \
 			-e 's:%%JAVA%%:${JAVA}:' ${WRKSRC}/bin/${PORTNAME}.sh
+
+.include <bsd.port.options.mk>
+
 do-install:
 .for dir in bin lib
-	( cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${SOAPUI_HOME}/${dir} )
+	( cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${DATADIR}/${dir} )
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}.sh ${PREFIX}/bin
-.if	!defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	( cd ${WRKSRC}/Tutorials && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/Tutorials )
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .	for i in ${PORTDOCS}
 		${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
diff --git a/devel/soapui/distinfo b/devel/soapui/distinfo
index d1612d0d18cc..15309b595fca 100644
--- a/devel/soapui/distinfo
+++ b/devel/soapui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (soapui-4.5.0-linux-bin.zip) = 4ff68dd9d60cb751314314640494115beaf6a802693bdca30d8cf931506fa937
-SIZE (soapui-4.5.0-linux-bin.zip) = 106472014
+SHA256 (soapui-4.5.1-linux-bin.zip) = cf02977020f17c0ce0fc0e4bb540279336f7f7210f09d6f8e71b9f2066fc62d5
+SIZE (soapui-4.5.1-linux-bin.zip) = 106489976
diff --git a/devel/soapui/pkg-plist b/devel/soapui/pkg-plist
index 0b38f46b2597..30a05c497521 100644
--- a/devel/soapui/pkg-plist
+++ b/devel/soapui/pkg-plist
@@ -64,120 +64,121 @@ bin/soapui.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials/restexample/NewsSearchService/V1/search_files/yschx_20061102.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials/restexample/NewsSearchService/V1/search_files/yschx_nws_20050610a.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials/sample-soapui-project.xml
-share/java/soapui/bin/ext/readme.txt
-share/java/soapui/bin/loadtestrunner.sh
-share/java/soapui/bin/mockservicerunner.sh
-share/java/soapui/bin/securitytestrunner.sh
-share/java/soapui/bin/soapui-4.5.0.jar
-share/java/soapui/bin/soapui-log4j.xml
-share/java/soapui/bin/soapui.sh
-share/java/soapui/bin/soapui.sh.orig
-share/java/soapui/bin/soapui32.png
-share/java/soapui/bin/starter-page.html
-share/java/soapui/bin/testrunner.sh
-share/java/soapui/bin/toolrunner.sh
-share/java/soapui/bin/wargenerator.sh
-share/java/soapui/lib/MozillaInterfaces-3.0.jar
-share/java/soapui/lib/activation-1.1.jar
-share/java/soapui/lib/bcprov-jdk15-144.jar
-share/java/soapui/lib/binding-2.0.1.jar
-share/java/soapui/lib/cajo-1.142.jar
-share/java/soapui/lib/commons-beanutils-1.7.0.jar
-share/java/soapui/lib/commons-cli-1.0.jar
-share/java/soapui/lib/commons-codec-1.3.jar
-share/java/soapui/lib/commons-collections-3.2.1.jar
-share/java/soapui/lib/commons-httpclient-3.1.jar
-share/java/soapui/lib/commons-io-1.3.2.jar
-share/java/soapui/lib/commons-lang-2.4.jar
-share/java/soapui/lib/commons-logging-1.1.1.jar
-share/java/soapui/lib/cssparser-0.9.5.jar
-share/java/soapui/lib/engine-gecko-3.0.jar
-share/java/soapui/lib/engine-ie-3.0.jar
-share/java/soapui/lib/engine-webkit-3.0.jar
-share/java/soapui/lib/ext-xmlbeans-1.2.jar
-share/java/soapui/lib/ezmorph-1.0.5.jar
-share/java/soapui/lib/flex-messaging-common-1.0.jar
-share/java/soapui/lib/flex-messaging-core-1.0.jar
-share/java/soapui/lib/flex-messaging-opt-1.0.jar
-share/java/soapui/lib/flex-messaging-proxy-1.0.jar
-share/java/soapui/lib/flex-messaging-remoting-1.0.jar
-share/java/soapui/lib/forms-1.0.7.jar
-share/java/soapui/lib/groovy-all-1.8.0.jar
-share/java/soapui/lib/guava-11.0.jar
-share/java/soapui/lib/hermes-1.14.jar
-share/java/soapui/lib/htmlunit-2.7.jar
-share/java/soapui/lib/htmlunit-core-js-2.7.jar
-share/java/soapui/lib/httpclient-4.1.1.jar
-share/java/soapui/lib/httpclient-cache-4.1.1.jar
-share/java/soapui/lib/httpcore-4.1.1.jar
-share/java/soapui/lib/httpcore-nio-4.1.1.jar
-share/java/soapui/lib/httpmime-4.1.1.jar
-share/java/soapui/lib/j2ee-xmlbeans-1.4.jar
-share/java/soapui/lib/javamail-1.4.jar
-share/java/soapui/lib/jcifs-1.2.9.jar
-share/java/soapui/lib/jetty-6.1.26.jar
-share/java/soapui/lib/jetty-util-6.1.26.jar
-share/java/soapui/lib/jms-1.1.jar
-share/java/soapui/lib/joda-time-1.6.2.jar
-share/java/soapui/lib/js-1.7R2.jar
-share/java/soapui/lib/json-lib-2.2.2-jdk15.jar
-share/java/soapui/lib/jsr173_1.0_api-xmlbeans-2.4.0.jar
-share/java/soapui/lib/jtidy-r872-jdk15.jar
-share/java/soapui/lib/junit-4.8.2.jar
-share/java/soapui/lib/jxbrowser-3.0.jar
-share/java/soapui/lib/l2fprod-common-directorychooser-7.3.jar
-share/java/soapui/lib/l2fprod-common-fontchooser-7.3.jar
-share/java/soapui/lib/log4j-1.2.14.jar
-share/java/soapui/lib/looks-2.2.0.jar
-share/java/soapui/lib/mockito-all-1.8.5.jar
-share/java/soapui/lib/nekohtml-1.9.14.jar
-share/java/soapui/lib/not-yet-commons-ssl-0.3.11.jar
-share/java/soapui/lib/opensaml-2.5.1.jar
-share/java/soapui/lib/openws-1.4.2-1.jar
-share/java/soapui/lib/policy-xmlbeans-1.5.jar
-share/java/soapui/lib/rsyntaxtextarea-2.0.1.jar
-share/java/soapui/lib/sac-1.3.jar
-share/java/soapui/lib/saxon-9.1.0.8j.jar
-share/java/soapui/lib/saxon-dom-9.1.0.8j.jar
-share/java/soapui/lib/serializer-2.7.1.jar
-share/java/soapui/lib/servlet-api-2.5-20081211.jar
-share/java/soapui/lib/slf4j-api-1.5.8.jar
-share/java/soapui/lib/slf4j-log4j12-1.5.8.jar
-share/java/soapui/lib/soap-xmlbeans-1.2.jar
-share/java/soapui/lib/soapui-xmlbeans-4.5.0.jar
-share/java/soapui/lib/swingx-soapui.jar
-share/java/soapui/lib/wadl-xmlbeans-1.1.jar
-share/java/soapui/lib/winpack-3.8.2.jar
-share/java/soapui/lib/ws-commons-util-1.0.2.jar
-share/java/soapui/lib/wsdl4j-1.6.2-fixed.jar
-share/java/soapui/lib/wss4j-1.6.2.jar
-share/java/soapui/lib/xalan-2.7.1.jar
-share/java/soapui/lib/xbean-fixed-2.4.0.jar
-share/java/soapui/lib/xbean_xpath-2.4.0.jar
-share/java/soapui/lib/xercesImpl-2.9.1.jar
-share/java/soapui/lib/xml-apis-2.9.1.jar
-share/java/soapui/lib/xmlpublic-2.4.0.jar
-share/java/soapui/lib/xmlsec-1.4.5.jar
-share/java/soapui/lib/xmltooling-1.3.1.jar
-share/java/soapui/lib/xmlunit-1.2.jar
-share/java/soapui/lib/xom-1.1.jar
-share/java/soapui/lib/xstream-1.3.1.jar
-share/java/soapui/lib/xulrunner-linux-3.0.jar
-share/java/soapui/lib/xulrunner-linux64-3.0.jar
-share/java/soapui/lib/xulrunner-mac-3.0.jar
-share/java/soapui/lib/xulrunner-windows-3.0.jar
-@dirrm share/java/soapui/lib
-@dirrm share/java/soapui/bin/listeners
-@dirrm share/java/soapui/bin/ext
-@dirrm share/java/soapui/bin/actions
-@dirrm share/java/soapui/bin
-@dirrm share/java/soapui
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials/restexample/NewsSearchService/V1/search_files
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials/restexample/NewsSearchService/V1
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials/restexample/NewsSearchService
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials/restexample
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials/WSDL-WADL
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tutorials
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%
-@dirrm share/doc/soapui/licenses
-@dirrm share/doc/soapui
+%%DATADIR%%/bin/ext/readme.txt
+%%DATADIR%%/bin/loadtestrunner.sh
+%%DATADIR%%/bin/mockservicerunner.sh
+%%DATADIR%%/bin/securitytestrunner.sh
+%%DATADIR%%/bin/soapui-4.5.1.jar
+%%DATADIR%%/bin/soapui-log4j.xml
+%%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
+%%DATADIR%%/bin/wargenerator.sh
+%%DATADIR%%/lib/MozillaInterfaces-3.0.jar
+%%DATADIR%%/lib/activation-1.1.jar
+%%DATADIR%%/lib/bcprov-jdk15-144.jar
+%%DATADIR%%/lib/binding-2.0.1.jar
+%%DATADIR%%/lib/cajo-1.142.jar
+%%DATADIR%%/lib/commons-beanutils-1.7.0.jar
+%%DATADIR%%/lib/commons-cli-1.0.jar
+%%DATADIR%%/lib/commons-codec-1.3.jar
+%%DATADIR%%/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/lib/commons-httpclient-3.1.jar
+%%DATADIR%%/lib/commons-io-1.3.2.jar
+%%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/ezmorph-1.0.5.jar
+%%DATADIR%%/lib/flex-messaging-common-1.0.jar
+%%DATADIR%%/lib/flex-messaging-core-1.0.jar
+%%DATADIR%%/lib/flex-messaging-opt-1.0.jar
+%%DATADIR%%/lib/flex-messaging-proxy-1.0.jar
+%%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/hermes-1.14.jar
+%%DATADIR%%/lib/htmlunit-2.7.jar
+%%DATADIR%%/lib/htmlunit-core-js-2.7.jar
+%%DATADIR%%/lib/httpclient-4.1.1.jar
+%%DATADIR%%/lib/httpclient-cache-4.1.1.jar
+%%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/jcifs-1.2.9.jar
+%%DATADIR%%/lib/jetty-6.1.26.jar
+%%DATADIR%%/lib/jetty-util-6.1.26.jar
+%%DATADIR%%/lib/jms-1.1.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/jtidy-r872-jdk15.jar
+%%DATADIR%%/lib/junit-4.8.2.jar
+%%DATADIR%%/lib/jxbrowser-3.0.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/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/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/swingx-soapui.jar
+%%DATADIR%%/lib/wadl-xmlbeans-1.1.jar
+%%DATADIR%%/lib/winpack-3.8.2.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
+%%DATADIR%%/lib/xalan-2.7.1.jar
+%%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-2.9.1.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
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/bin/listeners
+@dirrm %%DATADIR%%/bin/ext
+@dirrm %%DATADIR%%/bin/actions
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%
+@dirrmtry %%JAVASHAREDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Tutorials/restexample/NewsSearchService/V1/search_files
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Tutorials/restexample/NewsSearchService/V1
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Tutorials/restexample/NewsSearchService
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Tutorials/restexample
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Tutorials/WSDL-WADL
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Tutorials
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/licenses
+%%PORTDOCS%%@dirrm %%DOCSDIR%%