6 files changed, 1 insertions, 94 deletions

diff --git a/MOVED b/MOVED
index 4c2cc50a0c7e..29826a69dd6a 100644
--- a/MOVED
+++ b/MOVED
@@ -8386,3 +8386,4 @@ devel/jenkins2|devel/jenkins|2016-06-30|Has expired: Use devel/jenkins
 www/p5-WWW-Google-Notebook||2016-06-30|Has expired: Google Notebook has shut down
 sysutils/syslog-ng-incubator03||2016-06-30|Has expired: EOL, no longer supported by bababit.hu
 www/node5|www/node|2016-07-01|Has expired: upstream support has ended, use www/node instead
+devel/p5-Test2|devel/p5-Test-Simple|2016-07-02|Has expired: Test2 has been merged into Test-Simple distribution
diff --git a/devel/Makefile b/devel/Makefile
index cba6a8d303a0..3ebe9f36769c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3336,7 +3336,6 @@
     SUBDIR += p5-Test-YAML-Meta
     SUBDIR += p5-Test-YAML-Valid
     SUBDIR += p5-Test-utf8
-    SUBDIR += p5-Test2
     SUBDIR += p5-Test2-Suite
     SUBDIR += p5-Text-Levenshtein
     SUBDIR += p5-Text-Levenshtein-Damerau
diff --git a/devel/p5-Test2/Makefile b/devel/p5-Test2/Makefile
deleted file mode 100644
index 7cd367a0baf9..000000000000
--- a/devel/p5-Test2/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	Test2
-PORTVERSION=	0.000044
-CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:EXODIST
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Framework for writing test tools that all work together
-
-LICENSE=	ART10 GPLv1
-LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-CONFLICTS_INSTALL=	p5-Test-Simple-1.[3-9]*
-
-DEPRECATED=	Test2 has been merged into Test-Simple distribution
-EXPIRATION_DATE=2016-06-30
-
-NO_ARCH=	yes
-USE_PERL5=	configure
-USES=		perl5
-
-.include <bsd.port.mk>
diff --git a/devel/p5-Test2/distinfo b/devel/p5-Test2/distinfo
deleted file mode 100644
index 6a605467eaa6..000000000000
--- a/devel/p5-Test2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Test2-0.000044.tar.gz) = 4e5468907a8a79685d94345d09735abda4ef50f4f3938fc43f5997fe46adfc21
-SIZE (Test2-0.000044.tar.gz) = 98640
diff --git a/devel/p5-Test2/pkg-descr b/devel/p5-Test2/pkg-descr
deleted file mode 100644
index 12e8d3d0c11b..000000000000
--- a/devel/p5-Test2/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Test2 is a new testing framework produced by forking Test::Builder, completely
-refactoring it, adding many new features and capabilities.
-
-WWW: http://search.cpan.org/dist/Test2/
diff --git a/devel/p5-Test2/pkg-plist b/devel/p5-Test2/pkg-plist
deleted file mode 100644
index 9a4a659ae7ea..000000000000
--- a/devel/p5-Test2/pkg-plist
+++ /dev/null
@@ -1,60 +0,0 @@
-%%SITE_PERL%%/Test2.pm
-%%SITE_PERL%%/Test2/API.pm
-%%SITE_PERL%%/Test2/API/Breakage.pm
-%%SITE_PERL%%/Test2/API/Context.pm
-%%SITE_PERL%%/Test2/API/Instance.pm
-%%SITE_PERL%%/Test2/API/Stack.pm
-%%SITE_PERL%%/Test2/Event.pm
-%%SITE_PERL%%/Test2/Event/Bail.pm
-%%SITE_PERL%%/Test2/Event/Diag.pm
-%%SITE_PERL%%/Test2/Event/Exception.pm
-%%SITE_PERL%%/Test2/Event/Note.pm
-%%SITE_PERL%%/Test2/Event/Ok.pm
-%%SITE_PERL%%/Test2/Event/Plan.pm
-%%SITE_PERL%%/Test2/Event/Skip.pm
-%%SITE_PERL%%/Test2/Event/Subtest.pm
-%%SITE_PERL%%/Test2/Event/Waiting.pm
-%%SITE_PERL%%/Test2/Formatter.pm
-%%SITE_PERL%%/Test2/Formatter/TAP.pm
-%%SITE_PERL%%/Test2/Hub.pm
-%%SITE_PERL%%/Test2/Hub/Interceptor.pm
-%%SITE_PERL%%/Test2/Hub/Interceptor/Terminator.pm
-%%SITE_PERL%%/Test2/Hub/Subtest.pm
-%%SITE_PERL%%/Test2/IPC.pm
-%%SITE_PERL%%/Test2/IPC/Driver.pm
-%%SITE_PERL%%/Test2/IPC/Driver/Files.pm
-%%SITE_PERL%%/Test2/Transition.pod
-%%SITE_PERL%%/Test2/Util.pm
-%%SITE_PERL%%/Test2/Util/ExternalMeta.pm
-%%SITE_PERL%%/Test2/Util/HashBase.pm
-%%SITE_PERL%%/Test2/Util/Trace.pm
-%%PERL5_MAN3%%/Test2.3.gz
-%%PERL5_MAN3%%/Test2::API.3.gz
-%%PERL5_MAN3%%/Test2::API::Breakage.3.gz
-%%PERL5_MAN3%%/Test2::API::Context.3.gz
-%%PERL5_MAN3%%/Test2::API::Instance.3.gz
-%%PERL5_MAN3%%/Test2::API::Stack.3.gz
-%%PERL5_MAN3%%/Test2::Event.3.gz
-%%PERL5_MAN3%%/Test2::Event::Bail.3.gz
-%%PERL5_MAN3%%/Test2::Event::Diag.3.gz
-%%PERL5_MAN3%%/Test2::Event::Exception.3.gz
-%%PERL5_MAN3%%/Test2::Event::Note.3.gz
-%%PERL5_MAN3%%/Test2::Event::Ok.3.gz
-%%PERL5_MAN3%%/Test2::Event::Plan.3.gz
-%%PERL5_MAN3%%/Test2::Event::Skip.3.gz
-%%PERL5_MAN3%%/Test2::Event::Subtest.3.gz
-%%PERL5_MAN3%%/Test2::Event::Waiting.3.gz
-%%PERL5_MAN3%%/Test2::Formatter.3.gz
-%%PERL5_MAN3%%/Test2::Formatter::TAP.3.gz
-%%PERL5_MAN3%%/Test2::Hub.3.gz
-%%PERL5_MAN3%%/Test2::Hub::Interceptor.3.gz
-%%PERL5_MAN3%%/Test2::Hub::Interceptor::Terminator.3.gz
-%%PERL5_MAN3%%/Test2::Hub::Subtest.3.gz
-%%PERL5_MAN3%%/Test2::IPC.3.gz
-%%PERL5_MAN3%%/Test2::IPC::Driver.3.gz
-%%PERL5_MAN3%%/Test2::IPC::Driver::Files.3.gz
-%%PERL5_MAN3%%/Test2::Transition.3.gz
-%%PERL5_MAN3%%/Test2::Util.3.gz
-%%PERL5_MAN3%%/Test2::Util::ExternalMeta.3.gz
-%%PERL5_MAN3%%/Test2::Util::HashBase.3.gz
-%%PERL5_MAN3%%/Test2::Util::Trace.3.gz