3 files changed, 22 insertions, 5 deletions

diff --git a/net/ruby-xmlrpc/Makefile b/net/ruby-xmlrpc/Makefile
index 6431a803758b..a1ecf5bcb06a 100644
--- a/net/ruby-xmlrpc/Makefile
+++ b/net/ruby-xmlrpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmlrpc
-PORTVERSION=	1.6.8
+PORTVERSION=	1.6.9
 CATEGORIES=	net ruby
 MASTER_SITES=	http://www.fantasy-coders.de/ruby/xmlrpc4r/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -15,7 +15,10 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/xmlparser.rb:${PORTSDIR}/textproc/ruby-xmlparser
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/nqxml/info.rb:${PORTSDIR}/textproc/ruby-nqxml \
+		${RUBY_SITELIBDIR}/TCPSocketPipe.rb:${PORTSDIR}/net/ruby-tcpsocketpipe
+# Alternative to ruby-nqxml:
+#		${RUBY_SITELIBDIR}/xmlparser.rb:${PORTSDIR}/textproc/ruby-xmlparser
 
 USE_RUBY=	yes
 
@@ -23,11 +26,18 @@ NO_BUILD=	yes
 
 DOCS_EN=	ChangeLog README ToDo doc/*
 
+post-extract:
+	${RM} -rf ${WRKSRC}/samples/monitor
+
+post-patch:
+	${RUBY} -i -pe '$$_ = "FILES2 = %w(GServer.rb)\n" if /^FILES2\s*=/' ${WRKSRC}/install.rb
+
 do-install:
 	cd ${WRKSRC} && ${RUBY} install.rb
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
 	${CP} -R ${WRKSRC}/samples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${LN} -sf ../tcpsocketpipe ${RUBY_EXAMPLESDIR}/${PORTNAME}/monitor
 	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
diff --git a/net/ruby-xmlrpc/distinfo b/net/ruby-xmlrpc/distinfo
index cef1bc9a95a6..65457cc3448e 100644
--- a/net/ruby-xmlrpc/distinfo
+++ b/net/ruby-xmlrpc/distinfo
@@ -1 +1 @@
-MD5 (ruby/xmlrpc4r-1_6_8.tar.gz) = 8c47714a9d3678139a5f39d7b1a69ad2
+MD5 (ruby/xmlrpc4r-1_6_9.tar.gz) = e3dee5152c4d6a869cc2a8e82e53b18d
diff --git a/net/ruby-xmlrpc/pkg-plist b/net/ruby-xmlrpc/pkg-plist
index 20beb0bffd87..52ce5b7f1bcf 100644
--- a/net/ruby-xmlrpc/pkg-plist
+++ b/net/ruby-xmlrpc/pkg-plist
@@ -1,4 +1,4 @@
-%%RUBY_SITELIBDIR%%/xmlrpc/GServer.rb
+%%RUBY_SITELIBDIR%%/GServer.rb
 %%RUBY_SITELIBDIR%%/xmlrpc/base64.rb
 %%RUBY_SITELIBDIR%%/xmlrpc/client.rb
 %%RUBY_SITELIBDIR%%/xmlrpc/config.rb
@@ -10,6 +10,9 @@
 %%RUBY_SITELIBDIR%%/xmlrpc/utils.rb
 @dirrm %%RUBY_SITELIBDIR%%/xmlrpc
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/call.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/chat/client.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/chat/client.rb.tk
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/chat/server.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/multicall.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/xml.cgi
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/xml.fcgi
@@ -19,13 +22,17 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/marshallable/client.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/marshallable/person.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/marshallable/server.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/monitor
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/perf_async.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/raa/raa.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/raa/raa_fox.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/raa/raa_test.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/raa/raa_tk.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/raa/responder.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/sandstorm/active.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/tcptunnel/tcptunnelgui.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/tcptunnel/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/xmlrpc/validator/validator1.rb
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/xmlrpc/chat
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/xmlrpc/introspection
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/xmlrpc/marshallable
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/xmlrpc/raa