3 files changed, 47 insertions, 23 deletions

diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index ca6276fc999e..892ab0557de2 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	DJabberd
-PORTVERSION=	0.83
+PORTVERSION=	0.85
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
+MASTER_SITE_SUBDIR=	CPAN:MART
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
@@ -26,11 +26,22 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN3=		DJabberd.3 DJabberd::Component.3 \
-		DJabberd::Component::Example.3 DJabberd::Component::External.3 \
-		DJabberd::Connection::ComponentIn.3 \
-		DJabberd::Connection::ComponentOut.3 \
-		DJabberd::Delivery::ComponentConnection.3 \
-		DJabberd::Delivery::LocalVHosts.3
+MAN3=	DJabberd.3\
+	DJabberd::Agent.3\
+	DJabberd::Agent::Node.3\
+	DJabberd::Component.3\
+	DJabberd::Component::Example.3\
+	DJabberd::Component::External.3\
+	DJabberd::Component::Node.3\
+	DJabberd::Config.3\
+	DJabberd::Connection::ComponentIn.3\
+	DJabberd::Connection::ComponentOut.3\
+	DJabberd::Delivery::ComponentConnection.3\
+	DJabberd::Delivery::LocalVHosts.3\
+	DJabberd::SASL.3\
+	DJabberd::SASL::AuthenSASL.3\
+	DJabberd::SASL::Connection.3\
+	DJabberd::SASL::DumbPlain.3\
+	DJabberd::SASL::ManagerBase.3
 
 .include <bsd.port.mk>
diff --git a/net-im/p5-DJabberd/distinfo b/net-im/p5-DJabberd/distinfo
index 40c63551af84..d7aca94cd024 100644
--- a/net-im/p5-DJabberd/distinfo
+++ b/net-im/p5-DJabberd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (DJabberd-0.83.tar.gz) = 6283dde09f5ebe87b5ae3d3f827ce6efdc2c9430860b5b5d5adb7f9f5d88593b
-SIZE (DJabberd-0.83.tar.gz) = 88314
+SHA256 (DJabberd-0.85.tar.gz) = 61845b2327aa1448abd65320933c3d7e9b41be7cd6a66635c9cb1e2a83bf2af0
+SIZE (DJabberd-0.85.tar.gz) = 302234
diff --git a/net-im/p5-DJabberd/pkg-plist b/net-im/p5-DJabberd/pkg-plist
index abd8d5bbe763..b4ba3a98e426 100644
--- a/net-im/p5-DJabberd/pkg-plist
+++ b/net-im/p5-DJabberd/pkg-plist
@@ -1,4 +1,3 @@
-bin/djabberd
 %%SITE_PERL%%/DJabberd.pm
 %%SITE_PERL%%/DJabberd/Agent.pm
 %%SITE_PERL%%/DJabberd/Agent/Node.pm
@@ -17,6 +16,7 @@ bin/djabberd
 %%SITE_PERL%%/DJabberd/Component/Example.pm
 %%SITE_PERL%%/DJabberd/Component/External.pm
 %%SITE_PERL%%/DJabberd/Component/Node.pm
+%%SITE_PERL%%/DJabberd/Config.pod
 %%SITE_PERL%%/DJabberd/Connection.pm
 %%SITE_PERL%%/DJabberd/Connection/Admin.pm
 %%SITE_PERL%%/DJabberd/Connection/ClientIn.pm
@@ -53,10 +53,19 @@ bin/djabberd
 %%SITE_PERL%%/DJabberd/RosterItem.pm
 %%SITE_PERL%%/DJabberd/RosterStorage.pm
 %%SITE_PERL%%/DJabberd/RosterStorage/InMemoryOnly.pm
+%%SITE_PERL%%/DJabberd/SASL.pm
+%%SITE_PERL%%/DJabberd/SASL/AuthenSASL.pm
+%%SITE_PERL%%/DJabberd/SASL/Connection.pm
+%%SITE_PERL%%/DJabberd/SASL/Connection/AuthenSASL.pm
+%%SITE_PERL%%/DJabberd/SASL/DumbPlain.pm
+%%SITE_PERL%%/DJabberd/SASL/DumbPlainManager.pm
+%%SITE_PERL%%/DJabberd/SASL/Manager/AuthenSASL.pm
+%%SITE_PERL%%/DJabberd/SASL/ManagerBase.pm
 %%SITE_PERL%%/DJabberd/SAXHandler.pm
 %%SITE_PERL%%/DJabberd/Stanza.pm
 %%SITE_PERL%%/DJabberd/Stanza/DialbackResult.pm
 %%SITE_PERL%%/DJabberd/Stanza/DialbackVerify.pm
+%%SITE_PERL%%/DJabberd/Stanza/SASL.pm
 %%SITE_PERL%%/DJabberd/Stanza/StartTLS.pm
 %%SITE_PERL%%/DJabberd/Stanza/StreamFeatures.pm
 %%SITE_PERL%%/DJabberd/Stats.pm
@@ -68,17 +77,21 @@ bin/djabberd
 %%SITE_PERL%%/DJabberd/VHost.pm
 %%SITE_PERL%%/DJabberd/XMLElement.pm
 %%SITE_PERL%%/DJabberd/XMLParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DJabberd/.packlist
-@dirrm %%SITE_PERL%%/DJabberd/Agent
-@dirrm %%SITE_PERL%%/DJabberd/Authen
-@dirrm %%SITE_PERL%%/DJabberd/Bot
-@dirrm %%SITE_PERL%%/DJabberd/ClusterMessage
-@dirrm %%SITE_PERL%%/DJabberd/Component
-@dirrm %%SITE_PERL%%/DJabberd/Connection
-@dirrm %%SITE_PERL%%/DJabberd/Delivery
-@dirrm %%SITE_PERL%%/DJabberd/PresenceChecker
-@dirrm %%SITE_PERL%%/DJabberd/Queue
-@dirrm %%SITE_PERL%%/DJabberd/RosterStorage
+%%SITE_PERL%%/mach/auto/DJabberd/.packlist
+bin/djabberd
+@dirrm %%SITE_PERL%%/mach/auto/DJabberd
 @dirrm %%SITE_PERL%%/DJabberd/Stanza
+@dirrm %%SITE_PERL%%/DJabberd/SASL/Manager
+@dirrm %%SITE_PERL%%/DJabberd/SASL/Connection
+@dirrm %%SITE_PERL%%/DJabberd/SASL
+@dirrm %%SITE_PERL%%/DJabberd/RosterStorage
+@dirrm %%SITE_PERL%%/DJabberd/Queue
+@dirrm %%SITE_PERL%%/DJabberd/PresenceChecker
+@dirrm %%SITE_PERL%%/DJabberd/Delivery
+@dirrm %%SITE_PERL%%/DJabberd/Connection
+@dirrm %%SITE_PERL%%/DJabberd/Component
+@dirrm %%SITE_PERL%%/DJabberd/ClusterMessage
+@dirrm %%SITE_PERL%%/DJabberd/Bot
+@dirrm %%SITE_PERL%%/DJabberd/Authen
+@dirrm %%SITE_PERL%%/DJabberd/Agent
 @dirrm %%SITE_PERL%%/DJabberd
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DJabberd