update to version 0.3.2

6 files changed, 234 insertions, 30 deletions

diff --git a/net-im/ruby-xmpp4r/Makefile b/net-im/ruby-xmpp4r/Makefile
index 279c3303acbb..b299962990ed 100644
--- a/net-im/ruby-xmpp4r/Makefile
+++ b/net-im/ruby-xmpp4r/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmpp4r
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	net-im ruby
 MASTER_SITES=	http://download.gna.org/xmpp4r/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ COMMENT=	XMPP/Jabber library for Ruby
 USE_RUBY=	YES
 USE_RUBY_RDOC=	YES
 
-LIB_FILES=	lib/xmpp4r.rb lib/callbacks.rb lib/xmpp4r
+LIB_FILES=	lib/xmpp4r.rb lib/xmpp4r/callbacks.rb lib/xmpp4r
 DOCS=		ChangeLog LICENSE README UPDATING
 EXAMPLES=	basic advanced
 
diff --git a/net-im/ruby-xmpp4r/distinfo b/net-im/ruby-xmpp4r/distinfo
index 6dda229ea773..7f109c813eea 100644
--- a/net-im/ruby-xmpp4r/distinfo
+++ b/net-im/ruby-xmpp4r/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/xmpp4r-0.3.1.tgz) = f3ad568b40e50d737eb41b609d34be0c
-SHA256 (ruby/xmpp4r-0.3.1.tgz) = 80a10019510e597c6a7441d349b9779629319b1434d652873ebed5f3d0703fac
-SIZE (ruby/xmpp4r-0.3.1.tgz) = 122364
+MD5 (ruby/xmpp4r-0.3.2.tgz) = 3b5321c4b8dab96e822545c321eb6510
+SHA256 (ruby/xmpp4r-0.3.2.tgz) = e8f3f780b166e40bcf248dc630b41de142eb2794838e10d32b74a16b35b85b01
+SIZE (ruby/xmpp4r-0.3.2.tgz) = 133020
diff --git a/net-im/ruby-xmpp4r/pkg-plist b/net-im/ruby-xmpp4r/pkg-plist
index e5c2dc023ba6..a23a7dc2f543 100644
--- a/net-im/ruby-xmpp4r/pkg-plist
+++ b/net-im/ruby-xmpp4r/pkg-plist
@@ -17,6 +17,29 @@
 %%RUBY_SITELIBDIR%%/xmpp4r/roster/x/roster.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/roster/helper/roster.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/roster/iq/roster.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas/subscription.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas/event.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas/item.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas/items.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/helper/nodebrowser.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/helper/nodehelper.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/helper/servicehelper.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/iq/pubsub.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/httpbinding/client.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/muc/iq/mucowner.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc/helper/client.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc/helper/xmlrpcaddons.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc/helper/server.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc/iq/rpc.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/command/helper/responder.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/command/iq/command.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/semaphore.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/httpbinding.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/xmppstanza.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/callbacks.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/xmppelement.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/feature_negotiation/iq/feature.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/bytestreams/helper/socks5bytestreams/base.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/bytestreams/helper/socks5bytestreams/socks5.rb
@@ -44,7 +67,6 @@
 %%RUBY_SITELIBDIR%%/xmpp4r/error.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/debuglog.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/message.rb
-%%RUBY_SITELIBDIR%%/xmpp4r/xmlstanza.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/rexmladdons.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/bytestreams.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/errorexception.rb
@@ -59,6 +81,7 @@
 %%RUBY_SITELIBDIR%%/xmpp4r/query.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/dataforms.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/iq.rb
+
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/LICENSE
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
@@ -107,7 +130,6 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/error_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/debuglog_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/message_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/xmlstanza_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rexmladdons_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/bytestreams_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/errorexception_rb.html
@@ -122,12 +144,31 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/query_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/dataforms_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/iq_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/callbacks_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command/helper/responder_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command/iq/command_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/httpbinding/client_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/httpbinding_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc/iq/mucowner_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/helper/nodebrowser_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/helper/nodehelper_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/helper/servicehelper_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/iq/pubsub_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas/event_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas/item_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas/items_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas/subscription_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/helper/client_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/helper/server_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/helper/xmlrpcaddons_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/iq/rpc_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/semaphore_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/xmppelement_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/xmppstanza_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/callbacks_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/Text.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/Attribute.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/IOSource.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/XPathParser.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/Element.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Vcard/IqVcard.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Vcard/Helper.html
@@ -184,7 +225,6 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FileTransfer/TransferSource.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FileTransfer/FileSource.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FileTransfer/Helper.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/XMLStanza.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/IdGenerator.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/X.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/StreamParser.html
@@ -211,8 +251,37 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Dataforms.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Vcard.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Message.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/CallbackList.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Callback.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Callback.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/CallbackList.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Command.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Command/IqCommand.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Command/Responder.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/HTTPBinding.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/HTTPBinding/Client.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/MUC/IqQueryMUCOwner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/NoNameXmlnsRegistered.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/Event.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/IqPubSub.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/IqPubSubOwner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/Item.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/Items.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/NodeBrowser.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/NodeHelper.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/ServiceHelper.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/Subscription.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC/Client.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC/IqQueryRPC.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC/Server.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Roster/RosterX.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Roster/RosterXItem.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Semaphore.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/XMPPElement.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/XMPPStanza.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/XParent.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/XMLRPC.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/XMLRPC/Create.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/fr_file_index.html
@@ -221,6 +290,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/created.rid
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/rdoc-style.css
+
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/remove_registration.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/change_password.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/rosterrename.rb
@@ -230,7 +300,6 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/component.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/mucinfo.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/jabbersend.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/echo_nonthreaded.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/register.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/rosterprint.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/client.rb
@@ -238,6 +307,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/versionbot.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/echo_threaded.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/send_vcard.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/muc_owner_config.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/shellmgr/shellmgr_test.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/shellmgr/shellmgr_jabber.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/shellmgr/shellmgr.rb
@@ -260,6 +330,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/xmppingrc.sample
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/rosterdiscovery.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/versionpoll.rb
+
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/version/helper
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/version/iq
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/version
@@ -269,14 +340,26 @@
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/vcard/helper
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/vcard
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/muc/x
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/muc/iq
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/muc/helper
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/muc
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/command/helper
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/command/iq
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/command
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/pubsub/helper
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/pubsub/iq
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/pubsub
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/rpc/iq
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/rpc/helper
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/rpc
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/delay/x
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/delay
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/roster/x
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/roster/helper
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/roster/iq
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/roster
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/httpbinding
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/feature_negotiation/iq
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/feature_negotiation
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/bytestreams/helper/socks5bytestreams
@@ -287,17 +370,27 @@
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/dataforms/x
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/dataforms
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r
+
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/version/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/version/helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/version
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/vcard/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/vcard/helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/vcard
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/iq
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/helper
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/httpbinding
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/roster/x
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/roster/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/roster/helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/roster
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/iq
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/helper
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc/x
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc/helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/feature_negotiation/iq
@@ -308,6 +401,9 @@
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/delay
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/dataforms/x
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/dataforms
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command/iq
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command/helper
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/bytestreams/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/bytestreams/helper/socks5bytestreams
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/bytestreams/helper/ibb
@@ -316,6 +412,7 @@
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/XMLRPC
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Version
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Vcard
@@ -323,17 +420,22 @@
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/SASL
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Roster/Helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Roster
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/MUC
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/HTTPBinding
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FileTransfer
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FeatureNegotiation
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Discovery
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Delay
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Dataforms
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Command
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Bytestreams
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%
+
 @dirrm %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic
 @dirrm %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/shellmgr
 @dirrm %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/adventure
diff --git a/net-im/rubygem-xmpp4r/Makefile b/net-im/rubygem-xmpp4r/Makefile
index 279c3303acbb..b299962990ed 100644
--- a/net-im/rubygem-xmpp4r/Makefile
+++ b/net-im/rubygem-xmpp4r/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmpp4r
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	net-im ruby
 MASTER_SITES=	http://download.gna.org/xmpp4r/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ COMMENT=	XMPP/Jabber library for Ruby
 USE_RUBY=	YES
 USE_RUBY_RDOC=	YES
 
-LIB_FILES=	lib/xmpp4r.rb lib/callbacks.rb lib/xmpp4r
+LIB_FILES=	lib/xmpp4r.rb lib/xmpp4r/callbacks.rb lib/xmpp4r
 DOCS=		ChangeLog LICENSE README UPDATING
 EXAMPLES=	basic advanced
 
diff --git a/net-im/rubygem-xmpp4r/distinfo b/net-im/rubygem-xmpp4r/distinfo
index 6dda229ea773..7f109c813eea 100644
--- a/net-im/rubygem-xmpp4r/distinfo
+++ b/net-im/rubygem-xmpp4r/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/xmpp4r-0.3.1.tgz) = f3ad568b40e50d737eb41b609d34be0c
-SHA256 (ruby/xmpp4r-0.3.1.tgz) = 80a10019510e597c6a7441d349b9779629319b1434d652873ebed5f3d0703fac
-SIZE (ruby/xmpp4r-0.3.1.tgz) = 122364
+MD5 (ruby/xmpp4r-0.3.2.tgz) = 3b5321c4b8dab96e822545c321eb6510
+SHA256 (ruby/xmpp4r-0.3.2.tgz) = e8f3f780b166e40bcf248dc630b41de142eb2794838e10d32b74a16b35b85b01
+SIZE (ruby/xmpp4r-0.3.2.tgz) = 133020
diff --git a/net-im/rubygem-xmpp4r/pkg-plist b/net-im/rubygem-xmpp4r/pkg-plist
index e5c2dc023ba6..a23a7dc2f543 100644
--- a/net-im/rubygem-xmpp4r/pkg-plist
+++ b/net-im/rubygem-xmpp4r/pkg-plist
@@ -17,6 +17,29 @@
 %%RUBY_SITELIBDIR%%/xmpp4r/roster/x/roster.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/roster/helper/roster.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/roster/iq/roster.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas/subscription.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas/event.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas/item.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas/items.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/helper/nodebrowser.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/helper/nodehelper.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/helper/servicehelper.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub/iq/pubsub.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/httpbinding/client.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/muc/iq/mucowner.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc/helper/client.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc/helper/xmlrpcaddons.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc/helper/server.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc/iq/rpc.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/command/helper/responder.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/command/iq/command.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/semaphore.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/pubsub.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/httpbinding.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/xmppstanza.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/rpc.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/callbacks.rb
+%%RUBY_SITELIBDIR%%/xmpp4r/xmppelement.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/feature_negotiation/iq/feature.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/bytestreams/helper/socks5bytestreams/base.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/bytestreams/helper/socks5bytestreams/socks5.rb
@@ -44,7 +67,6 @@
 %%RUBY_SITELIBDIR%%/xmpp4r/error.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/debuglog.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/message.rb
-%%RUBY_SITELIBDIR%%/xmpp4r/xmlstanza.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/rexmladdons.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/bytestreams.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/errorexception.rb
@@ -59,6 +81,7 @@
 %%RUBY_SITELIBDIR%%/xmpp4r/query.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/dataforms.rb
 %%RUBY_SITELIBDIR%%/xmpp4r/iq.rb
+
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/LICENSE
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
@@ -107,7 +130,6 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/error_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/debuglog_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/message_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/xmlstanza_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rexmladdons_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/bytestreams_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/errorexception_rb.html
@@ -122,12 +144,31 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/query_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/dataforms_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/iq_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/callbacks_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command/helper/responder_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command/iq/command_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/httpbinding/client_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/httpbinding_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc/iq/mucowner_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/helper/nodebrowser_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/helper/nodehelper_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/helper/servicehelper_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/iq/pubsub_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas/event_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas/item_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas/items_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas/subscription_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/helper/client_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/helper/server_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/helper/xmlrpcaddons_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/iq/rpc_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/semaphore_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/xmppelement_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/xmppstanza_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/callbacks_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/Text.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/Attribute.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/IOSource.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/XPathParser.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML/Element.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Vcard/IqVcard.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Vcard/Helper.html
@@ -184,7 +225,6 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FileTransfer/TransferSource.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FileTransfer/FileSource.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FileTransfer/Helper.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/XMLStanza.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/IdGenerator.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/X.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/StreamParser.html
@@ -211,8 +251,37 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Dataforms.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Vcard.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Message.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/CallbackList.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Callback.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Callback.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/CallbackList.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Command.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Command/IqCommand.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Command/Responder.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/HTTPBinding.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/HTTPBinding/Client.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/MUC/IqQueryMUCOwner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/NoNameXmlnsRegistered.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/Event.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/IqPubSub.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/IqPubSubOwner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/Item.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/Items.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/NodeBrowser.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/NodeHelper.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/ServiceHelper.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub/Subscription.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC/Client.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC/IqQueryRPC.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC/Server.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Roster/RosterX.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Roster/RosterXItem.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Semaphore.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/XMPPElement.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/XMPPStanza.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/XParent.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/XMLRPC.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/XMLRPC/Create.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/fr_file_index.html
@@ -221,6 +290,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/created.rid
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/rdoc-style.css
+
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/remove_registration.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/change_password.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/rosterrename.rb
@@ -230,7 +300,6 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/component.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/mucinfo.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/jabbersend.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/echo_nonthreaded.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/register.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/rosterprint.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/client.rb
@@ -238,6 +307,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/versionbot.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/echo_threaded.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/send_vcard.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/muc_owner_config.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/shellmgr/shellmgr_test.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/shellmgr/shellmgr_jabber.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/shellmgr/shellmgr.rb
@@ -260,6 +330,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/xmppingrc.sample
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/rosterdiscovery.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/versionpoll.rb
+
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/version/helper
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/version/iq
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/version
@@ -269,14 +340,26 @@
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/vcard/helper
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/vcard
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/muc/x
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/muc/iq
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/muc/helper
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/muc
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/command/helper
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/command/iq
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/command
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/pubsub/helper
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/pubsub/stanzas
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/pubsub/iq
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/pubsub
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/rpc/iq
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/rpc/helper
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/rpc
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/delay/x
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/delay
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/roster/x
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/roster/helper
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/roster/iq
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/roster
+@dirrm %%RUBY_SITELIBDIR%%/xmpp4r/httpbinding
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/feature_negotiation/iq
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/feature_negotiation
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/bytestreams/helper/socks5bytestreams
@@ -287,17 +370,27 @@
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/dataforms/x
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r/dataforms
 @dirrm %%RUBY_SITELIBDIR%%/xmpp4r
+
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/version/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/version/helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/version
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/vcard/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/vcard/helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/vcard
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/iq
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc/helper
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/rpc
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/httpbinding
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/roster/x
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/roster/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/roster/helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/roster
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/stanzas
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/iq
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub/helper
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/pubsub
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc/x
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc/helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/muc
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/feature_negotiation/iq
@@ -308,6 +401,9 @@
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/delay
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/dataforms/x
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/dataforms
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command/iq
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command/helper
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/command
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/bytestreams/iq
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/bytestreams/helper/socks5bytestreams
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r/bytestreams/helper/ibb
@@ -316,6 +412,7 @@
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib/xmpp4r
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files/lib
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/files
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/XMLRPC
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/REXML
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Version
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Vcard
@@ -323,17 +420,22 @@
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/SASL
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Roster/Helper
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Roster
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/RPC
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/PubSub
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/MUC
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/HTTPBinding
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FileTransfer
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/FeatureNegotiation
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Discovery
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Delay
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Dataforms
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Command
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber/Bytestreams
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes/Jabber
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc/classes
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc
 @dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%
+
 @dirrm %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic
 @dirrm %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/shellmgr
 @dirrm %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced/adventure