3 files changed, 8 insertions, 14 deletions

diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index 051e4ba55f13..56ee85bc7aa3 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Config-Model
-PORTVERSION=	2.061
-PORTREVISION=	1
+PORTVERSION=	2.064
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DDUMONT
@@ -37,17 +36,13 @@ BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Config-Model-Tester>=2.046:${PORTSDIR}/devel/p5-Config-Model-Tester \
-		p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl \
-		p5-Test-Command>=0:${PORTSDIR}/devel/p5-Test-Command \
 		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
 		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Test-File-Contents>=0:${PORTSDIR}/devel/p5-Test-File-Contents \
 		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
 		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
 
-USES=		perl5 shebangfix
+USES=		perl5
 USE_PERL5=	modbuild
 
-SHEBANG_FILES=	lib/Config/Model/extensions/cme-gen-class-pod
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-Model/distinfo b/devel/p5-Config-Model/distinfo
index 9148e62164d2..ee0773432c0e 100644
--- a/devel/p5-Config-Model/distinfo
+++ b/devel/p5-Config-Model/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Config-Model-2.061.tar.gz) = c6608cb6eb471352ed78197c46c54d16fd753add60c1097eacfa4754bc4efa6c
-SIZE (Config-Model-2.061.tar.gz) = 330343
+SHA256 (Config-Model-2.064.tar.gz) = cf61f70f8f1a0105ed6448d8cdfefc291b13f52535b3adbf252f0c273597dfac
+SIZE (Config-Model-2.064.tar.gz) = 324462
diff --git a/devel/p5-Config-Model/pkg-plist b/devel/p5-Config-Model/pkg-plist
index 7bd7d83e5e7c..1f6e1a2b214c 100644
--- a/devel/p5-Config-Model/pkg-plist
+++ b/devel/p5-Config-Model/pkg-plist
@@ -1,5 +1,4 @@
-bin/cme
-bin/config-edit
+bin/cme-old
 %%SITE_PERL%%/Config/Model.pm
 %%SITE_PERL%%/Config/Model/Annotation.pm
 %%SITE_PERL%%/Config/Model/AnyId.pm
@@ -35,13 +34,13 @@ bin/config-edit
 %%SITE_PERL%%/Config/Model/SimpleUI.pm
 %%SITE_PERL%%/Config/Model/TermUI.pm
 %%SITE_PERL%%/Config/Model/TreeSearcher.pm
+%%SITE_PERL%%/Config/Model/Utils/GenClassPod.pm
 %%SITE_PERL%%/Config/Model/Value.pm
 %%SITE_PERL%%/Config/Model/Value/LayeredInclude.pm
 %%SITE_PERL%%/Config/Model/ValueComputer.pm
 %%SITE_PERL%%/Config/Model/WarpedNode.pm
 %%SITE_PERL%%/Config/Model/Warper.pm
 %%SITE_PERL%%/Config/Model/application.d/multistrap
-%%SITE_PERL%%/Config/Model/extensions/cme-gen-class-pod
 %%SITE_PERL%%/Config/Model/models/Fstab.pl
 %%SITE_PERL%%/Config/Model/models/Fstab.pod
 %%SITE_PERL%%/Config/Model/models/Fstab/CommonOptions.pl
@@ -97,6 +96,7 @@ bin/config-edit
 %%PERL5_MAN3%%/Config::Model::SimpleUI.3.gz
 %%PERL5_MAN3%%/Config::Model::TermUI.3.gz
 %%PERL5_MAN3%%/Config::Model::TreeSearcher.3.gz
+%%PERL5_MAN3%%/Config::Model::Utils::GenClassPod.3.gz
 %%PERL5_MAN3%%/Config::Model::Value.3.gz
 %%PERL5_MAN3%%/Config::Model::Value::LayeredInclude.3.gz
 %%PERL5_MAN3%%/Config::Model::ValueComputer.3.gz
@@ -107,5 +107,4 @@ bin/config-edit
 %%PERL5_MAN3%%/Config::Model::models::Multistrap.3.gz
 %%PERL5_MAN3%%/Config::Model::models::Multistrap::Section.3.gz
 %%PERL5_MAN3%%/Config::Model::models::PopCon.3.gz
-man/man1/cme.1.gz
-man/man1/config-edit.1.gz
+man/man1/cme-old.1.gz