4 files changed, 109 insertions, 18 deletions

diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile
index e04bd8e138fb..eeef67820d4a 100644
--- a/net-im/p5-Net-OSCAR/Makefile
+++ b/net-im/p5-Net-OSCAR/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Net-OSCAR
-PORTVERSION=	1.907
+PORTVERSION=	1.925
 CATEGORIES=	net-im perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
@@ -17,18 +17,22 @@ COMMENT=	Perl extension for the AOL Instant Messenger OSCAR protocol
 
 PERL_MODBUILD=	yes
 
-MAN3=		Net::OSCAR.3 \
-		Net::OSCAR::Buddylist.3 \
-		Net::OSCAR::Callbacks.3 \
-		Net::OSCAR::Common.3 \
-		Net::OSCAR::Connection.3 \
-		Net::OSCAR::Connection::Chat.3 \
-		Net::OSCAR::Constants.3 \
-		Net::OSCAR::Screenname.3 \
-		Net::OSCAR::TLV.3 \
-		Net::OSCAR::Utility.3 \
-		Net::OSCAR::XML.3 \
-		Net::OSCAR::_BLInternal.3
+MAN3=	Net::OSCAR.3 \
+	Net::OSCAR::Buddylist.3 \
+	Net::OSCAR::Callbacks.3 \
+	Net::OSCAR::Common.3 \
+	Net::OSCAR::Connection.3 \
+	Net::OSCAR::Connection::Chat.3 \
+	Net::OSCAR::Connection::Direct.3 \
+	Net::OSCAR::Connection::Server.3 \
+	Net::OSCAR::Constants.3 \
+	Net::OSCAR::MethodInfo.3 \
+	Net::OSCAR::Screenname.3 \
+	Net::OSCAR::ServerCallbacks.3 \
+	Net::OSCAR::TLV.3 \
+	Net::OSCAR::Utility.3 \
+	Net::OSCAR::XML.3 \
+	Net::OSCAR::_BLInternal.3
 
 .include <bsd.port.pre.mk>
 
@@ -38,7 +42,7 @@ BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
 .if ${PERL_LEVEL} < 500601
-IGNORE=	Requires perl 5.6.1+, install lang/perl5.8 and try again
+IGNORE=	requires perl 5.6.1+, install lang/perl5.8 and try again
 .endif
 .endif
 
diff --git a/net-im/p5-Net-OSCAR/distinfo b/net-im/p5-Net-OSCAR/distinfo
index 071896d71358..5cfb2bf0c049 100644
--- a/net-im/p5-Net-OSCAR/distinfo
+++ b/net-im/p5-Net-OSCAR/distinfo
@@ -1,3 +1,3 @@
-MD5 (Net-OSCAR-1.907.tar.gz) = 361ca945dcdba75385868528ab6811bc
-SHA256 (Net-OSCAR-1.907.tar.gz) = 17b92040335d973ad05b06a26a8bfee7b557ad9b290ff29123f450b4563e5fe8
-SIZE (Net-OSCAR-1.907.tar.gz) = 104083
+MD5 (Net-OSCAR-1.925.tar.gz) = 5e5cee7df301a9f892b51ce5dbfa82a5
+SHA256 (Net-OSCAR-1.925.tar.gz) = 2ac9140c9b40540eb82b8acc46a51f289fb36f08d94c1e1e3a44a04e693269d6
+SIZE (Net-OSCAR-1.925.tar.gz) = 118615
diff --git a/net-im/p5-Net-OSCAR/pkg-descr b/net-im/p5-Net-OSCAR/pkg-descr
index 3740b741df7e..cdb18f43a1f0 100644
--- a/net-im/p5-Net-OSCAR/pkg-descr
+++ b/net-im/p5-Net-OSCAR/pkg-descr
@@ -1,3 +1,4 @@
 This module implements an OO interface to the AIM OSCAR protocol.
 
 WWW: http://search.cpan.org/dist/Net-OSCAR/
+Author: Matthew Sachs <matthewg@zevils.com>
diff --git a/net-im/p5-Net-OSCAR/pkg-plist b/net-im/p5-Net-OSCAR/pkg-plist
index 0924568a91f0..0f5b9d71e639 100644
--- a/net-im/p5-Net-OSCAR/pkg-plist
+++ b/net-im/p5-Net-OSCAR/pkg-plist
@@ -1,21 +1,107 @@
+bin/oscartest
 %%SITE_PERL%%/Net/OSCAR.pm
 %%SITE_PERL%%/Net/OSCAR/Buddylist.pm
 %%SITE_PERL%%/Net/OSCAR/Callbacks.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/0/error.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/incoming_extended_information.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/incoming_warning.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/migrate.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/pause.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/rate_change.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/rate_info_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/self_information.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/server_ready.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/service_redirect_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/1/unpause.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/13/chat_navigator_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/14/chat_buddy_arrival.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/14/chat_buddy_departure.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/14/chat_room_status.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/14/incoming_chat_IM.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/16/buddy_icon_downloaded.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/16/buddy_icon_uploaded.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/buddylist.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/buddylist_3_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/buddylist_add.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/buddylist_delete.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/buddylist_error.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/buddylist_modification_acknowledgement.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/buddylist_modify.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/end_buddylist_modifications.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/19/start_buddylist_modifications.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/2/incoming_profile.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/21/ICQ_meta_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/23/authentication_key.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/23/authorization_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/3/buddy_rights_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/3/buddy_signoff.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/3/buddy_status_update.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/4/IM_acknowledgement.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/4/chat_invitation_decline.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/4/incoming_IM.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/4/typing_notification.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/7/admin_request_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/7/confirm_account_response.pm
+%%SITE_PERL%%/Net/OSCAR/Callbacks/9/BOS_rights_response.pm
 %%SITE_PERL%%/Net/OSCAR/Common.pm
 %%SITE_PERL%%/Net/OSCAR/Connection.pm
 %%SITE_PERL%%/Net/OSCAR/Connection/Chat.pm
+%%SITE_PERL%%/Net/OSCAR/Connection/Direct.pm
+%%SITE_PERL%%/Net/OSCAR/Connection/Server.pm
 %%SITE_PERL%%/Net/OSCAR/Constants.pm
+%%SITE_PERL%%/Net/OSCAR/MethodInfo.pm
 %%SITE_PERL%%/Net/OSCAR/Proxy.pm
 %%SITE_PERL%%/Net/OSCAR/Screenname.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/0/BOS_signon.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1/personal_info_request.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1/rate_acknowledgement.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1/rate_info_request.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1/set_extended_status.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1/set_service_versions.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1/set_tool_versions.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/19/buddylist_request.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/19/buddylist_rights_request.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/2/get_away.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/2/locate_rights_request.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/23/initial_signon_request.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/23/signon.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/3/buddy_rights_request.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/4/IM_parameter_request.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/4/add_IM_parameters.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/4/outgoing_IM.pm
+%%SITE_PERL%%/Net/OSCAR/ServerCallbacks/9/BOS_rights_request.pm
 %%SITE_PERL%%/Net/OSCAR/TLV.pm
 %%SITE_PERL%%/Net/OSCAR/Utility.pm
 %%SITE_PERL%%/Net/OSCAR/XML.pm
-%%SITE_PERL%%/Net/OSCAR/XML/Protocol.dtd
 %%SITE_PERL%%/Net/OSCAR/XML/Protocol.parsed-xml
 %%SITE_PERL%%/Net/OSCAR/XML/Protocol.xml
 %%SITE_PERL%%/Net/OSCAR/XML/Template.pm
 %%SITE_PERL%%/Net/OSCAR/_BLInternal.pm
 @dirrm %%SITE_PERL%%/Net/OSCAR/XML
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/9
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/4
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/3
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/23
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/2
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/19
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/0
+@dirrm %%SITE_PERL%%/Net/OSCAR/ServerCallbacks
 @dirrm %%SITE_PERL%%/Net/OSCAR/Connection
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/9
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/7
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/4
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/3
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/23
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/21
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/2
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/19
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/16
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/14
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/13
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/1
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks/0
+@dirrm %%SITE_PERL%%/Net/OSCAR/Callbacks
 @dirrm %%SITE_PERL%%/Net/OSCAR
 @dirrmtry %%SITE_PERL%%/Net