3 files changed, 25 insertions, 33 deletions

diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index 3bafdab875c6..9aa2eca3da82 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	Config-Model
-DISTVERSION=	0.608
+DISTVERSION=	0.610
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN SF
 PKGNAMEPREFIX=	p5-
@@ -19,33 +19,23 @@ RUN_DEPENDS=	p5-Error>0:${PORTSDIR}/lang/p5-Error \
 		p5-Exception-Class>0:${PORTSDIR}/devel/p5-Exception-Class \
 		p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl \
 		p5-Parse-RecDescent>=1.90:${PORTSDIR}/devel/p5-Parse-RecDescent
-BUILD_DEPENDS=	${RUN_DEPENDS} \
-		p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN1=	config-model.1
-MAN3=	Config::Model.3pm \
-	Config::Model::AnyId.3pm \
-	Config::Model::AnyThing.3pm \
-	Config::Model::AutoRead.3pm \
-	Config::Model::CheckList.3pm \
-	Config::Model::Describe.3pm \
-	Config::Model::Dumper.3pm \
-	Config::Model::Exception.3pm \
-	Config::Model::HashId.3pm \
-	Config::Model::Instance.3pm \
-	Config::Model::ListId.3pm \
-	Config::Model::Loader.3pm \
-	Config::Model::Node.3pm \
-	Config::Model::ObjTreeScanner.3pm \
-	Config::Model::Report.3pm \
-	Config::Model::Searcher.3pm \
-	Config::Model::TermUI.3pm \
-	Config::Model::Value.3pm \
-	Config::Model::ValueComputer.3pm \
-	Config::Model::WarpedNode.3pm \
-	Config::Model::WarpedThing.3pm \
-	Config::Model::WizardHelper.3pm
+MAN1=		config-edit.1
+MAN3=		Config::Model.3pm Config::Model::AnyId.3pm \
+		Config::Model::AnyThing.3pm Config::Model::AutoRead.3pm \
+		Config::Model::CheckList.3pm Config::Model::Describe.3pm \
+		Config::Model::Dumper.3pm Config::Model::Exception.3pm \
+		Config::Model::HashId.3pm \
+		Config::Model::IdElementReference.3pm \
+		Config::Model::Instance.3pm Config::Model::ListId.3pm \
+		Config::Model::Loader.3pm Config::Model::Node.3pm \
+		Config::Model::ObjTreeScanner.3pm Config::Model::Report.3pm \
+		Config::Model::Searcher.3pm Config::Model::TermUI.3pm \
+		Config::Model::Value.3pm Config::Model::ValueComputer.3pm \
+		Config::Model::WarpedNode.3pm Config::Model::WarpedThing.3pm \
+		Config::Model::WizardHelper.3pm
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-Model/distinfo b/devel/p5-Config-Model/distinfo
index bd4c7a12a0ec..2baab74ea6c6 100644
--- a/devel/p5-Config-Model/distinfo
+++ b/devel/p5-Config-Model/distinfo
@@ -1,3 +1,3 @@
-MD5 (Config-Model-0.608.tar.gz) = 7b489ecd45dfed728be2c557a443f228
-SHA256 (Config-Model-0.608.tar.gz) = 8ebfc33d85f01af4ee2caecb4499a22464fa6aeee4fe57516369f1c00ae1fcda
-SIZE (Config-Model-0.608.tar.gz) = 120428
+MD5 (Config-Model-0.610.tar.gz) = dbb3cc0899ae7f957f6e1171379767d7
+SHA256 (Config-Model-0.610.tar.gz) = 78d4a1b6d32f453b644b6f158ebb7e407b99ad72c39ec39550058a9b3a3a9def
+SIZE (Config-Model-0.610.tar.gz) = 129371
diff --git a/devel/p5-Config-Model/pkg-plist b/devel/p5-Config-Model/pkg-plist
index fa0394c9afa8..76f3fccd6470 100644
--- a/devel/p5-Config-Model/pkg-plist
+++ b/devel/p5-Config-Model/pkg-plist
@@ -1,4 +1,5 @@
-bin/config-model
+@comment $FreeBSD$
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config-Model/.packlist
 %%SITE_PERL%%/Config/Model.pm
 %%SITE_PERL%%/Config/Model/AnyId.pm
 %%SITE_PERL%%/Config/Model/AnyThing.pm
@@ -8,6 +9,7 @@ bin/config-model
 %%SITE_PERL%%/Config/Model/Dumper.pm
 %%SITE_PERL%%/Config/Model/Exception.pm
 %%SITE_PERL%%/Config/Model/HashId.pm
+%%SITE_PERL%%/Config/Model/IdElementReference.pm
 %%SITE_PERL%%/Config/Model/Instance.pm
 %%SITE_PERL%%/Config/Model/ListId.pm
 %%SITE_PERL%%/Config/Model/Loader.pm
@@ -21,7 +23,7 @@ bin/config-model
 %%SITE_PERL%%/Config/Model/WarpedNode.pm
 %%SITE_PERL%%/Config/Model/WarpedThing.pm
 %%SITE_PERL%%/Config/Model/WizardHelper.pm
-@dirrm %%SITE_PERL%%/Config/Model
+bin/config-edit
+@dirrmtry %%SITE_PERL%%/Config/Model
 @dirrmtry %%SITE_PERL%%/Config
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config-Model/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config-Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config-Model