3 files changed, 22 insertions, 17 deletions

diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index 03aa134d2922..aba2649515a1 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	Config-Model
-PORTVERSION=	1.219
+PORTVERSION=	1.220
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -21,27 +21,24 @@ RUN_DEPENDS=	p5-Carp-Assert-More>=0:${PORTSDIR}/devel/p5-Carp-Assert-More \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-Parse-RecDescent>=v1.90.0:${PORTSDIR}/devel/p5-Parse-RecDescent \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-BUILD_DEPENDS=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0.11:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template
 
 PERL_MODBUILD=	5.8.0+
 
 MAN1=		config-edit.1
 
 MAN3=		Config::Model.3 \
-		Config::Model::AnyId.3 \
 		Config::Model::Annotation.3 \
+		Config::Model::AnyId.3 \
 		Config::Model::AnyThing.3 Config::Model::AutoRead.3 \
 		Config::Model::Backend::Any.3 \
-		Config::Model::Backend::Debian::DpkgSyntax.3 \
 		Config::Model::Backend::Debian::Dpkg::Control.3 \
 		Config::Model::Backend::Debian::Dpkg::Copyright.3 \
+		Config::Model::Backend::Debian::DpkgSyntax.3 \
 		Config::Model::Backend::IniFile.3 \
 		Config::Model::Backend::ShellVar.3 \
 		Config::Model::Backend::Yaml.3 \
 		Config::Model::CheckList.3 Config::Model::Describe.3 \
+		Config::Model::Cookbook::CreateModelFromDoc.3 \
 		Config::Model::DumpAsData.3 Config::Model::Dumper.3 \
 		Config::Model::Exception.3 Config::Model::HashId.3 \
 		Config::Model::IdElementReference.3 Config::Model::Instance.3 \
diff --git a/devel/p5-Config-Model/distinfo b/devel/p5-Config-Model/distinfo
index d2675b24ebde..c6e2f5fe525b 100644
--- a/devel/p5-Config-Model/distinfo
+++ b/devel/p5-Config-Model/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Config-Model-1.219.tar.gz) = 9509edbde27da1463233f5c50596538091c0995d5707745f44d03fdcd42d40cf
-SIZE (Config-Model-1.219.tar.gz) = 236467
+SHA256 (Config-Model-1.220.tar.gz) = 988db8b45298d662eb20c0acac500b39d3dd09e4bc152ff43a7cb81afd5b97ef
+SIZE (Config-Model-1.220.tar.gz) = 239354
diff --git a/devel/p5-Config-Model/pkg-plist b/devel/p5-Config-Model/pkg-plist
index 0a4af93ff75d..21a4126c87a6 100644
--- a/devel/p5-Config-Model/pkg-plist
+++ b/devel/p5-Config-Model/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/config-edit
 %%SITE_PERL%%/Config/Model.pm
 %%SITE_PERL%%/Config/Model/Annotation.pm
@@ -12,6 +13,7 @@ bin/config-edit
 %%SITE_PERL%%/Config/Model/Backend/ShellVar.pm
 %%SITE_PERL%%/Config/Model/Backend/Yaml.pm
 %%SITE_PERL%%/Config/Model/CheckList.pm
+%%SITE_PERL%%/Config/Model/Cookbook/CreateModelFromDoc.pod
 %%SITE_PERL%%/Config/Model/Describe.pm
 %%SITE_PERL%%/Config/Model/DumpAsData.pm
 %%SITE_PERL%%/Config/Model/Dumper.pm
@@ -33,30 +35,36 @@ bin/config-edit
 %%SITE_PERL%%/Config/Model/WarpedNode.pm
 %%SITE_PERL%%/Config/Model/WarpedThing.pm
 %%SITE_PERL%%/Config/Model/WizardHelper.pm
+%%SITE_PERL%%/Config/Model/application.d/dpkg-control
+%%SITE_PERL%%/Config/Model/application.d/dpkg-copyright
 %%SITE_PERL%%/Config/Model/models/Debian/Dpkg/Control.pl
 %%SITE_PERL%%/Config/Model/models/Debian/Dpkg/Control/Binary.pl
 %%SITE_PERL%%/Config/Model/models/Debian/Dpkg/Control/Source.pl
 %%SITE_PERL%%/Config/Model/models/Debian/Dpkg/Copyright.pl
 %%SITE_PERL%%/Config/Model/models/Debian/Dpkg/Copyright/Content.pl
 %%SITE_PERL%%/Config/Model/models/Debian/Dpkg/Copyright/License.pl
-%%SITE_PERL%%/Config/Model/models/PopCon.pl
-%%SITE_PERL%%/Config/Model/models/Fstab/UsbFsOptions.pl
-%%SITE_PERL%%/Config/Model/models/Fstab/FsLine.pl
-%%SITE_PERL%%/Config/Model/models/Fstab/SwapOptions.pl
-%%SITE_PERL%%/Config/Model/models/Fstab/Iso9660_Opt.pl
+%%SITE_PERL%%/Config/Model/models/Fstab.pl
 %%SITE_PERL%%/Config/Model/models/Fstab/CommonOptions.pl
 %%SITE_PERL%%/Config/Model/models/Fstab/Ext2FsOpt.pl
 %%SITE_PERL%%/Config/Model/models/Fstab/Ext3FsOpt.pl
-%%SITE_PERL%%/Config/Model/models/Fstab.pl
+%%SITE_PERL%%/Config/Model/models/Fstab/FsLine.pl
+%%SITE_PERL%%/Config/Model/models/Fstab/Iso9660_Opt.pl
+%%SITE_PERL%%/Config/Model/models/Fstab/SwapOptions.pl
+%%SITE_PERL%%/Config/Model/models/Fstab/UsbFsOptions.pl
+%%SITE_PERL%%/Config/Model/models/PopCon.pl
+%%SITE_PERL%%/Config/Model/system.d/popcon
+@dirrmtry %%SITE_PERL%%/Config/Model/system.d
+@dirrmtry %%SITE_PERL%%/Config/Model/models/Fstab
 @dirrmtry %%SITE_PERL%%/Config/Model/models/Debian/Dpkg/Copyright
 @dirrmtry %%SITE_PERL%%/Config/Model/models/Debian/Dpkg/Control
 @dirrmtry %%SITE_PERL%%/Config/Model/models/Debian/Dpkg
 @dirrmtry %%SITE_PERL%%/Config/Model/models/Debian
-@dirrmtry %%SITE_PERL%%/Config/Model/models/Fstab
 @dirrmtry %%SITE_PERL%%/Config/Model/models
+@dirrmtry %%SITE_PERL%%/Config/Model/application.d
+@dirrmtry %%SITE_PERL%%/Config/Model/Manual
+@dirrmtry %%SITE_PERL%%/Config/Model/Cookbook
 @dirrmtry %%SITE_PERL%%/Config/Model/Backend/Debian/Dpkg
 @dirrmtry %%SITE_PERL%%/Config/Model/Backend/Debian
 @dirrmtry %%SITE_PERL%%/Config/Model/Backend
-@dirrmtry %%SITE_PERL%%/Config/Model/Manual
 @dirrmtry %%SITE_PERL%%/Config/Model
 @dirrmtry %%SITE_PERL%%/Config