4 files changed, 8 insertions, 115 deletions

diff --git a/mail/p5-Net-Server-Mail/Makefile b/mail/p5-Net-Server-Mail/Makefile
index 24d1c49bea57..5c8e032139eb 100644
--- a/mail/p5-Net-Server-Mail/Makefile
+++ b/mail/p5-Net-Server-Mail/Makefile
@@ -6,32 +6,21 @@
 #
 
 PORTNAME=	Net-Server-Mail
-PORTVERSION=	0.13
+PORTVERSION=	0.16
 CATEGORIES=	mail perl5
-MASTER_SITES=	ftp://ftp.rhapsodyk.net/pub/devel/perl/Net-Server-Mail/
+MASTER_SITES=	http://cpan.org/authors/id/G/GU/GUIMARD/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Implementation of SMTP, ESMTP and LMTP protocols
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 PERL_CONFIGURE=	yes
 
 MAN3=		Net::Server::Mail.3 \
 		Net::Server::Mail::ESMTP.3 \
 		Net::Server::Mail::ESMTP::Extension.3 \
+		Net::Server::Mail::ESMTP::XFORWARD.3 \
 		Net::Server::Mail::LMTP.3 \
 		Net::Server::Mail::SMTP.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Socket/INET.pm:${PORTSDIR}/devel/p5-IO
-EXTRA_PATCHES=	${PATCHDIR}/5.005_03.diff
-post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/p5-Net-Server-Mail/distinfo b/mail/p5-Net-Server-Mail/distinfo
index fbbd12921508..29d09d32239d 100644
--- a/mail/p5-Net-Server-Mail/distinfo
+++ b/mail/p5-Net-Server-Mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (Net-Server-Mail-0.13.tar.gz) = 74c5f03cf1857c487665b80422e77fb7
-SHA256 (Net-Server-Mail-0.13.tar.gz) = fa4b5334c4523267bac723adc56ce1a447339b8a0be75ba8520ef683eb84ec11
-SIZE (Net-Server-Mail-0.13.tar.gz) = 14135
+MD5 (Net-Server-Mail-0.16.tar.gz) = 6faff7521230ebb1ece5e97d75088457
+SHA256 (Net-Server-Mail-0.16.tar.gz) = 58fce332fd1820c253c05c672df6cbf0d30043beabe7a1e322f9e9f663b261e7
+SIZE (Net-Server-Mail-0.16.tar.gz) = 15813
diff --git a/mail/p5-Net-Server-Mail/files/5.005_03.diff b/mail/p5-Net-Server-Mail/files/5.005_03.diff
deleted file mode 100644
index 39068d462168..000000000000
--- a/mail/p5-Net-Server-Mail/files/5.005_03.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ru lib.old/Net/Server/Mail/ESMTP/8BITMIME.pm lib/Net/Server/Mail/ESMTP/8BITMIME.pm
---- lib.old/Net/Server/Mail/ESMTP/8BITMIME.pm	Tue Jun 25 15:53:21 2002
-+++ lib/Net/Server/Mail/ESMTP/8BITMIME.pm	Thu Feb 19 15:27:11 2004
-@@ -1,6 +1,5 @@
- package Net::Server::Mail::ESMTP::8BITMIME;
- 
--use 5.006;
- use strict;
--use base qw(Net::Server::Mail::ESMTP::Extension);
-+BEGIN {require Net::Server::Mail::ESMTP::Extension;@Net::Server::Mail::ESMTP::8BITMIME::ISA = ('Net::Server::Mail::ESMTP::Extension')};
- 
-diff -ru lib.old/Net/Server/Mail/ESMTP/Extension.pm lib/Net/Server/Mail/ESMTP/Extension.pm
---- lib.old/Net/Server/Mail/ESMTP/Extension.pm	Thu Nov  7 18:53:51 2002
-+++ lib/Net/Server/Mail/ESMTP/Extension.pm	Thu Feb 19 15:27:13 2004
-@@ -1,6 +1,5 @@
- package Net::Server::Mail::ESMTP::Extension;
- 
--use 5.006;
- use strict;
- 
- =pod
-diff -ru lib.old/Net/Server/Mail/ESMTP/PIPELINING.pm lib/Net/Server/Mail/ESMTP/PIPELINING.pm
---- lib.old/Net/Server/Mail/ESMTP/PIPELINING.pm	Mon Jan  6 12:21:43 2003
-+++ lib/Net/Server/Mail/ESMTP/PIPELINING.pm	Thu Feb 19 15:27:16 2004
-@@ -1,6 +1,5 @@
- package Net::Server::Mail::ESMTP::PIPELINING;
- 
--use 5.006;
- use strict;
--use base 'Net::Server::Mail::ESMTP::Extension';
-+BEGIN {require Net::Server::Mail::ESMTP::Extension;@Net::Server::Mail::ESMTP::PIPELINING::ISA = ('Net::Server::Mail::ESMTP::Extension')};
- use constant GROUP_COMMANDS => [qw(RSET MAIL SEND SOML SAML RCPT)];
-diff -ru lib.old/Net/Server/Mail/ESMTP.pm lib/Net/Server/Mail/ESMTP.pm
---- lib.old/Net/Server/Mail/ESMTP.pm	Sun Apr  6 17:33:02 2003
-+++ lib/Net/Server/Mail/ESMTP.pm	Thu Feb 19 15:32:21 2004
-@@ -1,9 +1,8 @@
- package Net::Server::Mail::ESMTP;
- 
--use 5.006;
- use strict;
- use Carp;
--use base qw(Net::Server::Mail::SMTP);
-+BEGIN {require Net::Server::Mail::SMTP;@Net::Server::Mail::ESMTP::ISA = ('Net::Server::Mail::SMTP')};
- 
- =pod
- 
-diff -ru lib.old/Net/Server/Mail/LMTP.pm lib/Net/Server/Mail/LMTP.pm
---- lib.old/Net/Server/Mail/LMTP.pm	Fri Mar 14 16:25:03 2003
-+++ lib/Net/Server/Mail/LMTP.pm	Thu Feb 19 15:26:59 2004
-@@ -1,6 +1,5 @@
- package Net::Server::Mail::LMTP;
- 
--use 5.006;
- use strict;
--use base qw(Net::Server::Mail::ESMTP);
-+BEGIN {require Net::Server::Mail::ESMTP;@Net::Server::Mail::LMTP::ISA = ('Net::Server::Mail::ESMTP')};
- 
-diff -ru lib.old/Net/Server/Mail/SMTP.pm lib/Net/Server/Mail/SMTP.pm
---- lib.old/Net/Server/Mail/SMTP.pm	Sun Apr  6 17:36:40 2003
-+++ lib/Net/Server/Mail/SMTP.pm	Thu Feb 19 15:32:24 2004
-@@ -1,8 +1,7 @@
- package Net::Server::Mail::SMTP;
- 
--use 5.006;
- use strict;
--use base 'Net::Server::Mail';
-+BEGIN {require Net::Server::Mail;@Net::Server::Mail::SMTP::ISA = ('Net::Server::Mail')};
- 
- =pod
- 
---- lib/Net/Server/Mail.pm.orig	Wed Jan  5 19:50:35 2005
-+++ lib/Net/Server/Mail.pm	Mon Jan 24 20:22:04 2005
-@@ -1,6 +1,5 @@
- package Net::Server::Mail;
- 
--use 5.006;
- use strict;
- use Sys::Hostname;
- use IO::Select;
-@@ -502,7 +501,7 @@
-         else
-         {
-             next unless defined;
--            $rv = $self->{process_operation}($self, $_);
-+            $rv = $self->{process_operation}->($self, $_);
-         }
-         # if $rv is defined, we have to close the connection
-         return $rv if defined $rv;
-@@ -521,7 +520,7 @@
-     }
-     else
-     {
--        return $self->{process_operation}($self, $operation);
-+        return $self->{process_operation}->($self, $operation);
-     }
- }
- 
diff --git a/mail/p5-Net-Server-Mail/pkg-plist b/mail/p5-Net-Server-Mail/pkg-plist
index b1d55c632107..303a1e4d1b6c 100644
--- a/mail/p5-Net-Server-Mail/pkg-plist
+++ b/mail/p5-Net-Server-Mail/pkg-plist
@@ -4,6 +4,7 @@
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/Extension.pm
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/PIPELINING.pm
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/8BITMIME.pm
+%%SITE_PERL%%/Net/Server/Mail/ESMTP/XFORWARD.pm
 %%SITE_PERL%%/Net/Server/Mail/LMTP.pm
 %%SITE_PERL%%/Net/Server/Mail/SMTP.pm
 @dirrm %%SITE_PERL%%/Net/Server/Mail/ESMTP