1 files changed, 83 insertions, 68 deletions

diff --git a/textproc/p5-Perl-Critic/pkg-plist b/textproc/p5-Perl-Critic/pkg-plist
index b1d20bc27a18..514753ad3b5c 100644
--- a/textproc/p5-Perl-Critic/pkg-plist
+++ b/textproc/p5-Perl-Critic/pkg-plist
@@ -1,97 +1,112 @@
 bin/perlcritic
+%%SITE_PERL%%/Perl/Critic.pm
 %%SITE_PERL%%/Perl/Critic/Config.pm
 %%SITE_PERL%%/Perl/Critic/DEVELOPER.pod
+%%SITE_PERL%%/Perl/Critic/Defaults.pm
 %%SITE_PERL%%/Perl/Critic/Document.pm
-%%SITE_PERL%%/Perl/Critic/TestUtils.pm
-%%SITE_PERL%%/Perl/Critic/Utils.pm
 %%SITE_PERL%%/Perl/Critic/Policy.pm
-%%SITE_PERL%%/Perl/Critic/PolicySummary.pod
-%%SITE_PERL%%/Perl/Critic/Violation.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitLocalVars.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitPunctuationVars.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitPackageVars.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitMatchVars.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProtectPrivateVars.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/RequireInitializationForLocalVars.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitConditionalDeclarations.pm
-%%SITE_PERL%%/Perl/Critic/Policy/NamingConventions/ProhibitMixedCaseVars.pm
-%%SITE_PERL%%/Perl/Critic/Policy/NamingConventions/ProhibitMixedCaseSubs.pm
-%%SITE_PERL%%/Perl/Critic/Policy/NamingConventions/ProhibitAmbiguousNames.pm
-%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitBarewordFileHandles.pm
-%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitTwoArgOpen.pm
-%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitInteractiveTest.pm
-%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitBacktickOperators.pm
-%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitOneArgSelect.pm
-%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitReadlineInForLoop.pm
-%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/RequireBracedFileHandleWithPrint.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitLvalueSubstr.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitReverseSortBlock.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitSleepViaSelect.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitStringyEval.pm
 %%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitStringySplit.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/RequireNegativeIndices.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Variables/RequireLexicalLoopIterators.pm
-%%SITE_PERL%%/Perl/Critic/Policy/RegularExpressions/ProhibitCaptureWithoutTest.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitUniversalCan.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitUniversalIsa.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitVoidGrep.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitVoidMap.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/RequireBlockGrep.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/RequireBlockMap.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/RequireGlobFunction.pm
+%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/RequireSimpleSortBlock.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ClassHierarchies/ProhibitAutoloading.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ClassHierarchies/ProhibitExplicitISA.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ClassHierarchies/ProhibitOneArgBless.pm
+%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout
+%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/ProhibitHardTabs.pm
+%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/ProhibitParensWithBuiltins.pm
+%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/ProhibitQuotedWordLists.pm
+%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/RequireConsistentNewlines.pm
+%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/RequireTidyCode.pm
+%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/RequireTrailingCommas.pm
 %%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitCStyleForLoops.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitDeepNests.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitUntilBlocks.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitUnreachableCode.pm
 %%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitCascadingIfElse.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitDeepNests.pm
 %%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitPostfixControls.pm
 %%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitUnlessBlocks.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitUnreachableCode.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ControlStructures/ProhibitUntilBlocks.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Documentation/RequirePodAtEnd.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Documentation/RequirePodSections.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitInterpolationOfLiterals.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitLeadingZeros.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitNoisyQuotes.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitVersionStrings.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/RequireQuotedHeredocTerminator.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/RequireUpperCaseHeredocTerminator.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/RequireNumberSeparators.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitConstantPragma.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitEmptyQuotes.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitMixedBooleanOperators.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitEscapedCharacters.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/RequireInterpolationOfMetachars.pm
 %%SITE_PERL%%/Perl/Critic/Policy/ErrorHandling/RequireCarping.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Modules/RequireVersionVar.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Modules/RequireBarewordIncludes.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Modules/RequireExplicitPackage.pm
+%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitBacktickOperators.pm
+%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitBarewordFileHandles.pm
+%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitInteractiveTest.pm
+%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitOneArgSelect.pm
+%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitReadlineInForLoop.pm
+%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/ProhibitTwoArgOpen.pm
+%%SITE_PERL%%/Perl/Critic/Policy/InputOutput/RequireBracedFileHandleWithPrint.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Miscellanea/ProhibitFormats.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Miscellanea/ProhibitTies.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Miscellanea/RequireRcsKeywords.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Modules/ProhibitAutomaticExportation.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Modules/ProhibitMultiplePackages.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Modules/ProhibitEvilModules.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Modules/ProhibitMultiplePackages.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Modules/RequireBarewordIncludes.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Modules/RequireEndWithOne.pm
-%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/ProhibitParensWithBuiltins.pm
-%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/RequireTidyCode.pm
-%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/ProhibitQuotedWordLists.pm
-%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/RequireTrailingCommas.pm
-%%SITE_PERL%%/Perl/Critic/Policy/CodeLayout/ProhibitHardTabs.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/RequireGlobFunction.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/RequireSimpleSortBlock.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/RequireBlockMap.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitLvalueSubstr.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitUniversalIsa.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitUniversalCan.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/RequireBlockGrep.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitStringyEval.pm
-%%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions/ProhibitSleepViaSelect.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Modules/RequireExplicitPackage.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Modules/RequireFilenameMatchesPackage.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Modules/RequireVersionVar.pm
+%%SITE_PERL%%/Perl/Critic/Policy/NamingConventions/ProhibitAmbiguousNames.pm
+%%SITE_PERL%%/Perl/Critic/Policy/NamingConventions/ProhibitMixedCaseSubs.pm
+%%SITE_PERL%%/Perl/Critic/Policy/NamingConventions/ProhibitMixedCaseVars.pm
 %%SITE_PERL%%/Perl/Critic/Policy/References/ProhibitDoubleSigils.pm
-%%SITE_PERL%%/Perl/Critic/Policy/RegularExpressions/RequireLineBoundaryMatching.pm
+%%SITE_PERL%%/Perl/Critic/Policy/RegularExpressions/ProhibitCaptureWithoutTest.pm
 %%SITE_PERL%%/Perl/Critic/Policy/RegularExpressions/RequireExtendedFormatting.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProhibitSubroutinePrototypes.pm
+%%SITE_PERL%%/Perl/Critic/Policy/RegularExpressions/RequireLineBoundaryMatching.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProhibitAmpersandSigils.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProhibitBuiltinHomonyms.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProhibitExcessComplexity.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProhibitExplicitReturnUndef.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProhibitSubroutinePrototypes.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProtectPrivateSubs.pm
 %%SITE_PERL%%/Perl/Critic/Policy/Subroutines/RequireFinalReturn.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProhibitAmpersandSigils.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Subroutines/ProhibitExcessComplexity.pm
+%%SITE_PERL%%/Perl/Critic/Policy/TestingAndDebugging
 %%SITE_PERL%%/Perl/Critic/Policy/TestingAndDebugging/ProhibitNoStrict.pm
 %%SITE_PERL%%/Perl/Critic/Policy/TestingAndDebugging/ProhibitNoWarnings.pm
+%%SITE_PERL%%/Perl/Critic/Policy/TestingAndDebugging/RequireTestLabels.pm
 %%SITE_PERL%%/Perl/Critic/Policy/TestingAndDebugging/RequireUseStrict.pm
 %%SITE_PERL%%/Perl/Critic/Policy/TestingAndDebugging/RequireUseWarnings.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ClassHierarchies/ProhibitOneArgBless.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ClassHierarchies/ProhibitAutoloading.pm
-%%SITE_PERL%%/Perl/Critic/Policy/ClassHierarchies/ProhibitExplicitISA.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Miscellanea/RequireRcsKeywords.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Miscellanea/ProhibitFormats.pm
-%%SITE_PERL%%/Perl/Critic/Policy/Miscellanea/ProhibitTies.pm
-%%SITE_PERL%%/Perl/Critic.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitConstantPragma.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitEmptyQuotes.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitEscapedCharacters.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitInterpolationOfLiterals.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitLeadingZeros.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitMismatchedOperators.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitMixedBooleanOperators.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitNoisyQuotes.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/ProhibitVersionStrings.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/RequireInterpolationOfMetachars.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/RequireNumberSeparators.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/RequireQuotedHeredocTerminator.pm
+%%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions/RequireUpperCaseHeredocTerminator.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitConditionalDeclarations.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitLocalVars.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitMatchVars.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitPackageVars.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProhibitPunctuationVars.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/ProtectPrivateVars.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/RequireInitializationForLocalVars.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/RequireLexicalLoopIterators.pm
+%%SITE_PERL%%/Perl/Critic/Policy/Variables/RequireNegativeIndices.pm
+%%SITE_PERL%%/Perl/Critic/PolicyFactory.pm
+%%SITE_PERL%%/Perl/Critic/PolicySummary.pod
+%%SITE_PERL%%/Perl/Critic/TestUtils.pm
+%%SITE_PERL%%/Perl/Critic/Theme.pm
+%%SITE_PERL%%/Perl/Critic/UserProfile.pm
+%%SITE_PERL%%/Perl/Critic/Utils.pm
+%%SITE_PERL%%/Perl/Critic/Violation.pm
 @dirrm %%SITE_PERL%%/Perl/Critic/Policy/Variables
 @dirrm %%SITE_PERL%%/Perl/Critic/Policy/ValuesAndExpressions
 @dirrm %%SITE_PERL%%/Perl/Critic/Policy/TestingAndDebugging