3 files changed, 47 insertions, 35 deletions

diff --git a/net/ruby-soap/Makefile b/net/ruby-soap/Makefile
index bbdb5f9c5595..dc25917a4ed2 100644
--- a/net/ruby-soap/Makefile
+++ b/net/ruby-soap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	soap
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.4.3
 CATEGORIES=	net ruby
 MASTER_SITES=	http://www.jin.gr.jp/~nahi/Ruby/SOAP4R/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -16,10 +15,10 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/application.rb:${PORTSDIR}/sysutils/ruby-application.rb \
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/application.rb:${PORTSDIR}/sysutils/ruby-devel-logger \
 		${RUBY_SITELIBDIR}/http-access2.rb:${PORTSDIR}/www/ruby-http-access \
 		${RUBY_SITELIBDIR}/GServer.rb:${PORTSDIR}/net/ruby-gserver \
-		${RUBY_SITELIBDIR}/date3.rb:${PORTSDIR}/devel/ruby-date2 \
+		${RUBY_SITELIBDIR}/date2.rb:${PORTSDIR}/devel/ruby-date2 \
 		${RUBY_SITELIBDIR}/nqxml/info.rb:${PORTSDIR}/textproc/ruby-nqxml
 
 USE_RUBY=	yes
@@ -27,26 +26,19 @@ USE_RUBY=	yes
 NO_BUILD=	yes
 
 DOCS_EN=	RELEASE_en.html rubyStyle.css
-DOCS_JA=	RELEASE_ja.html
 
 post-extract:
 	${CP} ${WRKSRC}/redist/soap/httpserver.rb ${WRKSRC}/sample/
 
-post-patch:
-	${RUBY} -i -pe 'gsub /\brubyStyle.css\b/, "../\\1"' ${WRKSRC}/RELEASE_ja.html
-
 do-install:
 	${CP} -R ${WRKSRC}/lib/* ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
 	${CP} -R ${WRKSRC}/sample/* ${WRKSRC}/test ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
 .endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
-.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/ruby-soap/distinfo b/net/ruby-soap/distinfo
index e0e3e9ba6bc9..e307d28644f2 100644
--- a/net/ruby-soap/distinfo
+++ b/net/ruby-soap/distinfo
@@ -1 +1 @@
-MD5 (ruby/soap4r-1_4_2.tar.gz) = 99e795cd800649102616974f5063b237
+MD5 (ruby/soap4r-1_4_3.tar.gz) = b5e61a7fb1fbb86c8823c36e470e3a14
diff --git a/net/ruby-soap/pkg-plist b/net/ruby-soap/pkg-plist
index 846f97f66d98..c89f8cc090dd 100644
--- a/net/ruby-soap/pkg-plist
+++ b/net/ruby-soap/pkg-plist
@@ -19,6 +19,7 @@
 %%RUBY_SITELIBDIR%%/soap/parser.rb
 %%RUBY_SITELIBDIR%%/soap/processor.rb
 %%RUBY_SITELIBDIR%%/soap/proxy.rb
+%%RUBY_SITELIBDIR%%/soap/rexmlparser.rb
 %%RUBY_SITELIBDIR%%/soap/rpcRouter.rb
 %%RUBY_SITELIBDIR%%/soap/rpcUtils.rb
 %%RUBY_SITELIBDIR%%/soap/saxdriver.rb
@@ -28,33 +29,51 @@
 %%RUBY_SITELIBDIR%%/soap/streamHandler.rb
 %%RUBY_SITELIBDIR%%/soap/xmlparser.rb
 @dirrm %%RUBY_SITELIBDIR%%/soap
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/apacheClient.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/babelfish.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/babelfishVelociGen.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/digraph.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/hippo5tq.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/httpserver.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/hippo5tq2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/hippoClient.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/whois.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/whois2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/exchange.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/exchangeClient.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/httpd.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/soaplet.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Calc/calc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Calc/calc2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Calc/client.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Calc/client2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Calc/server.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Calc/server2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Exchange/client.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Exchange/exchange.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Exchange/iExchange.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/Exchange/server.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/ICD/IICD.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/ICD/icd.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/RAA.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/SOAP::Lite.pl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/hotpage.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/iRAA.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/pocketSOAP.js
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/raa-div.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/soap4r.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/soap4rApp.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RAA/xmlrpc4r.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RWiki/rwikiClient.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/RWiki/rwikiServer.cgi
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/SampleStruct/client.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/SampleStruct/iSampleStruct.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/SampleStruct/sampleStruct.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/SampleStruct/server.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/WSDemo/iSeminarService.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/WSDemo/server.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/WSDemo/subscription.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/apacheClient.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/babelfish.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/digraph.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/hippo5tq.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/hippo5tq2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/hippoClient.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/httpserver.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/exchange.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/exchangeClient.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/httpd.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/iExchange.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/iSampleStruct.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/sampleStruct.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/sampleStructClient.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/webrick/soaplet.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/whois.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/test/interop/README.txt
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/test/interop/base.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/test/interop/client4S4C1.3.rb
@@ -124,17 +143,18 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/test/interopR2/server.cgi
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/test/interopR2/server.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/soap/test/interopR2/simonReg.rb
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/Calc
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/Exchange
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/ICD
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/RAA
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/RWiki
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/SampleStruct
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/WSDemo
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/webrick
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/test/interopR2
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/test/interop
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/test
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/WSDemo
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/RWiki
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/RAA
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/ICD
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap/webrick
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/soap
 %%PORTDOCS%%%%RUBY_DOCDIR%%/soap/RELEASE_en.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/soap/rubyStyle.css
-%%PORTDOCS%%%%RUBY_DOCDIR%%/soap/ja/RELEASE_ja.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/soap/ja
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/soap