5 files changed, 54 insertions, 16 deletions

diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index 2da7bd541c24..7c4c7f3c2f28 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Net-Jabber
-PORTVERSION=	1.0020
+PORTVERSION=	1.0021
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSD
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time
 
-PERL_CONFIGURE=	YES
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::Jabber.3 \
@@ -28,6 +28,9 @@ MAN3=		Net::Jabber.3 \
 		Net::Jabber::Data.3 \
 		Net::Jabber::Data::Auth.3 \
 		Net::Jabber::Debug.3 \
+		Net::Jabber::Dialback.3 \
+		Net::Jabber::Dialback::Result.3 \
+		Net::Jabber::Dialback::Verify.3 \
 		Net::Jabber::IQ.3 \
 		Net::Jabber::JID.3 \
 		Net::Jabber::Key.3 \
@@ -45,7 +48,6 @@ MAN3=		Net::Jabber.3 \
 		Net::Jabber::Query::Filter::Rule.3 \
 		Net::Jabber::Query::Fneg.3 \
 		Net::Jabber::Query::Oob.3 \
-		Net::Jabber::X::ReplyPres.3 \
 		Net::Jabber::Query::Register.3 \
 		Net::Jabber::Query::Roster.3 \
 		Net::Jabber::Query::Roster::Item.3 \
@@ -53,15 +55,23 @@ MAN3=		Net::Jabber.3 \
 		Net::Jabber::Query::Search::Item.3 \
 		Net::Jabber::Query::Time.3 \
 		Net::Jabber::Query::Version.3 \
-		Net::Jabber::Transport.3 \
+		Net::Jabber::Server.3 \
 		Net::Jabber::X.3 \
 		Net::Jabber::X::AutoUpdate.3 \
 		Net::Jabber::X::Delay.3 \
+		Net::Jabber::X::Encrypted.3 \
+		Net::Jabber::X::Form.3 \
+		Net::Jabber::X::Form::Field.3 \
+		Net::Jabber::X::Form::Field::Option.3 \
 		Net::Jabber::X::GC.3 \
 		Net::Jabber::X::Ident.3 \
 		Net::Jabber::X::Oob.3 \
+		Net::Jabber::X::ReplyPres.3 \
 		Net::Jabber::X::Roster.3 \
 		Net::Jabber::X::Roster::Item.3 \
+		Net::Jabber::X::SXPM.3 \
+		Net::Jabber::X::SXPM::Map.3 \
+		Net::Jabber::X::Signed.3 \
 		Net::Jabber::XDB.3
 
 .include <bsd.port.mk>
diff --git a/net-im/p5-Net-Jabber/distinfo b/net-im/p5-Net-Jabber/distinfo
index 2a97236d063f..fc08b1d70ed4 100644
--- a/net-im/p5-Net-Jabber/distinfo
+++ b/net-im/p5-Net-Jabber/distinfo
@@ -1 +1 @@
-MD5 (Net-Jabber-1.0020.tar.gz) = d04cc8509a89c4c45b7d3165ed58356a
+MD5 (Net-Jabber-1.0021.tar.gz) = dfad3decf35b4ed5090e3f57b8adb7c9
diff --git a/net-im/p5-Net-Jabber/pkg-comment b/net-im/p5-Net-Jabber/pkg-comment
index b318138189d3..5bdd1b744111 100644
--- a/net-im/p5-Net-Jabber/pkg-comment
+++ b/net-im/p5-Net-Jabber/pkg-comment
@@ -1 +1 @@
-Net::Jabber provides a Perl user with access to the Jabber Instant Messaging protocol
+Net::Jabber provide a Perl Developer access to the Jabber protocol
diff --git a/net-im/p5-Net-Jabber/pkg-descr b/net-im/p5-Net-Jabber/pkg-descr
index 9b163fd5e4dc..c31f2fc3c1f8 100644
--- a/net-im/p5-Net-Jabber/pkg-descr
+++ b/net-im/p5-Net-Jabber/pkg-descr
@@ -1,7 +1,23 @@
-  Net::Jabber is a convenient tool to use for any perl scripts
-  that would like to utilize the Jabber Instant Messaging 
-  protocol.  While not a client in and of itself, it provides 
-  all of the necessary back-end functions to make a CGI client 
-  or command-line perl client feasible and easy to use.  
-  Net::Jabber is a wrapper around the rest of the official
-  Net::Jabber::xxxxxx packages.  
+Net::Jabber v1.0021
+
+The Jabber Instant Messaging project is an Open Source project seeking
+to provide a complete cross protocol messaging solution.  The problem
+with current IM solutions is that they are all proprietary and cannot
+talk to each other.  Jabber seeks to get rid of those barriers by
+allowing a Jabber client to talk with an AOL user, or an IRC chat room,
+or any number of other programs.
+
+For more information about the Jabber project visit
+WWW: http://www.jabber.org
+
+Net::Jabber is a collection of Perl modules that provide a Perl Developer
+access to the Jabber protocol.  Using OOP modules we provide a clean
+interface to writing anything from a full client to a simple protocol
+tester.
+
+Ryan Eatmon
+Jabber Perl Team Leader
+reatmon@jabber.org
+
+--
+Yen-Ming Lee <leeym@cae.ce.ntu.edu.tw>
diff --git a/net-im/p5-Net-Jabber/pkg-plist b/net-im/p5-Net-Jabber/pkg-plist
index 0eb1ca493787..0e238a475fcb 100644
--- a/net-im/p5-Net-Jabber/pkg-plist
+++ b/net-im/p5-Net-Jabber/pkg-plist
@@ -4,6 +4,9 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Component.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data/Auth.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Debug.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Result.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Verify.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/IQ.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/JID.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Key.pm
@@ -28,27 +31,36 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search/Item.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Time.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Version.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Transport.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Server.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/AutoUpdate.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Delay.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Encrypted.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field/Option.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/GC.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Ident.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Oob.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/ReplyPres.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster/Item.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM/Map.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Signed.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/XDB.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Roster
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Filter
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/AutoUpdate
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net