aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/activitymail/Makefile2
-rw-r--r--devel/autodia/Makefile2
-rw-r--r--devel/cpan-upload/Makefile4
-rw-r--r--devel/p5-AI-Pathfinding-AStar/Makefile3
-rw-r--r--devel/p5-Acme-MetaSyntactic/Makefile3
-rw-r--r--devel/p5-Agent/Makefile3
-rw-r--r--devel/p5-Algorithm-Accounting/Makefile3
-rw-r--r--devel/p5-Algorithm-Annotate/Makefile3
-rw-r--r--devel/p5-Algorithm-Bucketizer/Makefile3
-rw-r--r--devel/p5-Algorithm-C3/Makefile3
-rw-r--r--devel/p5-Algorithm-ChooseSubsets/Makefile3
-rw-r--r--devel/p5-Algorithm-Dependency-Objects/Makefile3
-rw-r--r--devel/p5-Algorithm-Dependency/Makefile3
-rw-r--r--devel/p5-Algorithm-Diff/Makefile3
-rw-r--r--devel/p5-Algorithm-IncludeExclude/Makefile3
-rw-r--r--devel/p5-Algorithm-Interval2Prefix/Makefile3
-rw-r--r--devel/p5-Algorithm-LCS/Makefile2
-rw-r--r--devel/p5-Algorithm-LUHN/Makefile3
-rw-r--r--devel/p5-Algorithm-MDiff/Makefile3
-rw-r--r--devel/p5-Algorithm-MinMax/Makefile3
-rw-r--r--devel/p5-Algorithm-NaiveBayes/Makefile3
-rw-r--r--devel/p5-Algorithm-Networksort/Makefile3
-rw-r--r--devel/p5-Algorithm-Numerical-Shuffle/Makefile3
-rw-r--r--devel/p5-Algorithm-Permute/Makefile3
-rw-r--r--devel/p5-Alias/Makefile3
-rw-r--r--devel/p5-App-CLI/Makefile3
-rw-r--r--devel/p5-App-Cache/Makefile3
-rw-r--r--devel/p5-App-Control/Makefile3
-rw-r--r--devel/p5-App-Options/Makefile3
-rw-r--r--devel/p5-App-Trace/Makefile3
-rw-r--r--devel/p5-AppConfig-Std/Makefile3
-rw-r--r--devel/p5-Array-Group/Makefile3
-rw-r--r--devel/p5-Array-Iterator/Makefile3
-rw-r--r--devel/p5-Array-Window/Makefile2
-rw-r--r--devel/p5-AtExit/Makefile3
-rw-r--r--devel/p5-Attribute-Handlers/Makefile3
-rw-r--r--devel/p5-AutoLoader/Makefile3
-rw-r--r--devel/p5-B-Generate/Makefile3
-rw-r--r--devel/p5-B-Graph/Makefile3
-rw-r--r--devel/p5-B-Size/Makefile3
-rw-r--r--devel/p5-B-Utils/Makefile3
-rw-r--r--devel/p5-BFD/Makefile2
-rw-r--r--devel/p5-BSD-Resource/Makefile3
-rw-r--r--devel/p5-BSD-stat/Makefile3
-rw-r--r--devel/p5-Best/Makefile2
-rw-r--r--devel/p5-Bundle-Perl6/Makefile3
-rw-r--r--devel/p5-C-Scan/Makefile3
-rw-r--r--devel/p5-CPAN-DistnameInfo/Makefile3
-rw-r--r--devel/p5-CPAN-Mini/Makefile3
-rw-r--r--devel/p5-CPANPLUS/Makefile3
-rw-r--r--devel/p5-Cache-Cache/Makefile3
-rw-r--r--devel/p5-Cache-FastMmap/Makefile3
-rw-r--r--devel/p5-Cache-Mmap/Makefile3
-rw-r--r--devel/p5-Cache-Simple-TimedExpiry/Makefile3
-rw-r--r--devel/p5-Cache/Makefile3
-rw-r--r--devel/p5-Calendar-Simple/Makefile3
-rw-r--r--devel/p5-Carp-Assert-More/Makefile3
-rw-r--r--devel/p5-Carp-Assert/Makefile3
-rw-r--r--devel/p5-Carp-Datum/Makefile3
-rw-r--r--devel/p5-Class-Accessor-Lvalue/Makefile3
-rw-r--r--devel/p5-Class-Accessor-Named/Makefile3
-rw-r--r--devel/p5-Class-Accessor/Makefile3
-rw-r--r--devel/p5-Class-ArrayObjects/Makefile3
-rw-r--r--devel/p5-Class-AutoClass/Makefile3
-rw-r--r--devel/p5-Class-Autouse/Makefile3
-rw-r--r--devel/p5-Class-Base/Makefile3
-rw-r--r--devel/p5-Class-BlackHole/Makefile3
-rw-r--r--devel/p5-Class-C3-XS/Makefile3
-rw-r--r--devel/p5-Class-C3/Makefile3
-rw-r--r--devel/p5-Class-Closure/Makefile3
-rw-r--r--devel/p5-Class-CodeStyler/Makefile3
-rw-r--r--devel/p5-Class-Constant/Makefile3
-rw-r--r--devel/p5-Class-Container/Makefile3
-rw-r--r--devel/p5-Class-Contract/Makefile3
-rw-r--r--devel/p5-Class-Data-Inheritable/Makefile3
-rw-r--r--devel/p5-Class-Date/Makefile3
-rw-r--r--devel/p5-Class-Default/Makefile3
-rw-r--r--devel/p5-Class-Delegation/Makefile2
-rw-r--r--devel/p5-Class-ErrorHandler/Makefile3
-rw-r--r--devel/p5-Class-Factory-Util/Makefile3
-rw-r--r--devel/p5-Class-Factory/Makefile3
-rw-r--r--devel/p5-Class-Fields/Makefile3
-rw-r--r--devel/p5-Class-Generate/Makefile3
-rw-r--r--devel/p5-Class-Handle/Makefile3
-rw-r--r--devel/p5-Class-ISA/Makefile3
-rw-r--r--devel/p5-Class-Inner/Makefile3
-rw-r--r--devel/p5-Class-Interfaces/Makefile3
-rw-r--r--devel/p5-Class-Loader/Makefile3
-rw-r--r--devel/p5-Class-MakeMethods/Makefile3
-rw-r--r--devel/p5-Class-MethodMapper/Makefile3
-rw-r--r--devel/p5-Class-MixinFactory/Makefile3
-rw-r--r--devel/p5-Class-Multimethods-Pure/Makefile3
-rw-r--r--devel/p5-Class-Multimethods/Makefile3
-rw-r--r--devel/p5-Class-NamedParms/Makefile3
-rw-r--r--devel/p5-Class-OOorNO/Makefile3
-rw-r--r--devel/p5-Class-Observable/Makefile3
-rw-r--r--devel/p5-Class-ParmList/Makefile3
-rw-r--r--devel/p5-Class-Prototyped/Makefile3
-rw-r--r--devel/p5-Class-ReturnValue/Makefile3
-rw-r--r--devel/p5-Class-Roles/Makefile3
-rw-r--r--devel/p5-Class-STL-Containers/Makefile3
-rw-r--r--devel/p5-Class-Spiffy/Makefile3
-rw-r--r--devel/p5-Class-StateMachine/Makefile3
-rw-r--r--devel/p5-Class-StrongSingleton/Makefile3
-rw-r--r--devel/p5-Class-Tangram/Makefile3
-rw-r--r--devel/p5-Class-Throwable/Makefile3
-rw-r--r--devel/p5-Class-Tom/Makefile3
-rw-r--r--devel/p5-Class-Trigger/Makefile3
-rw-r--r--devel/p5-Class-Virtual/Makefile3
-rw-r--r--devel/p5-Class-WhiteHole/Makefile3
-rw-r--r--devel/p5-Class-Workflow/Makefile3
-rw-r--r--devel/p5-Class-XPath/Makefile3
-rw-r--r--devel/p5-Clone-More/Makefile3
-rw-r--r--devel/p5-Clone-PP/Makefile3
-rw-r--r--devel/p5-Clone/Makefile3
-rw-r--r--devel/p5-Code-Perl/Makefile2
-rw-r--r--devel/p5-Commands-Guarded/Makefile3
-rw-r--r--devel/p5-CommitBit/Makefile2
-rw-r--r--devel/p5-Config-ApacheFormat/Makefile3
-rw-r--r--devel/p5-Config-Fast/Makefile3
-rw-r--r--devel/p5-Config-INI-Simple/Makefile3
-rw-r--r--devel/p5-Config-IniFiles/Makefile2
-rw-r--r--devel/p5-Config-Objective/Makefile3
-rw-r--r--devel/p5-Config-Properties/Makefile3
-rw-r--r--devel/p5-Config-Record/Makefile3
-rw-r--r--devel/p5-Config-Simple/Makefile3
-rw-r--r--devel/p5-Config-Tiny/Makefile3
-rw-r--r--devel/p5-ConfigReader-Simple/Makefile2
-rw-r--r--devel/p5-ConfigReader/Makefile3
-rw-r--r--devel/p5-Contextual-Return/Makefile2
-rw-r--r--devel/p5-Curses-Application/Makefile3
-rw-r--r--devel/p5-Curses-Forms/Makefile3
-rw-r--r--devel/p5-Curses-UI/Makefile3
-rw-r--r--devel/p5-Curses-Widgets/Makefile3
-rw-r--r--devel/p5-Cvs/Makefile4
-rw-r--r--devel/p5-DB_File-Lock/Makefile3
-rw-r--r--devel/p5-Danga-Socket/Makefile3
-rw-r--r--devel/p5-Data-ACL/Makefile3
-rw-r--r--devel/p5-Data-Bind/Makefile3
-rw-r--r--devel/p5-Data-Compare/Makefile3
-rw-r--r--devel/p5-Data-DumpXML/Makefile3
-rw-r--r--devel/p5-Data-Dumper-Simple/Makefile3
-rw-r--r--devel/p5-Data-Flow/Makefile3
-rw-r--r--devel/p5-Data-GUID/Makefile3
-rw-r--r--devel/p5-Data-HexDump/Makefile3
-rw-r--r--devel/p5-Data-Hierarchy/Makefile3
-rw-r--r--devel/p5-Data-Lazy/Makefile3
-rw-r--r--devel/p5-Data-OptList/Makefile3
-rw-r--r--devel/p5-Data-Postponed/Makefile3
-rw-r--r--devel/p5-Data-Properties/Makefile3
-rw-r--r--devel/p5-Data-Random/Makefile3
-rw-r--r--devel/p5-Data-RoundRobin/Makefile3
-rw-r--r--devel/p5-Data-Serializer/Makefile3
-rw-r--r--devel/p5-Data-ShowTable/Makefile3
-rw-r--r--devel/p5-Data-Stag/Makefile3
-rw-r--r--devel/p5-Data-Structure-Util/Makefile3
-rw-r--r--devel/p5-Data-Table/Makefile3
-rw-r--r--devel/p5-Data-Taxonomy-Tags/Makefile3
-rw-r--r--devel/p5-Data-TemporaryBag/Makefile3
-rw-r--r--devel/p5-Data-TreeDumper/Makefile3
-rw-r--r--devel/p5-Data-Types/Makefile3
-rw-r--r--devel/p5-Data-UUID/Makefile3
-rw-r--r--devel/p5-Data-Validate/Makefile3
-rw-r--r--devel/p5-Date-Calc/Makefile2
-rw-r--r--devel/p5-Date-DayOfWeek/Makefile3
-rw-r--r--devel/p5-Date-Easter/Makefile3
-rw-r--r--devel/p5-Date-EzDate/Makefile3
-rw-r--r--devel/p5-Date-Holidays-DK/Makefile3
-rw-r--r--devel/p5-Date-ISO/Makefile3
-rw-r--r--devel/p5-Date-Manip/Makefile3
-rw-r--r--devel/p5-Date-Pcalc/Makefile3
-rw-r--r--devel/p5-Date-Range/Makefile3
-rw-r--r--devel/p5-Date-Roman/Makefile3
-rw-r--r--devel/p5-Date-Set/Makefile3
-rw-r--r--devel/p5-Date-Simple/Makefile3
-rw-r--r--devel/p5-DateConvert/Makefile3
-rw-r--r--devel/p5-DateTime-Calendar-Discordian/Makefile3
-rw-r--r--devel/p5-DateTime-Event-Recurrence/Makefile3
-rw-r--r--devel/p5-DateTime-Set/Makefile3
-rw-r--r--devel/p5-DateTime-Util-Astro/Makefile3
-rw-r--r--devel/p5-DateTime-Util-Calc/Makefile3
-rw-r--r--devel/p5-Decision-ACL/Makefile3
-rw-r--r--devel/p5-Devel-Arena/Makefile3
-rw-r--r--devel/p5-Devel-Constants/Makefile3
-rw-r--r--devel/p5-Devel-CoreStack/Makefile3
-rw-r--r--devel/p5-Devel-Cycle/Makefile3
-rw-r--r--devel/p5-Devel-DProfPP/Makefile3
-rw-r--r--devel/p5-Devel-Diagram/Makefile3
-rw-r--r--devel/p5-Devel-Leak-Object/Makefile3
-rw-r--r--devel/p5-Devel-Leak/Makefile3
-rw-r--r--devel/p5-Devel-LeakTrace/Makefile3
-rw-r--r--devel/p5-Devel-LexAlias/Makefile3
-rw-r--r--devel/p5-Devel-Messenger/Makefile3
-rw-r--r--devel/p5-Devel-Modlist/Makefile3
-rw-r--r--devel/p5-Devel-ObjectTracker/Makefile3
-rw-r--r--devel/p5-Devel-PPPort/Makefile3
-rw-r--r--devel/p5-Devel-Pointer/Makefile3
-rw-r--r--devel/p5-Devel-Profiler/Makefile3
-rw-r--r--devel/p5-Devel-Required/Makefile3
-rw-r--r--devel/p5-Devel-RingBuffer/Makefile3
-rw-r--r--devel/p5-Devel-STrace/Makefile3
-rw-r--r--devel/p5-Devel-SmallProf/Makefile3
-rw-r--r--devel/p5-Devel-StackTrace/Makefile3
-rw-r--r--devel/p5-Devel-StealthDebug/Makefile3
-rw-r--r--devel/p5-Devel-Timer/Makefile3
-rw-r--r--devel/p5-Devel-TraceCalls/Makefile3
-rw-r--r--devel/p5-Devel-TraceUse/Makefile3
-rw-r--r--devel/p5-Devel-ptkdb/Makefile3
-rw-r--r--devel/p5-Dialog/Makefile3
-rw-r--r--devel/p5-Digest-TransformPath/Makefile3
-rw-r--r--devel/p5-Dir-Project/Makefile3
-rw-r--r--devel/p5-Directory-Scratch/Makefile3
-rw-r--r--devel/p5-Env-PS1/Makefile3
-rw-r--r--devel/p5-Env-Path/Makefile3
-rw-r--r--devel/p5-Errno/Makefile3
-rw-r--r--devel/p5-Event-ExecFlow/Makefile3
-rw-r--r--devel/p5-Event-Lib/Makefile3
-rw-r--r--devel/p5-Event-RPC/Makefile3
-rw-r--r--devel/p5-Event/Makefile3
-rw-r--r--devel/p5-Exception-Class/Makefile3
-rw-r--r--devel/p5-Exception-Handler/Makefile3
-rw-r--r--devel/p5-Expect-Simple/Makefile3
-rw-r--r--devel/p5-Exporter-Tidy/Makefile3
-rw-r--r--devel/p5-ExtUtils-AutoInstall/Makefile3
-rw-r--r--devel/p5-ExtUtils-Command/Makefile3
-rw-r--r--devel/p5-ExtUtils-Constant/Makefile3
-rw-r--r--devel/p5-ExtUtils-Depends/Makefile3
-rw-r--r--devel/p5-ExtUtils-MakeMaker-Coverage/Makefile3
-rw-r--r--devel/p5-ExtUtils-PkgConfig/Makefile3
-rw-r--r--devel/p5-ExtUtils-XSBuilder/Makefile3
-rw-r--r--devel/p5-FSA-Rules/Makefile2
-rw-r--r--devel/p5-File-Append-TempFile/Makefile3
-rw-r--r--devel/p5-File-Attributes-Recursive/Makefile3
-rw-r--r--devel/p5-File-Attributes/Makefile3
-rw-r--r--devel/p5-File-BaseDir/Makefile3
-rw-r--r--devel/p5-File-BasicFlock/Makefile3
-rw-r--r--devel/p5-File-Cache/Makefile3
-rw-r--r--devel/p5-File-Cat/Makefile3
-rw-r--r--devel/p5-File-CreationTime/Makefile3
-rw-r--r--devel/p5-File-DesktopEntry/Makefile3
-rw-r--r--devel/p5-File-FTS/Makefile3
-rw-r--r--devel/p5-File-Find-Rule-Filesys-Virtual/Makefile3
-rw-r--r--devel/p5-File-Find-Rule/Makefile3
-rw-r--r--devel/p5-File-Flat/Makefile3
-rw-r--r--devel/p5-File-Flock/Makefile3
-rw-r--r--devel/p5-File-FnMatch/Makefile3
-rw-r--r--devel/p5-File-Grep/Makefile3
-rw-r--r--devel/p5-File-HomeDir/Makefile3
-rw-r--r--devel/p5-File-Lock/Makefile3
-rw-r--r--devel/p5-File-MMagic-XS/Makefile3
-rw-r--r--devel/p5-File-MMagic/Makefile3
-rw-r--r--devel/p5-File-Modified/Makefile3
-rw-r--r--devel/p5-File-Monitor/Makefile3
-rw-r--r--devel/p5-File-NCopy/Makefile2
-rw-r--r--devel/p5-File-NFSLock/Makefile3
-rw-r--r--devel/p5-File-Path-Expand/Makefile3
-rw-r--r--devel/p5-File-PathConvert/Makefile3
-rw-r--r--devel/p5-File-Pid/Makefile3
-rw-r--r--devel/p5-File-Random/Makefile3
-rw-r--r--devel/p5-File-ReadBackwards/Makefile3
-rw-r--r--devel/p5-File-ShareDir/Makefile3
-rw-r--r--devel/p5-File-Slurp-Tree/Makefile3
-rw-r--r--devel/p5-File-Sync/Makefile3
-rw-r--r--devel/p5-File-Tail/Makefile3
-rw-r--r--devel/p5-File-Temp/Makefile3
-rw-r--r--devel/p5-File-Tempdir/Makefile3
-rw-r--r--devel/p5-File-Type/Makefile3
-rw-r--r--devel/p5-File-chdir/Makefile3
-rw-r--r--devel/p5-File-chmod/Makefile3
-rw-r--r--devel/p5-File-pushd/Makefile3
-rw-r--r--devel/p5-FileHandle-Fmode/Makefile3
-rw-r--r--devel/p5-FileHandle-Unget/Makefile3
-rw-r--r--devel/p5-Filter-Template/Makefile3
-rw-r--r--devel/p5-Filter/Makefile3
-rw-r--r--devel/p5-FreezeThaw/Makefile3
-rw-r--r--devel/p5-Gearman-Client-Async/Makefile2
-rw-r--r--devel/p5-Gearman-Server/Makefile2
-rw-r--r--devel/p5-Gearman/Makefile2
-rw-r--r--devel/p5-Getopt-ArgvFile/Makefile3
-rw-r--r--devel/p5-Getopt-Declare/Makefile3
-rw-r--r--devel/p5-Getopt-Long/Makefile3
-rw-r--r--devel/p5-Getopt-Mixed/Makefile3
-rw-r--r--devel/p5-Getopt-Popt/Makefile3
-rw-r--r--devel/p5-Hash-WithDefaults/Makefile3
-rw-r--r--devel/p5-Heap-Simple-Perl/Makefile3
-rw-r--r--devel/p5-Heap-Simple-XS/Makefile3
-rw-r--r--devel/p5-Heap-Simple/Makefile3
-rw-r--r--devel/p5-Heap/Makefile3
-rw-r--r--devel/p5-Hook-LexWrap/Makefile3
-rw-r--r--devel/p5-IO-All/Makefile3
-rw-r--r--devel/p5-IO-Capture/Makefile3
-rw-r--r--devel/p5-IO-Digest/Makefile3
-rw-r--r--devel/p5-IO-KQueue/Makefile3
-rw-r--r--devel/p5-IO-LockedFile/Makefile3
-rw-r--r--devel/p5-IO-Multiplex/Makefile3
-rw-r--r--devel/p5-IO-NestedCapture/Makefile3
-rw-r--r--devel/p5-IO-Null/Makefile3
-rw-r--r--devel/p5-IO-Pager/Makefile3
-rw-r--r--devel/p5-IO-Prompt/Makefile3
-rw-r--r--devel/p5-IO-String/Makefile3
-rw-r--r--devel/p5-IO-Tee/Makefile3
-rw-r--r--devel/p5-IO-Toolkit/Makefile3
-rw-r--r--devel/p5-IO-Tty/Makefile3
-rw-r--r--devel/p5-IO-Util/Makefile3
-rw-r--r--devel/p5-IO-YAML/Makefile3
-rw-r--r--devel/p5-IO-stringy/Makefile3
-rw-r--r--devel/p5-IO/Makefile3
-rw-r--r--devel/p5-IOC/Makefile2
-rw-r--r--devel/p5-IPC-Cache/Makefile3
-rw-r--r--devel/p5-IPC-Cmd/Makefile3
-rw-r--r--devel/p5-IPC-DirQueue/Makefile3
-rw-r--r--devel/p5-IPC-Locker/Makefile3
-rw-r--r--devel/p5-IPC-MM/Makefile3
-rw-r--r--devel/p5-IPC-Mmap-Share/Makefile3
-rw-r--r--devel/p5-IPC-Open3-Simple/Makefile3
-rw-r--r--devel/p5-IPC-PubSub/Makefile3
-rw-r--r--devel/p5-IPC-Run/Makefile3
-rw-r--r--devel/p5-IPC-SharedCache/Makefile3
-rw-r--r--devel/p5-IPC-Signal/Makefile3
-rw-r--r--devel/p5-Include/Makefile3
-rw-r--r--devel/p5-Inline-ASM/Makefile3
-rw-r--r--devel/p5-Inline-CPP/Makefile3
-rw-r--r--devel/p5-Inline-Files/Makefile3
-rw-r--r--devel/p5-Inline-Filters/Makefile3
-rw-r--r--devel/p5-Inline-Java/Makefile3
-rw-r--r--devel/p5-Inline-Tcl/Makefile3
-rw-r--r--devel/p5-Inline/Makefile3
-rw-r--r--devel/p5-Ioctl/Makefile3
-rw-r--r--devel/p5-Iterator-IO/Makefile3
-rw-r--r--devel/p5-Iterator-Misc/Makefile3
-rw-r--r--devel/p5-Iterator-Util/Makefile3
-rw-r--r--devel/p5-Iterator/Makefile3
-rw-r--r--devel/p5-Java/Makefile3
-rw-r--r--devel/p5-Lexical-Alias/Makefile3
-rw-r--r--devel/p5-Lexical-Persistence/Makefile3
-rw-r--r--devel/p5-List-Cycle/Makefile3
-rw-r--r--devel/p5-List-Group/Makefile3
-rw-r--r--devel/p5-Locale-Maketext-Fuzzy/Makefile3
-rw-r--r--devel/p5-Locale-Maketext-Simple/Makefile3
-rw-r--r--devel/p5-Locale-PGetText/Makefile3
-rw-r--r--devel/p5-Locale-gettext/Makefile3
-rw-r--r--devel/p5-Locale-libintl/Makefile3
-rw-r--r--devel/p5-LockFile-Simple/Makefile3
-rw-r--r--devel/p5-Log-Accounting-SVK/Makefile3
-rw-r--r--devel/p5-Log-Accounting-SVN/Makefile3
-rw-r--r--devel/p5-Log-Agent-Logger/Makefile2
-rw-r--r--devel/p5-Log-Agent/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-FileRotate/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-FileShared/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-Perl/Makefile3
-rw-r--r--devel/p5-Log-Message-Simple/Makefile3
-rw-r--r--devel/p5-Log-Message/Makefile3
-rw-r--r--devel/p5-Log-Report/Makefile3
-rw-r--r--devel/p5-Log-Simple/Makefile3
-rw-r--r--devel/p5-Log-TraceMessages/Makefile3
-rw-r--r--devel/p5-Luka/Makefile2
-rw-r--r--devel/p5-Mac-FileSpec-Unixish/Makefile3
-rw-r--r--devel/p5-Make-Cache/Makefile3
-rw-r--r--devel/p5-Make/Makefile3
-rw-r--r--devel/p5-Memoize-ExpireLRU/Makefile3
-rw-r--r--devel/p5-Memoize/Makefile3
-rw-r--r--devel/p5-Mknod/Makefile2
-rw-r--r--devel/p5-Module-Compile/Makefile3
-rw-r--r--devel/p5-Module-Dependency/Makefile3
-rw-r--r--devel/p5-Module-Info/Makefile3
-rw-r--r--devel/p5-Module-Pluggable-Fast/Makefile3
-rw-r--r--devel/p5-Module-Release/Makefile3
-rw-r--r--devel/p5-Module-Reload-Sel/Makefile3
-rw-r--r--devel/p5-Module-Reload/Makefile3
-rw-r--r--devel/p5-Module-Starter-PBP/Makefile3
-rw-r--r--devel/p5-Module-Versions-Report/Makefile3
-rw-r--r--devel/p5-Moose-Policy/Makefile2
-rw-r--r--devel/p5-MooseX-IOC/Makefile3
-rw-r--r--devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile3
-rw-r--r--devel/p5-Net-DBus/Makefile3
-rw-r--r--devel/p5-Number-Bytes-Human/Makefile3
-rw-r--r--devel/p5-OLE-Storage_Lite/Makefile3
-rw-r--r--devel/p5-OOTools/Makefile2
-rw-r--r--devel/p5-ORBit/Makefile3
-rw-r--r--devel/p5-Object-Accessor/Makefile3
-rw-r--r--devel/p5-Object-Array/Makefile3
-rw-r--r--devel/p5-Object-Declare/Makefile3
-rw-r--r--devel/p5-Object-Enum/Makefile3
-rw-r--r--devel/p5-Object-MultiType/Makefile3
-rw-r--r--devel/p5-Object-Signature/Makefile3
-rw-r--r--devel/p5-P4-Client/Makefile3
-rw-r--r--devel/p5-P4/Makefile3
-rw-r--r--devel/p5-PAR-Dist/Makefile3
-rw-r--r--devel/p5-PAR-Packer/Makefile3
-rw-r--r--devel/p5-PAR/Makefile3
-rw-r--r--devel/p5-POE-API-Hooks/Makefile3
-rw-r--r--devel/p5-POE-API-Peek/Makefile3
-rw-r--r--devel/p5-POE-Component-Child/Makefile3
-rw-r--r--devel/p5-POE-Component-Daemon/Makefile3
-rw-r--r--devel/p5-POE-Component-DebugShell/Makefile3
-rw-r--r--devel/p5-POE-Component-DirWatch/Makefile3
-rw-r--r--devel/p5-POE-Component-IKC/Makefile3
-rw-r--r--devel/p5-POE-Component-JobQueue/Makefile3
-rw-r--r--devel/p5-POE-Component-Logger/Makefile3
-rw-r--r--devel/p5-POE-Component-RSS/Makefile3
-rw-r--r--devel/p5-POE-Component-RSSAggregator/Makefile3
-rw-r--r--devel/p5-POE-Component-Server-XMLRPC/Makefile3
-rw-r--r--devel/p5-POE-Component-TSTP/Makefile3
-rw-r--r--devel/p5-POE-Devel-Profiler/Makefile3
-rw-r--r--devel/p5-POE-Exceptions/Makefile3
-rw-r--r--devel/p5-POE-Session-MultiDispatch/Makefile3
-rw-r--r--devel/p5-POE-Stage/Makefile3
-rw-r--r--devel/p5-POE/Makefile3
-rw-r--r--devel/p5-POSIX-strptime/Makefile3
-rw-r--r--devel/p5-PPerl/Makefile2
-rw-r--r--devel/p5-PV/Makefile3
-rw-r--r--devel/p5-Package-Constants/Makefile3
-rw-r--r--devel/p5-PadWalker/Makefile2
-rw-r--r--devel/p5-Parallel-ForkManager/Makefile3
-rw-r--r--devel/p5-Params-CallbackRequest/Makefile3
-rw-r--r--devel/p5-Params-Coerce/Makefile3
-rw-r--r--devel/p5-Params-Validate/Makefile3
-rw-r--r--devel/p5-Parse-PerlConfig/Makefile3
-rw-r--r--devel/p5-Parse-RecDescent/Makefile2
-rw-r--r--devel/p5-Parse-Yapp/Makefile3
-rw-r--r--devel/p5-ParseLex/Makefile3
-rw-r--r--devel/p5-PatchReader/Makefile2
-rw-r--r--devel/p5-Path-Class/Makefile4
-rw-r--r--devel/p5-Penguin-Easy/Makefile3
-rw-r--r--devel/p5-Penguin/Makefile3
-rw-r--r--devel/p5-Perl6-Builtins/Makefile3
-rw-r--r--devel/p5-Perl6-Export-Attrs/Makefile3
-rw-r--r--devel/p5-Perl6-Export/Makefile3
-rw-r--r--devel/p5-Perl6-Form/Makefile3
-rw-r--r--devel/p5-Perl6-Rules/Makefile3
-rw-r--r--devel/p5-PerlIO-eol/Makefile3
-rw-r--r--devel/p5-PerlIO-via-MD5/Makefile3
-rw-r--r--devel/p5-PerlIO-via-dynamic/Makefile3
-rw-r--r--devel/p5-PerlIO-via-symlink/Makefile3
-rw-r--r--devel/p5-PerlMenu/Makefile2
-rw-r--r--devel/p5-Pipeline/Makefile2
-rw-r--r--devel/p5-Pod-Tests/Makefile3
-rw-r--r--devel/p5-Proc-Background/Makefile3
-rw-r--r--devel/p5-Proc-Daemon/Makefile3
-rw-r--r--devel/p5-Proc-Fork/Makefile3
-rw-r--r--devel/p5-Proc-PID-File/Makefile3
-rw-r--r--devel/p5-Proc-PIDFile/Makefile3
-rw-r--r--devel/p5-Proc-ProcessTable/Makefile3
-rw-r--r--devel/p5-Proc-Queue/Makefile3
-rw-r--r--devel/p5-Proc-Reliable/Makefile3
-rw-r--r--devel/p5-Project-Gantt/Makefile3
-rw-r--r--devel/p5-RRDTool-OO/Makefile3
-rw-r--r--devel/p5-Rcs/Makefile3
-rw-r--r--devel/p5-ReadLine-Gnu/Makefile3
-rw-r--r--devel/p5-ReadLine-Perl/Makefile3
-rw-r--r--devel/p5-Readonly/Makefile3
-rw-r--r--devel/p5-Regexp-Assemble/Makefile3
-rw-r--r--devel/p5-Regexp-Bind/Makefile3
-rw-r--r--devel/p5-Regexp-Shellish/Makefile3
-rw-r--r--devel/p5-Religion/Makefile3
-rw-r--r--devel/p5-ResourcePool/Makefile2
-rw-r--r--devel/p5-Resources/Makefile3
-rw-r--r--devel/p5-Return-Value/Makefile2
-rw-r--r--devel/p5-Rose-DateTime/Makefile3
-rw-r--r--devel/p5-Rose-Object/Makefile3
-rw-r--r--devel/p5-RunApp/Makefile2
-rw-r--r--devel/p5-SNMP-Persist/Makefile3
-rw-r--r--devel/p5-SPOPS/Makefile2
-rw-r--r--devel/p5-SVN-ACL/Makefile3
-rw-r--r--devel/p5-SVN-Access/Makefile3
-rw-r--r--devel/p5-SVN-Agent/Makefile3
-rw-r--r--devel/p5-SVN-Log/Makefile3
-rw-r--r--devel/p5-SVN-Mirror/Makefile3
-rw-r--r--devel/p5-SVN-S4/Makefile3
-rw-r--r--devel/p5-SVN-Simple/Makefile3
-rw-r--r--devel/p5-SVN-Statistics/Makefile3
-rw-r--r--devel/p5-SVN-Web/Makefile3
-rw-r--r--devel/p5-Scalar-Listify/Makefile3
-rw-r--r--devel/p5-Scalar-Util-Clone/Makefile3
-rw-r--r--devel/p5-Scope-Guard/Makefile5
-rw-r--r--devel/p5-Search-Binary/Makefile3
-rw-r--r--devel/p5-Set-Array/Makefile3
-rw-r--r--devel/p5-Set-NestedGroups/Makefile3
-rw-r--r--devel/p5-Set-Scalar/Makefile3
-rw-r--r--devel/p5-Shell-Base/Makefile3
-rw-r--r--devel/p5-Shell-EnvImporter/Makefile3
-rw-r--r--devel/p5-Shell-Parser/Makefile3
-rw-r--r--devel/p5-Shell-Source/Makefile3
-rw-r--r--devel/p5-Smart-Comments/Makefile2
-rw-r--r--devel/p5-Sort-Array/Makefile3
-rw-r--r--devel/p5-Sort-ArrayOfArrays/Makefile3
-rw-r--r--devel/p5-Sort-Key-DateTime/Makefile3
-rw-r--r--devel/p5-Sort-Key/Makefile3
-rw-r--r--devel/p5-Sort-Tree/Makefile3
-rw-r--r--devel/p5-Sort-Versions/Makefile3
-rw-r--r--devel/p5-Spiffy/Makefile4
-rw-r--r--devel/p5-Spoon/Makefile4
-rw-r--r--devel/p5-Storable/Makefile3
-rw-r--r--devel/p5-Stream/Makefile3
-rw-r--r--devel/p5-String-Approx/Makefile3
-rw-r--r--devel/p5-String-CRC32/Makefile3
-rw-r--r--devel/p5-String-Checker/Makefile3
-rw-r--r--devel/p5-String-LRC/Makefile3
-rw-r--r--devel/p5-String-Parity/Makefile3
-rw-r--r--devel/p5-String-Random/Makefile3
-rw-r--r--devel/p5-String-RexxParse/Makefile3
-rw-r--r--devel/p5-String-Similarity/Makefile3
-rw-r--r--devel/p5-Sub-Installer/Makefile3
-rw-r--r--devel/p5-Sub-Name/Makefile3
-rw-r--r--devel/p5-Sub-Override/Makefile3
-rw-r--r--devel/p5-Sub-WrapPackages/Makefile3
-rw-r--r--devel/p5-Sys-Mmap/Makefile3
-rw-r--r--devel/p5-Sys-Sig/Makefile3
-rw-r--r--devel/p5-Sys-SigAction/Makefile3
-rw-r--r--devel/p5-System2/Makefile3
-rw-r--r--devel/p5-Taint-Runtime/Makefile3
-rw-r--r--devel/p5-Term-ANSIColor/Makefile3
-rw-r--r--devel/p5-Term-ANSIScreen/Makefile3
-rw-r--r--devel/p5-Term-Animation/Makefile3
-rw-r--r--devel/p5-Term-CallEditor/Makefile3
-rw-r--r--devel/p5-Term-Encoding/Makefile3
-rw-r--r--devel/p5-Term-ProgressBar/Makefile3
-rw-r--r--devel/p5-Term-Prompt/Makefile3
-rw-r--r--devel/p5-Term-Query/Makefile3
-rw-r--r--devel/p5-Term-ReadKey/Makefile3
-rw-r--r--devel/p5-Term-ReadLine-Zoid/Makefile3
-rw-r--r--devel/p5-Term-Screen/Makefile3
-rw-r--r--devel/p5-Term-Shell/Makefile3
-rw-r--r--devel/p5-Term-Size/Makefile3
-rw-r--r--devel/p5-Term-UI/Makefile3
-rw-r--r--devel/p5-Test-Benchmark/Makefile3
-rw-r--r--devel/p5-Test-Differences/Makefile3
-rw-r--r--devel/p5-Test-Expect/Makefile3
-rw-r--r--devel/p5-Test-File-Contents/Makefile3
-rw-r--r--devel/p5-Test-HTML-Tidy/Makefile3
-rw-r--r--devel/p5-Test-HasVersion/Makefile3
-rw-r--r--devel/p5-Test-Inline/Makefile3
-rw-r--r--devel/p5-Test-LongString/Makefile3
-rw-r--r--devel/p5-Test-MockModule/Makefile3
-rw-r--r--devel/p5-Test-MockObject/Makefile3
-rw-r--r--devel/p5-Test-MockTime/Makefile3
-rw-r--r--devel/p5-Test-NoWarnings/Makefile3
-rw-r--r--devel/p5-Test-Number-Delta/Makefile3
-rw-r--r--devel/p5-Test-Output/Makefile3
-rw-r--r--devel/p5-Test-Pod-Coverage/Makefile3
-rw-r--r--devel/p5-Test-Pod/Makefile3
-rw-r--r--devel/p5-Test-RandomResults/Makefile3
-rw-r--r--devel/p5-Test-Singleton/Makefile2
-rw-r--r--devel/p5-Test-Strict/Makefile3
-rw-r--r--devel/p5-Test-TAP-HTMLMatrix/Makefile3
-rw-r--r--devel/p5-Test-TAP-Model/Makefile3
-rw-r--r--devel/p5-Test-Unit/Makefile3
-rw-r--r--devel/p5-Test-Warn/Makefile3
-rw-r--r--devel/p5-Test-XML/Makefile3
-rw-r--r--devel/p5-Test-use-ok/Makefile3
-rw-r--r--devel/p5-Text-LevenshteinXS/Makefile3
-rw-r--r--devel/p5-Text-vFile-asData/Makefile3
-rw-r--r--devel/p5-Thread-Apartment/Makefile3
-rw-r--r--devel/p5-Thread-Pool-Simple/Makefile3
-rw-r--r--devel/p5-Thread-Queue-Duplex/Makefile3
-rw-r--r--devel/p5-Tie-Array-Pack/Makefile3
-rw-r--r--devel/p5-Tie-Array-Sorted/Makefile3
-rw-r--r--devel/p5-Tie-CPHash/Makefile3
-rw-r--r--devel/p5-Tie-Cache/Makefile3
-rw-r--r--devel/p5-Tie-DB_File-SplitHash/Makefile3
-rw-r--r--devel/p5-Tie-DB_FileLock/Makefile3
-rw-r--r--devel/p5-Tie-FileLRUCache/Makefile3
-rw-r--r--devel/p5-Tie-Hash-Indexed/Makefile3
-rw-r--r--devel/p5-Tie-Hash-Regex/Makefile3
-rw-r--r--devel/p5-Tie-Hash-Sorted/Makefile3
-rw-r--r--devel/p5-Tie-Hash-TwoWay/Makefile3
-rw-r--r--devel/p5-Tie-IxHash/Makefile3
-rw-r--r--devel/p5-Tie-Restore/Makefile3
-rw-r--r--devel/p5-Tie-ShareLite/Makefile3
-rw-r--r--devel/p5-Tie-Simple/Makefile3
-rw-r--r--devel/p5-Time-Clock/Makefile3
-rw-r--r--devel/p5-Time-Duration/Makefile3
-rw-r--r--devel/p5-Time-HiRes/Makefile3
-rw-r--r--devel/p5-Time-Interval/Makefile3
-rw-r--r--devel/p5-Time-Object/Makefile3
-rw-r--r--devel/p5-Time-Period/Makefile3
-rw-r--r--devel/p5-Time-Piece-Range/Makefile3
-rw-r--r--devel/p5-Time-Piece/Makefile3
-rw-r--r--devel/p5-Time-Progress/Makefile3
-rw-r--r--devel/p5-Time-Stopwatch/Makefile3
-rw-r--r--devel/p5-Time-modules/Makefile3
-rw-r--r--devel/p5-TimeDate/Makefile3
-rw-r--r--devel/p5-TraceFuncs/Makefile3
-rw-r--r--devel/p5-Tree-Binary-Dictionary/Makefile3
-rw-r--r--devel/p5-Tree-Binary/Makefile3
-rw-r--r--devel/p5-Tree-Node/Makefile3
-rw-r--r--devel/p5-Tree-Parser/Makefile3
-rw-r--r--devel/p5-Tree-Simple-View/Makefile3
-rw-r--r--devel/p5-Tree-Simple-VisitorFactory/Makefile3
-rw-r--r--devel/p5-Tree-Simple/Makefile3
-rw-r--r--devel/p5-UI-Dialog/Makefile2
-rw-r--r--devel/p5-UNIVERSAL-can/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-isa/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-moniker/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-require/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-which/Makefile3
-rw-r--r--devel/p5-Unix-Statgrab/Makefile3
-rw-r--r--devel/p5-VCP-Dest-svk/Makefile2
-rw-r--r--devel/p5-VCP-Source-cvsbk/Makefile2
-rw-r--r--devel/p5-VCP-autrijus/Makefile2
-rw-r--r--devel/p5-VCS/Makefile3
-rw-r--r--devel/p5-Want/Makefile2
-rw-r--r--devel/p5-WeakRef/Makefile4
-rw-r--r--devel/p5-Workflow/Makefile3
-rw-r--r--devel/p5-XSLoader/Makefile2
-rw-r--r--devel/p5-Yada-Yada-Yada/Makefile2
-rw-r--r--devel/p5-accessors/Makefile2
-rw-r--r--devel/p5-base/Makefile2
-rw-r--r--devel/p5-capitalization/Makefile2
-rw-r--r--devel/p5-enum/Makefile3
-rw-r--r--devel/p5-iCal-Parser/Makefile3
-rw-r--r--devel/p5-mixin/Makefile2
-rw-r--r--devel/p5-orz/Makefile3
-rw-r--r--devel/p5-parent/Makefile2
-rw-r--r--devel/p5-prefork/Makefile2
-rw-r--r--devel/p5-reaper/Makefile2
-rw-r--r--devel/p5-rpm-build-perl/Makefile2
-rw-r--r--devel/p5-threads-shared/Makefile3
-rw-r--r--devel/p5-threads/Makefile2
-rw-r--r--devel/pushmi/Makefile2
-rw-r--r--devel/svk/Makefile2
621 files changed, 628 insertions, 1189 deletions
diff --git a/devel/activitymail/Makefile b/devel/activitymail/Makefile
index 9ed7c2618103..b8fb41fef05a 100644
--- a/devel/activitymail/Makefile
+++ b/devel/activitymail/Makefile
@@ -8,7 +8,7 @@
PORTNAME= activitymail
PORTVERSION= 1.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DW/DWHEELER/activitymail
MAINTAINER= joseph@randomnetworks.com
diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index 851e766e58c6..ac26c7c2e58d 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -10,7 +10,7 @@ PORTNAME= autodia
PORTVERSION= 2.03
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Tree/TEEJAY
DISTNAME= Autodia-${PORTVERSION}
diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile
index 9c91f71a47a5..4da8f8970c4b 100644
--- a/devel/cpan-upload/Makefile
+++ b/devel/cpan-upload/Makefile
@@ -8,8 +8,8 @@
PORTNAME= cpan-upload
PORTVERSION= 2.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/N/NE/NEILB/scripts/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../by-authors/id/N/NE/NEILB/scripts
MAINTAINER= lth@FreeBSD.org
COMMENT= Script for uploading distributions to CPAN
diff --git a/devel/p5-AI-Pathfinding-AStar/Makefile b/devel/p5-AI-Pathfinding-AStar/Makefile
index bf1f864dc599..086f11805870 100644
--- a/devel/p5-AI-Pathfinding-AStar/Makefile
+++ b/devel/p5-AI-Pathfinding-AStar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AI-Pathfinding-AStar
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Acme-MetaSyntactic/Makefile b/devel/p5-Acme-MetaSyntactic/Makefile
index 23f918cf8172..58372d20ad5c 100644
--- a/devel/p5-Acme-MetaSyntactic/Makefile
+++ b/devel/p5-Acme-MetaSyntactic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Acme-MetaSyntactic
PORTVERSION= 0.99
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Acme
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Agent/Makefile b/devel/p5-Agent/Makefile
index 22793d80823b..ef4ee92848da 100644
--- a/devel/p5-Agent/Makefile
+++ b/devel/p5-Agent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Agent
PORTVERSION= 3.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Agent
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Algorithm-Accounting/Makefile b/devel/p5-Algorithm-Accounting/Makefile
index 91676a9c906c..10f15a6583f4 100644
--- a/devel/p5-Algorithm-Accounting/Makefile
+++ b/devel/p5-Algorithm-Accounting/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Algorithm-Accounting
PORTVERSION= 0.08
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/G/GU/GUGOD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Algorithm-Annotate/Makefile b/devel/p5-Algorithm-Annotate/Makefile
index 05dad8212823..383322e34d20 100644
--- a/devel/p5-Algorithm-Annotate/Makefile
+++ b/devel/p5-Algorithm-Annotate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Annotate
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Algorithm-Bucketizer/Makefile b/devel/p5-Algorithm-Bucketizer/Makefile
index 8d8bf8cd2755..94473e38aeac 100644
--- a/devel/p5-Algorithm-Bucketizer/Makefile
+++ b/devel/p5-Algorithm-Bucketizer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Bucketizer
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= boumenot@gmail.com
diff --git a/devel/p5-Algorithm-C3/Makefile b/devel/p5-Algorithm-C3/Makefile
index 85b22832240f..874a414981cf 100644
--- a/devel/p5-Algorithm-C3/Makefile
+++ b/devel/p5-Algorithm-C3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-C3
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Algorithm-ChooseSubsets/Makefile b/devel/p5-Algorithm-ChooseSubsets/Makefile
index aad0aaa220ca..9cde2846c36e 100644
--- a/devel/p5-Algorithm-ChooseSubsets/Makefile
+++ b/devel/p5-Algorithm-ChooseSubsets/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-ChooseSubsets
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lars.eggert@gmx.net
diff --git a/devel/p5-Algorithm-Dependency-Objects/Makefile b/devel/p5-Algorithm-Dependency-Objects/Makefile
index 9668174aa200..011a1a63b483 100644
--- a/devel/p5-Algorithm-Dependency-Objects/Makefile
+++ b/devel/p5-Algorithm-Dependency-Objects/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Dependency-Objects
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Algorithm-Dependency/Makefile b/devel/p5-Algorithm-Dependency/Makefile
index ed9cfc240b11..e5eb5ff68bfb 100644
--- a/devel/p5-Algorithm-Dependency/Makefile
+++ b/devel/p5-Algorithm-Dependency/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Dependency
PORTVERSION= 1.106
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Algorithm-Diff/Makefile b/devel/p5-Algorithm-Diff/Makefile
index e244a850e5bf..79ff313cb4bf 100644
--- a/devel/p5-Algorithm-Diff/Makefile
+++ b/devel/p5-Algorithm-Diff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Diff
PORTVERSION= 1.1902
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Algorithm-IncludeExclude/Makefile b/devel/p5-Algorithm-IncludeExclude/Makefile
index 5c18d885521f..f51ad32b4770 100644
--- a/devel/p5-Algorithm-IncludeExclude/Makefile
+++ b/devel/p5-Algorithm-IncludeExclude/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-IncludeExclude
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Algorithm-Interval2Prefix/Makefile b/devel/p5-Algorithm-Interval2Prefix/Makefile
index 961182e808db..db81b8a1542e 100644
--- a/devel/p5-Algorithm-Interval2Prefix/Makefile
+++ b/devel/p5-Algorithm-Interval2Prefix/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Algorithm-Interval2Prefix
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Algorithm-LCS/Makefile b/devel/p5-Algorithm-LCS/Makefile
index 9283e980a00c..45bf4367f8bf 100644
--- a/devel/p5-Algorithm-LCS/Makefile
+++ b/devel/p5-Algorithm-LCS/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Algorithm-LCS
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/J/JO/JOESUF
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Algorithm-LUHN/Makefile b/devel/p5-Algorithm-LUHN/Makefile
index 14cd6deb9b3b..80ef01fe5512 100644
--- a/devel/p5-Algorithm-LUHN/Makefile
+++ b/devel/p5-Algorithm-LUHN/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-LUHN
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/T/TA/TAYERS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Algorithm-MDiff/Makefile b/devel/p5-Algorithm-MDiff/Makefile
index 615fd3adfeab..2a7983b7146d 100644
--- a/devel/p5-Algorithm-MDiff/Makefile
+++ b/devel/p5-Algorithm-MDiff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-MDiff
PORTVERSION= 0.94
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Algorithm-MinMax/Makefile b/devel/p5-Algorithm-MinMax/Makefile
index d5d929179089..951115076636 100644
--- a/devel/p5-Algorithm-MinMax/Makefile
+++ b/devel/p5-Algorithm-MinMax/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-MinMax
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Algorithm-NaiveBayes/Makefile b/devel/p5-Algorithm-NaiveBayes/Makefile
index 132a690aca54..d85eb07c066b 100644
--- a/devel/p5-Algorithm-NaiveBayes/Makefile
+++ b/devel/p5-Algorithm-NaiveBayes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-NaiveBayes
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Algorithm-Networksort/Makefile b/devel/p5-Algorithm-Networksort/Makefile
index d41e595ef6b8..c7de884531a9 100644
--- a/devel/p5-Algorithm-Networksort/Makefile
+++ b/devel/p5-Algorithm-Networksort/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Networksort
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Algorithm-Numerical-Shuffle/Makefile b/devel/p5-Algorithm-Numerical-Shuffle/Makefile
index 9f61d50aebcd..65e6d7abbc24 100644
--- a/devel/p5-Algorithm-Numerical-Shuffle/Makefile
+++ b/devel/p5-Algorithm-Numerical-Shuffle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Numerical-Shuffle
PORTVERSION= 1.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/A/AB/ABIGAIL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Shuffle-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-Algorithm-Permute/Makefile b/devel/p5-Algorithm-Permute/Makefile
index 6005ec80b6f8..3691091547c9 100644
--- a/devel/p5-Algorithm-Permute/Makefile
+++ b/devel/p5-Algorithm-Permute/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Algorithm-Permute
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Algorithm
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Alias/Makefile b/devel/p5-Alias/Makefile
index ed4b5d06be2f..fbb41196eb8b 100644
--- a/devel/p5-Alias/Makefile
+++ b/devel/p5-Alias/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Alias
PORTVERSION= 2.32
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Alias
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-App-CLI/Makefile b/devel/p5-App-CLI/Makefile
index a43f6c08bb39..4f580ee46dd6 100644
--- a/devel/p5-App-CLI/Makefile
+++ b/devel/p5-App-CLI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-CLI
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-App-Cache/Makefile b/devel/p5-App-Cache/Makefile
index 7e11695617a6..235b09ff2034 100644
--- a/devel/p5-App-Cache/Makefile
+++ b/devel/p5-App-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-Cache
PORTVERSION= 0.33
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-App-Control/Makefile b/devel/p5-App-Control/Makefile
index b63c3d34febc..be7a86edea00 100644
--- a/devel/p5-App-Control/Makefile
+++ b/devel/p5-App-Control/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-Control
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-App-Options/Makefile b/devel/p5-App-Options/Makefile
index dc7c91fb5980..b8daf9740df1 100644
--- a/devel/p5-App-Options/Makefile
+++ b/devel/p5-App-Options/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-Options
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-App-Trace/Makefile b/devel/p5-App-Trace/Makefile
index 39efcb849ac3..06ab37c3db27 100644
--- a/devel/p5-App-Trace/Makefile
+++ b/devel/p5-App-Trace/Makefile
@@ -8,8 +8,7 @@
PORTNAME= App-Trace
PORTVERSION= 0.50
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= App
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile
index 72e9798f64e7..86700e23a474 100644
--- a/devel/p5-AppConfig-Std/Makefile
+++ b/devel/p5-AppConfig-Std/Makefile
@@ -9,8 +9,7 @@ PORTNAME= AppConfig-Std
PORTVERSION= 1.07
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= AppConfig
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Array-Group/Makefile b/devel/p5-Array-Group/Makefile
index 8be20464e50b..24ac544334a7 100644
--- a/devel/p5-Array-Group/Makefile
+++ b/devel/p5-Array-Group/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Array-Group
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Array
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Array-Iterator/Makefile b/devel/p5-Array-Iterator/Makefile
index 846a75539940..87d926cf0cc6 100644
--- a/devel/p5-Array-Iterator/Makefile
+++ b/devel/p5-Array-Iterator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Array-Iterator
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Array
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index 08b1c2622d33..b9353c02841f 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Array-Window
PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 6280f29b1a1a..891be7a714a0 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AtExit
PORTVERSION= 2.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/B/BR/BRADAPP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Attribute-Handlers/Makefile b/devel/p5-Attribute-Handlers/Makefile
index fa7635925f55..11770dbdfe47 100644
--- a/devel/p5-Attribute-Handlers/Makefile
+++ b/devel/p5-Attribute-Handlers/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Attribute-Handlers
PORTVERSION= 0.78
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Attribute
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-AutoLoader/Makefile b/devel/p5-AutoLoader/Makefile
index af552f37e44a..d653415e8cfe 100644
--- a/devel/p5-AutoLoader/Makefile
+++ b/devel/p5-AutoLoader/Makefile
@@ -8,8 +8,7 @@
PORTNAME= AutoLoader
PORTVERSION= 5.64
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-B-Generate/Makefile b/devel/p5-B-Generate/Makefile
index 9262985f3836..6473189e2246 100644
--- a/devel/p5-B-Generate/Makefile
+++ b/devel/p5-B-Generate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= B-Generate
PORTVERSION= 1.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= B
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-B-Graph/Makefile b/devel/p5-B-Graph/Makefile
index cff8ad7a76a6..fdecf3a077b2 100644
--- a/devel/p5-B-Graph/Makefile
+++ b/devel/p5-B-Graph/Makefile
@@ -8,8 +8,7 @@
PORTNAME= B-Graph
PORTVERSION= 0.51
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=B
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-B-Size/Makefile b/devel/p5-B-Size/Makefile
index 3805bdfa7199..5e0f67dae2ac 100644
--- a/devel/p5-B-Size/Makefile
+++ b/devel/p5-B-Size/Makefile
@@ -8,8 +8,7 @@
PORTNAME= B-Size
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= B
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pgollucci@p6m7g8.com
diff --git a/devel/p5-B-Utils/Makefile b/devel/p5-B-Utils/Makefile
index c5cdf2cd9301..ea2cd61066c7 100644
--- a/devel/p5-B-Utils/Makefile
+++ b/devel/p5-B-Utils/Makefile
@@ -8,8 +8,7 @@
PORTNAME= B-Utils
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= B
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-BFD/Makefile b/devel/p5-BFD/Makefile
index 6bee06810819..143e8b6ec769 100644
--- a/devel/p5-BFD/Makefile
+++ b/devel/p5-BFD/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BFD
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RB/RBS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 9ff225047a93..150cadb4fe6f 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -8,8 +8,7 @@
PORTNAME= BSD-Resource
PORTVERSION= 1.2901
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= BSD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-BSD-stat/Makefile b/devel/p5-BSD-stat/Makefile
index ab6e83bea6f0..3ecd940e4d55 100644
--- a/devel/p5-BSD-stat/Makefile
+++ b/devel/p5-BSD-stat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= BSD-stat
PORTVERSION= 1.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= BSD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Best/Makefile b/devel/p5-Best/Makefile
index 419390ccdb78..e3887f538755 100644
--- a/devel/p5-Best/Makefile
+++ b/devel/p5-Best/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Best
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GAAL
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Bundle-Perl6/Makefile b/devel/p5-Bundle-Perl6/Makefile
index 752c2da5a86f..721d9c881289 100644
--- a/devel/p5-Bundle-Perl6/Makefile
+++ b/devel/p5-Bundle-Perl6/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Bundle-Perl6
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MARCEL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index a06d4ec813fd..c187f0f50cba 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= C-Scan
PORTVERSION= 0.74
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= C
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-CPAN-DistnameInfo/Makefile b/devel/p5-CPAN-DistnameInfo/Makefile
index 737709c5d76b..7dded8919436 100644
--- a/devel/p5-CPAN-DistnameInfo/Makefile
+++ b/devel/p5-CPAN-DistnameInfo/Makefile
@@ -7,8 +7,7 @@
PORTNAME= CPAN-DistnameInfo
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CPAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-CPAN-Mini/Makefile b/devel/p5-CPAN-Mini/Makefile
index d7547301eb37..4d575e06c8ae 100644
--- a/devel/p5-CPAN-Mini/Makefile
+++ b/devel/p5-CPAN-Mini/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CPAN-Mini
PORTVERSION= 0.566
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CPAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index bb22d46b949c..d6f726a676cc 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= CPANPLUS
PORTVERSION= 0.0760
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/K/KA/KANE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.076
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index 452a14826cdb..dc68bc8caa08 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache-Cache
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Cache-FastMmap/Makefile b/devel/p5-Cache-FastMmap/Makefile
index 0a5fee6b7a1c..69b263a391c0 100644
--- a/devel/p5-Cache-FastMmap/Makefile
+++ b/devel/p5-Cache-FastMmap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache-FastMmap
PORTVERSION= 1.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Cache-Mmap/Makefile b/devel/p5-Cache-Mmap/Makefile
index 1f6c0530d256..92d2d2e11f0f 100644
--- a/devel/p5-Cache-Mmap/Makefile
+++ b/devel/p5-Cache-Mmap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache-Mmap
PORTVERSION= 0.090
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.09
diff --git a/devel/p5-Cache-Simple-TimedExpiry/Makefile b/devel/p5-Cache-Simple-TimedExpiry/Makefile
index 3b97c2c31474..51c3152cadf4 100644
--- a/devel/p5-Cache-Simple-TimedExpiry/Makefile
+++ b/devel/p5-Cache-Simple-TimedExpiry/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache-Simple-TimedExpiry
PORTVERSION= 0.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= girgen@FreeBSD.org
diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index 05b6df2ada24..e2898d7ca8ae 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Cache
PORTVERSION= 2.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Cache
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Calendar-Simple/Makefile b/devel/p5-Calendar-Simple/Makefile
index aaa1703bd76d..b07f8bfbfede 100644
--- a/devel/p5-Calendar-Simple/Makefile
+++ b/devel/p5-Calendar-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Calendar-Simple
PORTVERSION= 1.17
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Calendar
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Carp-Assert-More/Makefile b/devel/p5-Carp-Assert-More/Makefile
index fe8c08a9bde0..80ac58645bf7 100644
--- a/devel/p5-Carp-Assert-More/Makefile
+++ b/devel/p5-Carp-Assert-More/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Carp-Assert-More
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Carp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile
index 099fed5ca1bd..f914cf13cad3 100644
--- a/devel/p5-Carp-Assert/Makefile
+++ b/devel/p5-Carp-Assert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Carp-Assert
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Carp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index c0228408520b..98bc876ac7c7 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Carp-Datum
PORTVERSION= 0.1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Carp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Lvalue/Makefile b/devel/p5-Class-Accessor-Lvalue/Makefile
index 3ff1590df3ab..266aa1113cec 100644
--- a/devel/p5-Class-Accessor-Lvalue/Makefile
+++ b/devel/p5-Class-Accessor-Lvalue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Accessor-Lvalue
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Named/Makefile b/devel/p5-Class-Accessor-Named/Makefile
index 57261242cf60..fc6a517c1953 100644
--- a/devel/p5-Class-Accessor-Named/Makefile
+++ b/devel/p5-Class-Accessor-Named/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Accessor-Named
PORTVERSION= 0.008
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Accessor/Makefile b/devel/p5-Class-Accessor/Makefile
index 35960f7b5af1..8831a67046e8 100644
--- a/devel/p5-Class-Accessor/Makefile
+++ b/devel/p5-Class-Accessor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Accessor
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-ArrayObjects/Makefile b/devel/p5-Class-ArrayObjects/Makefile
index 39f10d171da8..5b77d46a6958 100644
--- a/devel/p5-Class-ArrayObjects/Makefile
+++ b/devel/p5-Class-ArrayObjects/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ArrayObjects
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-AutoClass/Makefile b/devel/p5-Class-AutoClass/Makefile
index e0c7629ca14d..fdad9f9b97f1 100644
--- a/devel/p5-Class-AutoClass/Makefile
+++ b/devel/p5-Class-AutoClass/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Class-AutoClass
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class/CCAVNOR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= autoclass_v${PORTVERSION:S/./_/}
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index d553bbc21577..be488ece6044 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Autouse
PORTVERSION= 1.29
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Base/Makefile b/devel/p5-Class-Base/Makefile
index 1dd5f0c5273d..ef4625f31508 100644
--- a/devel/p5-Class-Base/Makefile
+++ b/devel/p5-Class-Base/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Class-Base
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Class-BlackHole/Makefile b/devel/p5-Class-BlackHole/Makefile
index 73721e2d60e5..0676fe1ea1c8 100644
--- a/devel/p5-Class-BlackHole/Makefile
+++ b/devel/p5-Class-BlackHole/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-BlackHole
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-C3-XS/Makefile b/devel/p5-Class-C3-XS/Makefile
index 9853cd756945..ca11e2c7cfe1 100644
--- a/devel/p5-Class-C3-XS/Makefile
+++ b/devel/p5-Class-C3-XS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-C3-XS
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Class-C3/Makefile b/devel/p5-Class-C3/Makefile
index d94ac8394e02..bcb7e93c6d4d 100644
--- a/devel/p5-Class-C3/Makefile
+++ b/devel/p5-Class-C3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-C3
PORTVERSION= 0.19
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Class-Closure/Makefile b/devel/p5-Class-Closure/Makefile
index aa72855826f8..9da2a3e94347 100644
--- a/devel/p5-Class-Closure/Makefile
+++ b/devel/p5-Class-Closure/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Closure
PORTVERSION= 0.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-CodeStyler/Makefile b/devel/p5-Class-CodeStyler/Makefile
index 9c57b362c450..843c2d45d4fd 100644
--- a/devel/p5-Class-CodeStyler/Makefile
+++ b/devel/p5-Class-CodeStyler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-CodeStyler
PORTVERSION= 0.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-Constant/Makefile b/devel/p5-Class-Constant/Makefile
index faacaf47926a..4dac54436a72 100644
--- a/devel/p5-Class-Constant/Makefile
+++ b/devel/p5-Class-Constant/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Constant
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile
index 25fec803b87e..b3b1c63eed2e 100644
--- a/devel/p5-Class-Container/Makefile
+++ b/devel/p5-Class-Container/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Container
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= dsh@vlink.ru
diff --git a/devel/p5-Class-Contract/Makefile b/devel/p5-Class-Contract/Makefile
index d0e0544a7a36..d20e2fedb69e 100644
--- a/devel/p5-Class-Contract/Makefile
+++ b/devel/p5-Class-Contract/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Contract
PORTVERSION= 1.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Data-Inheritable/Makefile b/devel/p5-Class-Data-Inheritable/Makefile
index 21e8a32b7a3c..516196011aa9 100644
--- a/devel/p5-Class-Data-Inheritable/Makefile
+++ b/devel/p5-Class-Data-Inheritable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Data-Inheritable
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Date/Makefile b/devel/p5-Class-Date/Makefile
index 16db981e71e9..160bb26627ad 100644
--- a/devel/p5-Class-Date/Makefile
+++ b/devel/p5-Class-Date/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Date
PORTVERSION= 1.1.9
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Class-Default/Makefile b/devel/p5-Class-Default/Makefile
index b92391fe0019..cfe3abed4366 100644
--- a/devel/p5-Class-Default/Makefile
+++ b/devel/p5-Class-Default/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Default
PORTVERSION= 1.50
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Delegation/Makefile b/devel/p5-Class-Delegation/Makefile
index ea7edf645dfd..3052feb08a88 100644
--- a/devel/p5-Class-Delegation/Makefile
+++ b/devel/p5-Class-Delegation/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Class-Delegation
PORTVERSION= 1.7.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/devel/p5-Class-ErrorHandler/Makefile b/devel/p5-Class-ErrorHandler/Makefile
index c6411bf79070..d4cad5382011 100644
--- a/devel/p5-Class-ErrorHandler/Makefile
+++ b/devel/p5-Class-ErrorHandler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ErrorHandler
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Class-Factory-Util/Makefile b/devel/p5-Class-Factory-Util/Makefile
index 0916cb574290..f369c3fcfb8b 100644
--- a/devel/p5-Class-Factory-Util/Makefile
+++ b/devel/p5-Class-Factory-Util/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Factory-Util
PORTVERSION= 1.7
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Factory/Makefile b/devel/p5-Class-Factory/Makefile
index c316a90b11a8..8687e2bb888a 100644
--- a/devel/p5-Class-Factory/Makefile
+++ b/devel/p5-Class-Factory/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Factory
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Fields/Makefile b/devel/p5-Class-Fields/Makefile
index 9253440fdb20..51f830f9bc61 100644
--- a/devel/p5-Class-Fields/Makefile
+++ b/devel/p5-Class-Fields/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Fields
PORTVERSION= 0.203
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Generate/Makefile b/devel/p5-Class-Generate/Makefile
index 4e4c1faaa463..6a35be31b183 100644
--- a/devel/p5-Class-Generate/Makefile
+++ b/devel/p5-Class-Generate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Generate
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Handle/Makefile b/devel/p5-Class-Handle/Makefile
index 6c70da1cbcf9..139bb9712d28 100644
--- a/devel/p5-Class-Handle/Makefile
+++ b/devel/p5-Class-Handle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Handle
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-ISA/Makefile b/devel/p5-Class-ISA/Makefile
index bafe6b83591b..5b13a6f1c7fa 100644
--- a/devel/p5-Class-ISA/Makefile
+++ b/devel/p5-Class-ISA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ISA
PORTVERSION= 0.33
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Inner/Makefile b/devel/p5-Class-Inner/Makefile
index 9e09120e9b0c..c5a205c5d252 100644
--- a/devel/p5-Class-Inner/Makefile
+++ b/devel/p5-Class-Inner/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Inner
PORTVERSION= 0.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Interfaces/Makefile b/devel/p5-Class-Interfaces/Makefile
index 3dc66e0d9722..e98fc70204e7 100644
--- a/devel/p5-Class-Interfaces/Makefile
+++ b/devel/p5-Class-Interfaces/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Interfaces
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Loader/Makefile b/devel/p5-Class-Loader/Makefile
index 5043846801df..dc45813abf96 100644
--- a/devel/p5-Class-Loader/Makefile
+++ b/devel/p5-Class-Loader/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Loader
PORTVERSION= 2.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-MakeMethods/Makefile b/devel/p5-Class-MakeMethods/Makefile
index 6354cf8cd711..bb42d9cec1ed 100644
--- a/devel/p5-Class-MakeMethods/Makefile
+++ b/devel/p5-Class-MakeMethods/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-MakeMethods
PORTVERSION= 1.010
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.$//}
diff --git a/devel/p5-Class-MethodMapper/Makefile b/devel/p5-Class-MethodMapper/Makefile
index 169d9b88e9c2..45664abc06a9 100644
--- a/devel/p5-Class-MethodMapper/Makefile
+++ b/devel/p5-Class-MethodMapper/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-MethodMapper
PORTVERSION= 1.0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Class-MixinFactory/Makefile b/devel/p5-Class-MixinFactory/Makefile
index acee590d68d4..b877313023a3 100644
--- a/devel/p5-Class-MixinFactory/Makefile
+++ b/devel/p5-Class-MixinFactory/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-MixinFactory
PORTVERSION= 0.92
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-Multimethods-Pure/Makefile b/devel/p5-Class-Multimethods-Pure/Makefile
index 17da3c95b979..6680e5b9f1c3 100644
--- a/devel/p5-Class-Multimethods-Pure/Makefile
+++ b/devel/p5-Class-Multimethods-Pure/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Multimethods-Pure
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Multimethods/Makefile b/devel/p5-Class-Multimethods/Makefile
index 0b73bd575100..ad99750891de 100644
--- a/devel/p5-Class-Multimethods/Makefile
+++ b/devel/p5-Class-Multimethods/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Multimethods
PORTVERSION= 1.70
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-NamedParms/Makefile b/devel/p5-Class-NamedParms/Makefile
index 111af43db8b4..9b4b593987b2 100644
--- a/devel/p5-Class-NamedParms/Makefile
+++ b/devel/p5-Class-NamedParms/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-NamedParms
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Class-OOorNO/Makefile b/devel/p5-Class-OOorNO/Makefile
index bcc5b79070b8..e26802b69248 100644
--- a/devel/p5-Class-OOorNO/Makefile
+++ b/devel/p5-Class-OOorNO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-OOorNO
PORTVERSION= 0.011
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-Class-Observable/Makefile b/devel/p5-Class-Observable/Makefile
index 4f283b7d174f..8484b841577b 100644
--- a/devel/p5-Class-Observable/Makefile
+++ b/devel/p5-Class-Observable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Observable
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hcoyote@ghostar.org
diff --git a/devel/p5-Class-ParmList/Makefile b/devel/p5-Class-ParmList/Makefile
index 2f3fd9117f09..95c1c03ea6ba 100644
--- a/devel/p5-Class-ParmList/Makefile
+++ b/devel/p5-Class-ParmList/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ParmList
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Class-Prototyped/Makefile b/devel/p5-Class-Prototyped/Makefile
index 98ec3e233306..1930c16af656 100644
--- a/devel/p5-Class-Prototyped/Makefile
+++ b/devel/p5-Class-Prototyped/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Prototyped
PORTVERSION= 1.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index 5c1e04f34da6..51f961f2656a 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-ReturnValue
PORTVERSION= 0.55
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-Roles/Makefile b/devel/p5-Class-Roles/Makefile
index 98927842ef8f..86796c7bdb34 100644
--- a/devel/p5-Class-Roles/Makefile
+++ b/devel/p5-Class-Roles/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Roles
PORTVERSION= 0.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Class-STL-Containers/Makefile b/devel/p5-Class-STL-Containers/Makefile
index 2e24fb5bfe59..1c02cf636d1b 100644
--- a/devel/p5-Class-STL-Containers/Makefile
+++ b/devel/p5-Class-STL-Containers/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-STL-Containers
PORTVERSION= 0.35
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-Spiffy/Makefile b/devel/p5-Class-Spiffy/Makefile
index ece7e6bea15e..c9215bbaa327 100644
--- a/devel/p5-Class-Spiffy/Makefile
+++ b/devel/p5-Class-Spiffy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Spiffy
PORTVERSION= 0.15
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-StateMachine/Makefile b/devel/p5-Class-StateMachine/Makefile
index 099ec825b1b7..15472b0d5095 100644
--- a/devel/p5-Class-StateMachine/Makefile
+++ b/devel/p5-Class-StateMachine/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-StateMachine
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-StrongSingleton/Makefile b/devel/p5-Class-StrongSingleton/Makefile
index b33694291386..b9b145bf7b7d 100644
--- a/devel/p5-Class-StrongSingleton/Makefile
+++ b/devel/p5-Class-StrongSingleton/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-StrongSingleton
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Tangram/Makefile b/devel/p5-Class-Tangram/Makefile
index 00131da5ad4e..b1e4871542f2 100644
--- a/devel/p5-Class-Tangram/Makefile
+++ b/devel/p5-Class-Tangram/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Tangram
PORTVERSION= 1.57
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Throwable/Makefile b/devel/p5-Class-Throwable/Makefile
index e08429759312..8dc25afdf4cd 100644
--- a/devel/p5-Class-Throwable/Makefile
+++ b/devel/p5-Class-Throwable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Throwable
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 7aa40d3adf4e..6a704b6a6293 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Tom
PORTVERSION= 3.02
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-Trigger/Makefile b/devel/p5-Class-Trigger/Makefile
index 576e04bb83c3..759fcdfb3971 100644
--- a/devel/p5-Class-Trigger/Makefile
+++ b/devel/p5-Class-Trigger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Trigger
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Virtual/Makefile b/devel/p5-Class-Virtual/Makefile
index e77f3fbcff0d..a0ebdddbc527 100644
--- a/devel/p5-Class-Virtual/Makefile
+++ b/devel/p5-Class-Virtual/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Virtual
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-WhiteHole/Makefile b/devel/p5-Class-WhiteHole/Makefile
index d3ac9e92fd0b..9511ede5b7a9 100644
--- a/devel/p5-Class-WhiteHole/Makefile
+++ b/devel/p5-Class-WhiteHole/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-WhiteHole
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-Workflow/Makefile b/devel/p5-Class-Workflow/Makefile
index 2137769535a1..fc3c7b0c9ed1 100644
--- a/devel/p5-Class-Workflow/Makefile
+++ b/devel/p5-Class-Workflow/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-Workflow
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/N/NU/NUFFIN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Class-XPath/Makefile b/devel/p5-Class-XPath/Makefile
index 156d64b2fcb1..7f315f721650 100644
--- a/devel/p5-Class-XPath/Makefile
+++ b/devel/p5-Class-XPath/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Class-XPath
PORTVERSION= 1.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Class
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Clone-More/Makefile b/devel/p5-Clone-More/Makefile
index 28e88695e6ed..cfbdcc91d9e8 100644
--- a/devel/p5-Clone-More/Makefile
+++ b/devel/p5-Clone-More/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Clone-More
PORTVERSION= 0.90.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Clone
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Clone-PP/Makefile b/devel/p5-Clone-PP/Makefile
index 8dfdb8efdf63..f969a4c552c0 100644
--- a/devel/p5-Clone-PP/Makefile
+++ b/devel/p5-Clone-PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Clone-PP
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Clone
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Clone/Makefile b/devel/p5-Clone/Makefile
index 982b6ebb9100..43733582eaa4 100644
--- a/devel/p5-Clone/Makefile
+++ b/devel/p5-Clone/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Clone
PORTVERSION= 0.28
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Clone
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Code-Perl/Makefile b/devel/p5-Code-Perl/Makefile
index 7699d0cf0e6e..ca46c43678df 100644
--- a/devel/p5-Code-Perl/Makefile
+++ b/devel/p5-Code-Perl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Code-Perl
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/F/FD/FDALY
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Commands-Guarded/Makefile b/devel/p5-Commands-Guarded/Makefile
index e7591ae14f61..8c0426cca112 100644
--- a/devel/p5-Commands-Guarded/Makefile
+++ b/devel/p5-Commands-Guarded/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Commands-Guarded
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/T/TR/TREY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-CommitBit/Makefile b/devel/p5-CommitBit/Makefile
index eb28ca83105e..5d046aaf9871 100644
--- a/devel/p5-CommitBit/Makefile
+++ b/devel/p5-CommitBit/Makefile
@@ -8,7 +8,7 @@
PORTNAME= CommitBit
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/J/JE/JESSE
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Config-ApacheFormat/Makefile b/devel/p5-Config-ApacheFormat/Makefile
index 66bf321d3c17..20a5cc95ecde 100644
--- a/devel/p5-Config-ApacheFormat/Makefile
+++ b/devel/p5-Config-ApacheFormat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-ApacheFormat
PORTVERSION= 1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= carpetsmoker@xs4all.nl
diff --git a/devel/p5-Config-Fast/Makefile b/devel/p5-Config-Fast/Makefile
index b37249d5c1e8..2d41f99d0446 100644
--- a/devel/p5-Config-Fast/Makefile
+++ b/devel/p5-Config-Fast/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Fast
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kiwi@oav.net
diff --git a/devel/p5-Config-INI-Simple/Makefile b/devel/p5-Config-INI-Simple/Makefile
index 5e15b7b8c22f..fad158282a3a 100644
--- a/devel/p5-Config-INI-Simple/Makefile
+++ b/devel/p5-Config-INI-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-INI-Simple
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index b125e405c537..2381a3834ff0 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Config-IniFiles
PORTVERSION= 2.39
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/G/GC/GCARLS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Config-Objective/Makefile b/devel/p5-Config-Objective/Makefile
index 192b9afec293..5c2e8e93861f 100644
--- a/devel/p5-Config-Objective/Makefile
+++ b/devel/p5-Config-Objective/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Config-Objective
PORTVERSION= 0.9.1
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@uiuc.edu
diff --git a/devel/p5-Config-Properties/Makefile b/devel/p5-Config-Properties/Makefile
index 5af63653333d..d992b9800103 100644
--- a/devel/p5-Config-Properties/Makefile
+++ b/devel/p5-Config-Properties/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Properties
PORTVERSION= 1.68
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= cmanley@xs4all.nl
diff --git a/devel/p5-Config-Record/Makefile b/devel/p5-Config-Record/Makefile
index 754341d0b7d2..e17825edb9f6 100644
--- a/devel/p5-Config-Record/Makefile
+++ b/devel/p5-Config-Record/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Record
PORTVERSION= 1.1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Config-Simple/Makefile b/devel/p5-Config-Simple/Makefile
index 23a8c64bdd22..5ac77dd05f3a 100644
--- a/devel/p5-Config-Simple/Makefile
+++ b/devel/p5-Config-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Simple
PORTVERSION= 4.59
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config/SHERZODR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Config-Tiny/Makefile b/devel/p5-Config-Tiny/Makefile
index 5f53a59a87c5..c974d5013817 100644
--- a/devel/p5-Config-Tiny/Makefile
+++ b/devel/p5-Config-Tiny/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Config-Tiny
PORTVERSION= 2.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Config
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-ConfigReader-Simple/Makefile b/devel/p5-ConfigReader-Simple/Makefile
index ef62513050e5..c3f848451a22 100644
--- a/devel/p5-ConfigReader-Simple/Makefile
+++ b/devel/p5-ConfigReader-Simple/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ConfigReader-Simple
PORTVERSION= 1.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-ConfigReader/Makefile b/devel/p5-ConfigReader/Makefile
index 1f15b6b5b66a..32c42a7e20ea 100644
--- a/devel/p5-ConfigReader/Makefile
+++ b/devel/p5-ConfigReader/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ConfigReader
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ConfigReader
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Contextual-Return/Makefile b/devel/p5-Contextual-Return/Makefile
index a97dcc199499..b09e7e8a98c8 100644
--- a/devel/p5-Contextual-Return/Makefile
+++ b/devel/p5-Contextual-Return/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Contextual-Return
PORTVERSION= 0.2.1
DISTVERSIONPREFIX= v
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Curses-Application/Makefile b/devel/p5-Curses-Application/Makefile
index 1d2d78e9507c..836093b4a47b 100644
--- a/devel/p5-Curses-Application/Makefile
+++ b/devel/p5-Curses-Application/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Curses-Application
PORTVERSION= 0.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= CursesApplication-${PORTVERSION}
diff --git a/devel/p5-Curses-Forms/Makefile b/devel/p5-Curses-Forms/Makefile
index 3046825c7bf6..5d78e0174f21 100644
--- a/devel/p5-Curses-Forms/Makefile
+++ b/devel/p5-Curses-Forms/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Curses-Forms
PORTVERSION= 1.997
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= CursesForms-${PORTVERSION}
diff --git a/devel/p5-Curses-UI/Makefile b/devel/p5-Curses-UI/Makefile
index b36aaae838d2..0802786ce2aa 100644
--- a/devel/p5-Curses-UI/Makefile
+++ b/devel/p5-Curses-UI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Curses-UI
PORTVERSION= 0.9603
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Curses-Widgets/Makefile b/devel/p5-Curses-Widgets/Makefile
index f72a25123de3..bb2bca344849 100644
--- a/devel/p5-Curses-Widgets/Makefile
+++ b/devel/p5-Curses-Widgets/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Curses-Widgets
PORTVERSION= 1.997
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= CursesWidgets-${PORTVERSION}
diff --git a/devel/p5-Cvs/Makefile b/devel/p5-Cvs/Makefile
index fde1a5560689..0f9a8f0e796f 100644
--- a/devel/p5-Cvs/Makefile
+++ b/devel/p5-Cvs/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Cvs
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RS/RSOLIV
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/R/RS/RSOLIV
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-DB_File-Lock/Makefile b/devel/p5-DB_File-Lock/Makefile
index b6f9a7f61a16..a571ab0e88ea 100644
--- a/devel/p5-DB_File-Lock/Makefile
+++ b/devel/p5-DB_File-Lock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DB_File-Lock
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DB_File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Danga-Socket/Makefile b/devel/p5-Danga-Socket/Makefile
index 4523e82b3dce..49ac776b0505 100644
--- a/devel/p5-Danga-Socket/Makefile
+++ b/devel/p5-Danga-Socket/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Danga-Socket
PORTVERSION= 1.57
CATEGORIES= devel net
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Danga
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-ACL/Makefile b/devel/p5-Data-ACL/Makefile
index 67991c319f2f..3b843a7f1250 100644
--- a/devel/p5-Data-ACL/Makefile
+++ b/devel/p5-Data-ACL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-ACL
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Data-Bind/Makefile b/devel/p5-Data-Bind/Makefile
index 9219c46a69bc..680a1e332c64 100644
--- a/devel/p5-Data-Bind/Makefile
+++ b/devel/p5-Data-Bind/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Data-Bind
PORTVERSION= 0.28
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yinjieh@csie.nctu.edu.tw
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index 3dee7817b5bd..4a9265d96224 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Compare
PORTVERSION= 1.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Data-DumpXML/Makefile b/devel/p5-Data-DumpXML/Makefile
index 1ccfb3feb4e4..1b579dde7bd1 100644
--- a/devel/p5-Data-DumpXML/Makefile
+++ b/devel/p5-Data-DumpXML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-DumpXML
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Data-Dumper-Simple/Makefile b/devel/p5-Data-Dumper-Simple/Makefile
index 871155b07a98..bb0b8c2936ec 100644
--- a/devel/p5-Data-Dumper-Simple/Makefile
+++ b/devel/p5-Data-Dumper-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Dumper-Simple
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index adb460811564..78a872d5ae4e 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Flow
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Data-GUID/Makefile b/devel/p5-Data-GUID/Makefile
index 51bd79e70735..fa9d60fd26a3 100644
--- a/devel/p5-Data-GUID/Makefile
+++ b/devel/p5-Data-GUID/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-GUID
PORTVERSION= 0.043
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Data-HexDump/Makefile b/devel/p5-Data-HexDump/Makefile
index de7804646b51..674554180551 100644
--- a/devel/p5-Data-HexDump/Makefile
+++ b/devel/p5-Data-HexDump/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-HexDump
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-Hierarchy/Makefile b/devel/p5-Data-Hierarchy/Makefile
index cd78c28ad846..ef1f3ab2f9a7 100644
--- a/devel/p5-Data-Hierarchy/Makefile
+++ b/devel/p5-Data-Hierarchy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Hierarchy
PORTVERSION= 0.34
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-Data-Lazy/Makefile b/devel/p5-Data-Lazy/Makefile
index 2955e26fb37d..62485927a80d 100644
--- a/devel/p5-Data-Lazy/Makefile
+++ b/devel/p5-Data-Lazy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Lazy
PORTVERSION= 0.6
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAMV
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-OptList/Makefile b/devel/p5-Data-OptList/Makefile
index 12aeb6698414..c41cdd5e295e 100644
--- a/devel/p5-Data-OptList/Makefile
+++ b/devel/p5-Data-OptList/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-OptList
PORTVERSION= 0.103
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Data-Postponed/Makefile b/devel/p5-Data-Postponed/Makefile
index f2b78cdbe807..f5841cb38b84 100644
--- a/devel/p5-Data-Postponed/Makefile
+++ b/devel/p5-Data-Postponed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Postponed
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Data-Properties/Makefile b/devel/p5-Data-Properties/Makefile
index 16e723d3565f..5a73adbc5553 100644
--- a/devel/p5-Data-Properties/Makefile
+++ b/devel/p5-Data-Properties/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Properties
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Data-Random/Makefile b/devel/p5-Data-Random/Makefile
index e39b3338abdf..ad5d8eefa660 100644
--- a/devel/p5-Data-Random/Makefile
+++ b/devel/p5-Data-Random/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Data-Random
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Data-RoundRobin/Makefile b/devel/p5-Data-RoundRobin/Makefile
index 2726014b9f03..f6eff04d725e 100644
--- a/devel/p5-Data-RoundRobin/Makefile
+++ b/devel/p5-Data-RoundRobin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-RoundRobin
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/devel/p5-Data-Serializer/Makefile b/devel/p5-Data-Serializer/Makefile
index 4024788e7c63..410d2dbf8d66 100644
--- a/devel/p5-Data-Serializer/Makefile
+++ b/devel/p5-Data-Serializer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Serializer
PORTVERSION= 0.41
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index abafb7d901e2..32cdd7409859 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-ShowTable
PORTVERSION= 3.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Data-Stag/Makefile b/devel/p5-Data-Stag/Makefile
index 94609f6eab95..638b43c09f03 100644
--- a/devel/p5-Data-Stag/Makefile
+++ b/devel/p5-Data-Stag/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Data-Stag
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fernan@iib.unsam.edu.ar
diff --git a/devel/p5-Data-Structure-Util/Makefile b/devel/p5-Data-Structure-Util/Makefile
index 0f296246cf07..0f06a2a5a47e 100644
--- a/devel/p5-Data-Structure-Util/Makefile
+++ b/devel/p5-Data-Structure-Util/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Structure-Util
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= nistor@snickers.org
diff --git a/devel/p5-Data-Table/Makefile b/devel/p5-Data-Table/Makefile
index 49072a73f899..359b441eea09 100644
--- a/devel/p5-Data-Table/Makefile
+++ b/devel/p5-Data-Table/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Table
PORTVERSION= 1.52
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Data-Taxonomy-Tags/Makefile b/devel/p5-Data-Taxonomy-Tags/Makefile
index 6a3e382a0851..6f7a48350648 100644
--- a/devel/p5-Data-Taxonomy-Tags/Makefile
+++ b/devel/p5-Data-Taxonomy-Tags/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Taxonomy-Tags
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Data-TemporaryBag/Makefile b/devel/p5-Data-TemporaryBag/Makefile
index 0734d718aaf4..66ccc8e7b672 100644
--- a/devel/p5-Data-TemporaryBag/Makefile
+++ b/devel/p5-Data-TemporaryBag/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-TemporaryBag
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-TreeDumper/Makefile b/devel/p5-Data-TreeDumper/Makefile
index be31c6d80415..380c910becb3 100644
--- a/devel/p5-Data-TreeDumper/Makefile
+++ b/devel/p5-Data-TreeDumper/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-TreeDumper
PORTVERSION= 0.33
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Data-Types/Makefile b/devel/p5-Data-Types/Makefile
index 00df1880a349..5a0c067aa54c 100644
--- a/devel/p5-Data-Types/Makefile
+++ b/devel/p5-Data-Types/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Types
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Data-UUID/Makefile b/devel/p5-Data-UUID/Makefile
index d324fdf762b2..f2aae9c69b39 100644
--- a/devel/p5-Data-UUID/Makefile
+++ b/devel/p5-Data-UUID/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-UUID
PORTVERSION= 1.148
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Data-Validate/Makefile b/devel/p5-Data-Validate/Makefile
index 5892f91e9b6c..e8aa8f8452fe 100644
--- a/devel/p5-Data-Validate/Makefile
+++ b/devel/p5-Data-Validate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Validate
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index f97923759650..0d6c634e2922 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Date-Calc
PORTVERSION= 5.5.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TC/TCHATZI
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Date-DayOfWeek/Makefile b/devel/p5-Date-DayOfWeek/Makefile
index d0f00e2d342a..c4ef97a6bf7f 100644
--- a/devel/p5-Date-DayOfWeek/Makefile
+++ b/devel/p5-Date-DayOfWeek/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Date-DayOfWeek
PORTVERSION= 1.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Date-Easter/Makefile b/devel/p5-Date-Easter/Makefile
index d5d08d1ab14e..ae44b1b6e500 100644
--- a/devel/p5-Date-Easter/Makefile
+++ b/devel/p5-Date-Easter/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Date-Easter
PORTVERSION= 1.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Date-EzDate/Makefile b/devel/p5-Date-EzDate/Makefile
index de8e835cf7a3..f48867a5f023 100644
--- a/devel/p5-Date-EzDate/Makefile
+++ b/devel/p5-Date-EzDate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-EzDate
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Date-Holidays-DK/Makefile b/devel/p5-Date-Holidays-DK/Makefile
index e358b3ab9cf8..2302b6e21eb2 100644
--- a/devel/p5-Date-Holidays-DK/Makefile
+++ b/devel/p5-Date-Holidays-DK/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Holidays-DK
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Date-ISO/Makefile b/devel/p5-Date-ISO/Makefile
index edcf5c9e2e9c..c971d4e6adff 100644
--- a/devel/p5-Date-ISO/Makefile
+++ b/devel/p5-Date-ISO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-ISO
PORTVERSION= 1.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 3b6ec8b9ec75..824c27a71b29 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Manip
PORTVERSION= 5.44
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= DateManip-${PORTVERSION}
diff --git a/devel/p5-Date-Pcalc/Makefile b/devel/p5-Date-Pcalc/Makefile
index 8eebd48145f9..690e632cd281 100644
--- a/devel/p5-Date-Pcalc/Makefile
+++ b/devel/p5-Date-Pcalc/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.2
CATEGORIES= devel perl5
MASTER_SITES= ftp://catcode.com/pub/date/ \
http://www.engelschall.com/u/sb/download/pkg/ \
- ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+ CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Date-Range/Makefile b/devel/p5-Date-Range/Makefile
index 20aaaff4f0c3..54e121fe0a8e 100644
--- a/devel/p5-Date-Range/Makefile
+++ b/devel/p5-Date-Range/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Range
PORTVERSION= 1.40
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Date-Roman/Makefile b/devel/p5-Date-Roman/Makefile
index 549ffc759df0..4af023b16e24 100644
--- a/devel/p5-Date-Roman/Makefile
+++ b/devel/p5-Date-Roman/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Roman
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= philip@FreeBSD.org
diff --git a/devel/p5-Date-Set/Makefile b/devel/p5-Date-Set/Makefile
index 931b1d0db2ee..36d258894ec0 100644
--- a/devel/p5-Date-Set/Makefile
+++ b/devel/p5-Date-Set/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Set
PORTVERSION= 1.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Date-Simple/Makefile b/devel/p5-Date-Simple/Makefile
index 9723f98fc8c5..0839b95df63e 100644
--- a/devel/p5-Date-Simple/Makefile
+++ b/devel/p5-Date-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Date-Simple
PORTVERSION= 3.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/Y/YV/YVES/
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-DateConvert/Makefile b/devel/p5-DateConvert/Makefile
index 2e6d2150460a..fdaeb898225f 100644
--- a/devel/p5-DateConvert/Makefile
+++ b/devel/p5-DateConvert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateConvert
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-DateTime-Calendar-Discordian/Makefile b/devel/p5-DateTime-Calendar-Discordian/Makefile
index a1246a15fc16..edf00cc01321 100644
--- a/devel/p5-DateTime-Calendar-Discordian/Makefile
+++ b/devel/p5-DateTime-Calendar-Discordian/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Calendar-Discordian
PORTVERSION= 0.9.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= philip@FreeBSD.org
diff --git a/devel/p5-DateTime-Event-Recurrence/Makefile b/devel/p5-DateTime-Event-Recurrence/Makefile
index 1d60d1567b63..169b09749c47 100644
--- a/devel/p5-DateTime-Event-Recurrence/Makefile
+++ b/devel/p5-DateTime-Event-Recurrence/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Event-Recurrence
DISTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime DateTime/FGLOCK
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index d962fb8585f8..d5b205ff6f11 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Set
DISTVERSION= 0.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime DateTime/FGLOCK
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Util-Astro/Makefile b/devel/p5-DateTime-Util-Astro/Makefile
index 0487fca75086..8160261e5c21 100644
--- a/devel/p5-DateTime-Util-Astro/Makefile
+++ b/devel/p5-DateTime-Util-Astro/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Util-Astro
PORTVERSION= 0.11001
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DM/DMAKI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-DateTime-Util-Calc/Makefile b/devel/p5-DateTime-Util-Calc/Makefile
index 11790128810f..a008be48df06 100644
--- a/devel/p5-DateTime-Util-Calc/Makefile
+++ b/devel/p5-DateTime-Util-Calc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DateTime-Util-Calc
PORTVERSION= 0.13002
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-Decision-ACL/Makefile b/devel/p5-Decision-ACL/Makefile
index 391be23a2d75..a2853a51a9e3 100644
--- a/devel/p5-Decision-ACL/Makefile
+++ b/devel/p5-Decision-ACL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Decision-ACL
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Decision
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Devel-Arena/Makefile b/devel/p5-Devel-Arena/Makefile
index 1510e8da34f2..4c711499b7a4 100644
--- a/devel/p5-Devel-Arena/Makefile
+++ b/devel/p5-Devel-Arena/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Arena
PORTVERSION= 0.23
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Constants/Makefile b/devel/p5-Devel-Constants/Makefile
index 693b52b944f6..bd7c767de791 100644
--- a/devel/p5-Devel-Constants/Makefile
+++ b/devel/p5-Devel-Constants/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Constants
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Devel-CoreStack/Makefile b/devel/p5-Devel-CoreStack/Makefile
index 72b098c1a8fa..b864e1eb85e3 100644
--- a/devel/p5-Devel-CoreStack/Makefile
+++ b/devel/p5-Devel-CoreStack/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-CoreStack
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Devel-Cycle/Makefile b/devel/p5-Devel-Cycle/Makefile
index 1539f2189544..b134d7cb114b 100644
--- a/devel/p5-Devel-Cycle/Makefile
+++ b/devel/p5-Devel-Cycle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Cycle
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-DProfPP/Makefile b/devel/p5-Devel-DProfPP/Makefile
index b415d5def5f4..9583ad9d1ff3 100644
--- a/devel/p5-Devel-DProfPP/Makefile
+++ b/devel/p5-Devel-DProfPP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-DProfPP
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Diagram/Makefile b/devel/p5-Devel-Diagram/Makefile
index 9da354db61c4..73409b435b34 100644
--- a/devel/p5-Devel-Diagram/Makefile
+++ b/devel/p5-Devel-Diagram/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Diagram
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Leak-Object/Makefile b/devel/p5-Devel-Leak-Object/Makefile
index c5777afa7c20..288a245403bb 100644
--- a/devel/p5-Devel-Leak-Object/Makefile
+++ b/devel/p5-Devel-Leak-Object/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Leak-Object
PORTVERSION= 0.91
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Leak/Makefile b/devel/p5-Devel-Leak/Makefile
index 29de2fce778f..0b0b57d6ff23 100644
--- a/devel/p5-Devel-Leak/Makefile
+++ b/devel/p5-Devel-Leak/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Leak
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile
index 834402ae255b..e9e3565911b0 100644
--- a/devel/p5-Devel-LeakTrace/Makefile
+++ b/devel/p5-Devel-LeakTrace/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Devel-LeakTrace
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-LexAlias/Makefile b/devel/p5-Devel-LexAlias/Makefile
index 00b3e2f1de4e..dd93c0b47f3c 100644
--- a/devel/p5-Devel-LexAlias/Makefile
+++ b/devel/p5-Devel-LexAlias/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Devel-LexAlias
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yinjieh@csie.nctu.edu.tw
diff --git a/devel/p5-Devel-Messenger/Makefile b/devel/p5-Devel-Messenger/Makefile
index 35fd51ed663d..b75937d34d83 100644
--- a/devel/p5-Devel-Messenger/Makefile
+++ b/devel/p5-Devel-Messenger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Messenger
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Devel-Modlist/Makefile b/devel/p5-Devel-Modlist/Makefile
index fff99336ab6e..026541d6e40f 100644
--- a/devel/p5-Devel-Modlist/Makefile
+++ b/devel/p5-Devel-Modlist/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Modlist
PORTVERSION= 0.71
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Devel-ObjectTracker/Makefile b/devel/p5-Devel-ObjectTracker/Makefile
index 59c6d23cdd20..5032da6e7072 100644
--- a/devel/p5-Devel-ObjectTracker/Makefile
+++ b/devel/p5-Devel-ObjectTracker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-ObjectTracker
PORTVERSION= 0.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-PPPort/Makefile b/devel/p5-Devel-PPPort/Makefile
index 8e6c3beeb584..9db8cb34393a 100644
--- a/devel/p5-Devel-PPPort/Makefile
+++ b/devel/p5-Devel-PPPort/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-PPPort
PORTVERSION= 3.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
#DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(..)$/_\1/}
diff --git a/devel/p5-Devel-Pointer/Makefile b/devel/p5-Devel-Pointer/Makefile
index eefd7728611a..1b9630bb7f36 100644
--- a/devel/p5-Devel-Pointer/Makefile
+++ b/devel/p5-Devel-Pointer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Pointer
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Profiler/Makefile b/devel/p5-Devel-Profiler/Makefile
index 6876c65394c7..37cc447f7e5e 100644
--- a/devel/p5-Devel-Profiler/Makefile
+++ b/devel/p5-Devel-Profiler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Profiler
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-Required/Makefile b/devel/p5-Devel-Required/Makefile
index 0e78aaf248db..2316af7496eb 100644
--- a/devel/p5-Devel-Required/Makefile
+++ b/devel/p5-Devel-Required/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Required
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Devel-RingBuffer/Makefile b/devel/p5-Devel-RingBuffer/Makefile
index c5786ad8d9a0..89287ac6cfeb 100644
--- a/devel/p5-Devel-RingBuffer/Makefile
+++ b/devel/p5-Devel-RingBuffer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-RingBuffer
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-STrace/Makefile b/devel/p5-Devel-STrace/Makefile
index dac24ed9538f..4be23cc90f45 100644
--- a/devel/p5-Devel-STrace/Makefile
+++ b/devel/p5-Devel-STrace/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-STrace
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index ebadb19afa2c..444df03b8f38 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-SmallProf
PORTVERSION= 2.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SALVA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Devel-StackTrace/Makefile b/devel/p5-Devel-StackTrace/Makefile
index c24ff8d8a370..1a530e6138f7 100644
--- a/devel/p5-Devel-StackTrace/Makefile
+++ b/devel/p5-Devel-StackTrace/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Devel-StackTrace
PORTVERSION= 1.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Devel-StealthDebug/Makefile b/devel/p5-Devel-StealthDebug/Makefile
index 9b93f178ecd5..4df57f7bce45 100644
--- a/devel/p5-Devel-StealthDebug/Makefile
+++ b/devel/p5-Devel-StealthDebug/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-StealthDebug
PORTVERSION= 1.008
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Devel-Timer/Makefile b/devel/p5-Devel-Timer/Makefile
index 17fd3435d0e7..c946e0c42d22 100644
--- a/devel/p5-Devel-Timer/Makefile
+++ b/devel/p5-Devel-Timer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-Timer
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/devel/p5-Devel-TraceCalls/Makefile b/devel/p5-Devel-TraceCalls/Makefile
index 585e1c29b739..851b9c00d1e8 100644
--- a/devel/p5-Devel-TraceCalls/Makefile
+++ b/devel/p5-Devel-TraceCalls/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-TraceCalls
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Devel-TraceUse/Makefile b/devel/p5-Devel-TraceUse/Makefile
index 4e25a2330b15..2a257f1486de 100644
--- a/devel/p5-Devel-TraceUse/Makefile
+++ b/devel/p5-Devel-TraceUse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Devel-TraceUse
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mauricio@arareko.net
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index 93b1adc8b0a5..0422d6acc3b0 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Devel-ptkdb
PORTVERSION= 1.1091
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Dialog/Makefile b/devel/p5-Dialog/Makefile
index b53d04709406..ee93c00153ba 100644
--- a/devel/p5-Dialog/Makefile
+++ b/devel/p5-Dialog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Dialog
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Dialog
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/p5-Digest-TransformPath/Makefile b/devel/p5-Digest-TransformPath/Makefile
index 6dc8edd8958b..883cd92a04f3 100644
--- a/devel/p5-Digest-TransformPath/Makefile
+++ b/devel/p5-Digest-TransformPath/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-TransformPath
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/devel/p5-Dir-Project/Makefile b/devel/p5-Dir-Project/Makefile
index 8e474d944f30..e2b9ccdc5a14 100644
--- a/devel/p5-Dir-Project/Makefile
+++ b/devel/p5-Dir-Project/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Dir-Project
PORTVERSION= 3.011
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Dir
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Directory-Scratch/Makefile b/devel/p5-Directory-Scratch/Makefile
index 3ff13bc23075..0c237241504e 100644
--- a/devel/p5-Directory-Scratch/Makefile
+++ b/devel/p5-Directory-Scratch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Directory-Scratch
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Directory
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Env-PS1/Makefile b/devel/p5-Env-PS1/Makefile
index 968b2143b11f..35613abe397f 100644
--- a/devel/p5-Env-PS1/Makefile
+++ b/devel/p5-Env-PS1/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Env-PS1
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Env
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Env-Path/Makefile b/devel/p5-Env-Path/Makefile
index 9a852fa5f978..f1cffe437d43 100644
--- a/devel/p5-Env-Path/Makefile
+++ b/devel/p5-Env-Path/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Env-Path
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Env
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index c8fae903db7e..dbf7ce96a99e 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Errno
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Errno
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-Event-ExecFlow/Makefile b/devel/p5-Event-ExecFlow/Makefile
index dd8eb238e459..473e1475632a 100644
--- a/devel/p5-Event-ExecFlow/Makefile
+++ b/devel/p5-Event-ExecFlow/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Event-ExecFlow
PORTVERSION= 0.63
CATEGORIES= devel net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Event
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Event-Lib/Makefile b/devel/p5-Event-Lib/Makefile
index 749d28e2e2f9..d5f71781a365 100644
--- a/devel/p5-Event-Lib/Makefile
+++ b/devel/p5-Event-Lib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Event-Lib
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Event
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fk@fabiankeil.de
diff --git a/devel/p5-Event-RPC/Makefile b/devel/p5-Event-RPC/Makefile
index af72b2fdf0d3..04d126297403 100644
--- a/devel/p5-Event-RPC/Makefile
+++ b/devel/p5-Event-RPC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Event-RPC
PORTVERSION= 0.90
CATEGORIES= devel net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Event
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= vivek@khera.org
diff --git a/devel/p5-Event/Makefile b/devel/p5-Event/Makefile
index 22c39a848a44..232512f56c88 100644
--- a/devel/p5-Event/Makefile
+++ b/devel/p5-Event/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Event
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Event
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index c9319f537354..0e689d053964 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Exception-Class
PORTVERSION= 1.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Exception
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Exception-Handler/Makefile b/devel/p5-Exception-Handler/Makefile
index 86b598d14291..0f69f8383cc2 100644
--- a/devel/p5-Exception-Handler/Makefile
+++ b/devel/p5-Exception-Handler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Exception-Handler
PORTVERSION= 1.004
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Exception
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-Expect-Simple/Makefile b/devel/p5-Expect-Simple/Makefile
index edb50ff26616..e4dbfe25f698 100644
--- a/devel/p5-Expect-Simple/Makefile
+++ b/devel/p5-Expect-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Expect-Simple
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DJ/DJERIUS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Exporter-Tidy/Makefile b/devel/p5-Exporter-Tidy/Makefile
index af69cb3b47c3..a62e01be8bd2 100644
--- a/devel/p5-Exporter-Tidy/Makefile
+++ b/devel/p5-Exporter-Tidy/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Exporter-Tidy
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Exporter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-ExtUtils-AutoInstall/Makefile b/devel/p5-ExtUtils-AutoInstall/Makefile
index cccc2cc2c69c..9865ae65c5cc 100644
--- a/devel/p5-ExtUtils-AutoInstall/Makefile
+++ b/devel/p5-ExtUtils-AutoInstall/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-AutoInstall
PORTVERSION= 0.63
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-ExtUtils-Command/Makefile b/devel/p5-ExtUtils-Command/Makefile
index 32b9645efae5..bf9198a4ce91 100644
--- a/devel/p5-ExtUtils-Command/Makefile
+++ b/devel/p5-ExtUtils-Command/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-Command
PORTVERSION= 1.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-Constant/Makefile b/devel/p5-ExtUtils-Constant/Makefile
index bb92af781395..1e5b875b3636 100644
--- a/devel/p5-ExtUtils-Constant/Makefile
+++ b/devel/p5-ExtUtils-Constant/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-Constant
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-Depends/Makefile b/devel/p5-ExtUtils-Depends/Makefile
index 158c3ea17894..94e72854c4e7 100644
--- a/devel/p5-ExtUtils-Depends/Makefile
+++ b/devel/p5-ExtUtils-Depends/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-Depends
PORTVERSION= 0.205
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
index 734af032429f..96eed323aa3f 100644
--- a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-MakeMaker-Coverage
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile
index 4c4fdac71fe2..1fc9e450ccb2 100644
--- a/devel/p5-ExtUtils-PkgConfig/Makefile
+++ b/devel/p5-ExtUtils-PkgConfig/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-PkgConfig
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-ExtUtils-XSBuilder/Makefile b/devel/p5-ExtUtils-XSBuilder/Makefile
index f71a56a1d8f5..efe768e3988f 100644
--- a/devel/p5-ExtUtils-XSBuilder/Makefile
+++ b/devel/p5-ExtUtils-XSBuilder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ExtUtils-XSBuilder
PORTVERSION= 0.28
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ExtUtils
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index d18402afb6de..96f6f68c2bd0 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -9,7 +9,7 @@ PORTNAME= FSA-Rules
PORTVERSION= 0.26
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DW/DWHEELER
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-File-Append-TempFile/Makefile b/devel/p5-File-Append-TempFile/Makefile
index d0ede958bbb7..18d53f7a99ad 100644
--- a/devel/p5-File-Append-TempFile/Makefile
+++ b/devel/p5-File-Append-TempFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Append-TempFile
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= roam@FreeBSD.org
diff --git a/devel/p5-File-Attributes-Recursive/Makefile b/devel/p5-File-Attributes-Recursive/Makefile
index 319b3a0cf21e..c2e464dbff50 100644
--- a/devel/p5-File-Attributes-Recursive/Makefile
+++ b/devel/p5-File-Attributes-Recursive/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Attributes-Recursive
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-Attributes/Makefile b/devel/p5-File-Attributes/Makefile
index dcef3c83b715..474f9493b578 100644
--- a/devel/p5-File-Attributes/Makefile
+++ b/devel/p5-File-Attributes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Attributes
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-BaseDir/Makefile b/devel/p5-File-BaseDir/Makefile
index 49a9a571dfc4..bc45d198524f 100644
--- a/devel/p5-File-BaseDir/Makefile
+++ b/devel/p5-File-BaseDir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-BaseDir
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index a705710e6acf..6831b494bc0f 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-BasicFlock
PORTVERSION= 98.1202
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-File-Cache/Makefile b/devel/p5-File-Cache/Makefile
index ffb2b78c1feb..b7dc58bceda3 100644
--- a/devel/p5-File-Cache/Makefile
+++ b/devel/p5-File-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Cache
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-File-Cat/Makefile b/devel/p5-File-Cat/Makefile
index 13ba1b0a22d5..0d69c5a86feb 100644
--- a/devel/p5-File-Cat/Makefile
+++ b/devel/p5-File-Cat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Cat
PORTVERSION= 1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-CreationTime/Makefile b/devel/p5-File-CreationTime/Makefile
index 629739ac4906..5e83c1a5d2bb 100644
--- a/devel/p5-File-CreationTime/Makefile
+++ b/devel/p5-File-CreationTime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-CreationTime
PORTVERSION= 2.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-DesktopEntry/Makefile b/devel/p5-File-DesktopEntry/Makefile
index 481c5af3024c..50b63b65211e 100644
--- a/devel/p5-File-DesktopEntry/Makefile
+++ b/devel/p5-File-DesktopEntry/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-DesktopEntry
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/P/PA/PARDUS/${PORTNAME}
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= acm@FreeBSD.org
diff --git a/devel/p5-File-FTS/Makefile b/devel/p5-File-FTS/Makefile
index 7708db9d8c8e..3d00291294cd 100644
--- a/devel/p5-File-FTS/Makefile
+++ b/devel/p5-File-FTS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-FTS
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
index 60c7a5068a1b..32b62e5f7ed0 100644
--- a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
+++ b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Find-Rule-Filesys-Virtual
PORTVERSION= 1.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-File-Find-Rule/Makefile b/devel/p5-File-Find-Rule/Makefile
index 0bbd2accc98b..9b2949d8fdcf 100644
--- a/devel/p5-File-Find-Rule/Makefile
+++ b/devel/p5-File-Find-Rule/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Find-Rule
PORTVERSION= 0.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-File-Flat/Makefile b/devel/p5-File-Flat/Makefile
index 02ec0926922e..81ad77982b41 100644
--- a/devel/p5-File-Flat/Makefile
+++ b/devel/p5-File-Flat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Flat
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-File-Flock/Makefile b/devel/p5-File-Flock/Makefile
index 6e7c84aede5a..a6906b1c66d6 100644
--- a/devel/p5-File-Flock/Makefile
+++ b/devel/p5-File-Flock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Flock
PORTVERSION= 104.111901
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-FnMatch/Makefile b/devel/p5-File-FnMatch/Makefile
index 754f32b19e23..097ee59ff031 100644
--- a/devel/p5-File-FnMatch/Makefile
+++ b/devel/p5-File-FnMatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-FnMatch
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-File-Grep/Makefile b/devel/p5-File-Grep/Makefile
index 51b91675cc8a..66fd55730048 100644
--- a/devel/p5-File-Grep/Makefile
+++ b/devel/p5-File-Grep/Makefile
@@ -7,8 +7,7 @@
PORTNAME= File-Grep
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kiwi@oav.net
diff --git a/devel/p5-File-HomeDir/Makefile b/devel/p5-File-HomeDir/Makefile
index 9845ddbdafa9..938c9de770c7 100644
--- a/devel/p5-File-HomeDir/Makefile
+++ b/devel/p5-File-HomeDir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-HomeDir
PORTVERSION= 0.69
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index 77081021a61a..01824d886d41 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Lock
PORTVERSION= 0.9
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-File-MMagic-XS/Makefile b/devel/p5-File-MMagic-XS/Makefile
index 774f4939547c..c0bc209e0088 100644
--- a/devel/p5-File-MMagic-XS/Makefile
+++ b/devel/p5-File-MMagic-XS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-MMagic-XS
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-File-MMagic/Makefile b/devel/p5-File-MMagic/Makefile
index 661cf3394518..213a2d13a3ca 100644
--- a/devel/p5-File-MMagic/Makefile
+++ b/devel/p5-File-MMagic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-MMagic
PORTVERSION= 1.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile
index 1b7217b0b7aa..9e7f90f58eaf 100644
--- a/devel/p5-File-Modified/Makefile
+++ b/devel/p5-File-Modified/Makefile
@@ -7,8 +7,7 @@ PORTNAME= File-Modified
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-Monitor/Makefile b/devel/p5-File-Monitor/Makefile
index 0301ce5d0395..52f8a272e810 100644
--- a/devel/p5-File-Monitor/Makefile
+++ b/devel/p5-File-Monitor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Monitor
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AN/ANDYA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-File-NCopy/Makefile b/devel/p5-File-NCopy/Makefile
index 85e02c0bb985..eea1e4ee9a08 100644
--- a/devel/p5-File-NCopy/Makefile
+++ b/devel/p5-File-NCopy/Makefile
@@ -9,7 +9,7 @@ PORTNAME= File-NCopy
PORTVERSION= 0.34
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/M/MZ/MZSANFORD
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-File-NFSLock/Makefile b/devel/p5-File-NFSLock/Makefile
index 39947f5ddf16..fef5e0708385 100644
--- a/devel/p5-File-NFSLock/Makefile
+++ b/devel/p5-File-NFSLock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-NFSLock
PORTVERSION= 1.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-Path-Expand/Makefile b/devel/p5-File-Path-Expand/Makefile
index 0a6b427661f3..9f7244561a79 100644
--- a/devel/p5-File-Path-Expand/Makefile
+++ b/devel/p5-File-Path-Expand/Makefile
@@ -7,8 +7,7 @@
PORTNAME= File-Path-Expand
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-File-PathConvert/Makefile b/devel/p5-File-PathConvert/Makefile
index 9633658135b5..0c3950636788 100644
--- a/devel/p5-File-PathConvert/Makefile
+++ b/devel/p5-File-PathConvert/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-PathConvert
PORTVERSION= 0.9
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-Pid/Makefile b/devel/p5-File-Pid/Makefile
index 63f1180a059c..d205e98e9cc2 100644
--- a/devel/p5-File-Pid/Makefile
+++ b/devel/p5-File-Pid/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Pid
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-File-Random/Makefile b/devel/p5-File-Random/Makefile
index db06d76bac71..66e4ed2d38f1 100644
--- a/devel/p5-File-Random/Makefile
+++ b/devel/p5-File-Random/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Random
PORTVERSION= 0.17
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-File-ReadBackwards/Makefile b/devel/p5-File-ReadBackwards/Makefile
index 81eb5000649f..a0fa9672e6b9 100644
--- a/devel/p5-File-ReadBackwards/Makefile
+++ b/devel/p5-File-ReadBackwards/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-ReadBackwards
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-File-ShareDir/Makefile b/devel/p5-File-ShareDir/Makefile
index 6ff0f9a0240b..c71a55ea69c0 100644
--- a/devel/p5-File-ShareDir/Makefile
+++ b/devel/p5-File-ShareDir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-ShareDir
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-File-Slurp-Tree/Makefile b/devel/p5-File-Slurp-Tree/Makefile
index 8ced9e7f3529..86ffc078721a 100644
--- a/devel/p5-File-Slurp-Tree/Makefile
+++ b/devel/p5-File-Slurp-Tree/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Slurp-Tree
PORTVERSION= 1.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index 03d881459d48..46536b471a09 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Sync
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-File-Tail/Makefile b/devel/p5-File-Tail/Makefile
index 402e02748dea..6b0b849cac90 100644
--- a/devel/p5-File-Tail/Makefile
+++ b/devel/p5-File-Tail/Makefile
@@ -7,8 +7,7 @@
PORTNAME= File-Tail
PORTVERSION= 0.99.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= shaun@FreeBSD.org
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index deff754a543d..44c5bac9d4a9 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Temp
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/p5-File-Tempdir/Makefile b/devel/p5-File-Tempdir/Makefile
index 106c55d7f0c9..09105bbaf074 100644
--- a/devel/p5-File-Tempdir/Makefile
+++ b/devel/p5-File-Tempdir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Tempdir
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= loader@freebsdmall.com
diff --git a/devel/p5-File-Type/Makefile b/devel/p5-File-Type/Makefile
index 7008bd559c2c..a9d94d2160fd 100644
--- a/devel/p5-File-Type/Makefile
+++ b/devel/p5-File-Type/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Type
PORTVERSION= 0.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ahze@FreeBSD.org
diff --git a/devel/p5-File-chdir/Makefile b/devel/p5-File-chdir/Makefile
index e68dbc8c8625..219be419cf63 100644
--- a/devel/p5-File-chdir/Makefile
+++ b/devel/p5-File-chdir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-chdir
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-File-chmod/Makefile b/devel/p5-File-chmod/Makefile
index 018a4526a0e0..b684e57408bd 100644
--- a/devel/p5-File-chmod/Makefile
+++ b/devel/p5-File-chmod/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-chmod
PORTVERSION= 0.32
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= smatsui@karashi.org
diff --git a/devel/p5-File-pushd/Makefile b/devel/p5-File-pushd/Makefile
index d09af9071f06..65aa4ea1dae3 100644
--- a/devel/p5-File-pushd/Makefile
+++ b/devel/p5-File-pushd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-pushd
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-FileHandle-Fmode/Makefile b/devel/p5-FileHandle-Fmode/Makefile
index 6e96b41083ec..b9c2a0b22907 100644
--- a/devel/p5-FileHandle-Fmode/Makefile
+++ b/devel/p5-FileHandle-Fmode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= FileHandle-Fmode
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= FileHandle
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/devel/p5-FileHandle-Unget/Makefile b/devel/p5-FileHandle-Unget/Makefile
index 875140ba979d..a49f1f373fa3 100644
--- a/devel/p5-FileHandle-Unget/Makefile
+++ b/devel/p5-FileHandle-Unget/Makefile
@@ -8,8 +8,7 @@
PORTNAME= FileHandle-Unget
PORTVERSION= 0.1621
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= FileHandle
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Filter-Template/Makefile b/devel/p5-Filter-Template/Makefile
index ed608ded0ba6..c1c9a39bb8fe 100644
--- a/devel/p5-Filter-Template/Makefile
+++ b/devel/p5-Filter-Template/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter-Template
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index d50026cc2381..56f94a75a5e7 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter
PORTVERSION= 1.34
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index e8c46307eddb..be434eb30b6b 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -8,8 +8,7 @@
PORTNAME= FreezeThaw
PORTVERSION= 0.43
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= FreezeThaw
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Gearman-Client-Async/Makefile b/devel/p5-Gearman-Client-Async/Makefile
index ef3f7a833b44..1b7014b78d91 100644
--- a/devel/p5-Gearman-Client-Async/Makefile
+++ b/devel/p5-Gearman-Client-Async/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gearman-Client-Async
PORTVERSION= 0.94
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/B/BR/BRADFITZ
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Gearman-Server/Makefile b/devel/p5-Gearman-Server/Makefile
index dfbbd100d5b1..e978b2ed084c 100644
--- a/devel/p5-Gearman-Server/Makefile
+++ b/devel/p5-Gearman-Server/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gearman-Server
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/B/BR/BRADFITZ
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Gearman/Makefile b/devel/p5-Gearman/Makefile
index d58b05037d51..23cd93cc006a 100644
--- a/devel/p5-Gearman/Makefile
+++ b/devel/p5-Gearman/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gearman
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/B/BR/BRADFITZ
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Getopt-ArgvFile/Makefile b/devel/p5-Getopt-ArgvFile/Makefile
index 6d6c0fb617da..d1f9acf5e61a 100644
--- a/devel/p5-Getopt-ArgvFile/Makefile
+++ b/devel/p5-Getopt-ArgvFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-ArgvFile
PORTVERSION= 1.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Getopt-Declare/Makefile b/devel/p5-Getopt-Declare/Makefile
index 4e7b78cc7910..5b72307843f0 100644
--- a/devel/p5-Getopt-Declare/Makefile
+++ b/devel/p5-Getopt-Declare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-Declare
PORTVERSION= 1.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Getopt-Long/Makefile b/devel/p5-Getopt-Long/Makefile
index adc79572496a..9c5de50d3af5 100644
--- a/devel/p5-Getopt-Long/Makefile
+++ b/devel/p5-Getopt-Long/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-Long
PORTVERSION= 2.37
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Getopt-Mixed/Makefile b/devel/p5-Getopt-Mixed/Makefile
index c16a4fa7dc4e..05128d347564 100644
--- a/devel/p5-Getopt-Mixed/Makefile
+++ b/devel/p5-Getopt-Mixed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-Mixed
PORTVERSION= 1.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Getopt-Popt/Makefile b/devel/p5-Getopt-Popt/Makefile
index 0756f127e20b..a3796541be21 100644
--- a/devel/p5-Getopt-Popt/Makefile
+++ b/devel/p5-Getopt-Popt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Getopt-Popt
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Getopt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Hash-WithDefaults/Makefile b/devel/p5-Hash-WithDefaults/Makefile
index f394752dc792..2be050cfb756 100644
--- a/devel/p5-Hash-WithDefaults/Makefile
+++ b/devel/p5-Hash-WithDefaults/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Hash-WithDefaults
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Hash
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Heap-Simple-Perl/Makefile b/devel/p5-Heap-Simple-Perl/Makefile
index fa1147c2670e..54445093917b 100644
--- a/devel/p5-Heap-Simple-Perl/Makefile
+++ b/devel/p5-Heap-Simple-Perl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Heap-Simple-Perl
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Heap
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Heap-Simple-XS/Makefile b/devel/p5-Heap-Simple-XS/Makefile
index 8eb8f9d6b7db..ef3307d3bb6b 100644
--- a/devel/p5-Heap-Simple-XS/Makefile
+++ b/devel/p5-Heap-Simple-XS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Heap-Simple-XS
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Heap
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Heap-Simple/Makefile b/devel/p5-Heap-Simple/Makefile
index c2dc6ed5a926..523d5d03f156 100644
--- a/devel/p5-Heap-Simple/Makefile
+++ b/devel/p5-Heap-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Heap-Simple
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Heap
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Heap/Makefile b/devel/p5-Heap/Makefile
index 6152716eafbc..c412b329fc25 100644
--- a/devel/p5-Heap/Makefile
+++ b/devel/p5-Heap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Heap
PORTVERSION= 0.80
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Heap
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tolid@plab.ku.dk
diff --git a/devel/p5-Hook-LexWrap/Makefile b/devel/p5-Hook-LexWrap/Makefile
index 7a4b0e5fa6d5..8f6d4301e799 100644
--- a/devel/p5-Hook-LexWrap/Makefile
+++ b/devel/p5-Hook-LexWrap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Hook-LexWrap
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Hook
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-All/Makefile b/devel/p5-IO-All/Makefile
index 475e93343e08..577d9131b5fe 100644
--- a/devel/p5-IO-All/Makefile
+++ b/devel/p5-IO-All/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-All
PORTVERSION= 0.38
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-Capture/Makefile b/devel/p5-IO-Capture/Makefile
index f8ae4246a475..dc766237bd4f 100644
--- a/devel/p5-IO-Capture/Makefile
+++ b/devel/p5-IO-Capture/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Capture
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-IO-Digest/Makefile b/devel/p5-IO-Digest/Makefile
index ae7172144b1f..8748989d1029 100644
--- a/devel/p5-IO-Digest/Makefile
+++ b/devel/p5-IO-Digest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Digest
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-IO-KQueue/Makefile b/devel/p5-IO-KQueue/Makefile
index 632862f36542..1399e1be1db3 100644
--- a/devel/p5-IO-KQueue/Makefile
+++ b/devel/p5-IO-KQueue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-KQueue
PORTVERSION= 0.32
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-IO-LockedFile/Makefile b/devel/p5-IO-LockedFile/Makefile
index a466d8dadceb..81a8be06e0b6 100644
--- a/devel/p5-IO-LockedFile/Makefile
+++ b/devel/p5-IO-LockedFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-LockedFile
PORTVERSION= 0.23
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IO-Multiplex/Makefile b/devel/p5-IO-Multiplex/Makefile
index a3dbfe8291a6..1f7188579296 100644
--- a/devel/p5-IO-Multiplex/Makefile
+++ b/devel/p5-IO-Multiplex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Multiplex
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IO-NestedCapture/Makefile b/devel/p5-IO-NestedCapture/Makefile
index 40f6b044ee39..47f29212f0dc 100644
--- a/devel/p5-IO-NestedCapture/Makefile
+++ b/devel/p5-IO-NestedCapture/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-NestedCapture
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-Null/Makefile b/devel/p5-IO-Null/Makefile
index c778e3c5a677..b56f442346b5 100644
--- a/devel/p5-IO-Null/Makefile
+++ b/devel/p5-IO-Null/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Null
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rouslan@rshell.net
diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile
index 2955097a0318..663e51aa5e21 100644
--- a/devel/p5-IO-Pager/Makefile
+++ b/devel/p5-IO-Pager/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Pager
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-IO-Prompt/Makefile b/devel/p5-IO-Prompt/Makefile
index 53ba56e78ad0..738d3482a410 100644
--- a/devel/p5-IO-Prompt/Makefile
+++ b/devel/p5-IO-Prompt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= IO-Prompt
PORTVERSION= 0.99.4
DISTVERSIONPREFIX= v
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/D/DC/DCONWAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-IO-String/Makefile b/devel/p5-IO-String/Makefile
index e377a81efcd3..91db21e1c36f 100644
--- a/devel/p5-IO-String/Makefile
+++ b/devel/p5-IO-String/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-String
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-IO-Tee/Makefile b/devel/p5-IO-Tee/Makefile
index 3bd9e66e0dc0..597dc4c4d57d 100644
--- a/devel/p5-IO-Tee/Makefile
+++ b/devel/p5-IO-Tee/Makefile
@@ -9,8 +9,7 @@ PORTNAME= IO-Tee
PORTVERSION= 0.64
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-IO-Toolkit/Makefile b/devel/p5-IO-Toolkit/Makefile
index da142d19bd51..f580a062e079 100644
--- a/devel/p5-IO-Toolkit/Makefile
+++ b/devel/p5-IO-Toolkit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Toolkit
PORTVERSION= 1.008
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index e035776b0fb6..f65f4f8e9a67 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-Tty
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-IO-Util/Makefile b/devel/p5-IO-Util/Makefile
index f5150b874be5..787b8aa93308 100644
--- a/devel/p5-IO-Util/Makefile
+++ b/devel/p5-IO-Util/Makefile
@@ -9,8 +9,7 @@ PORTNAME= IO-Util
PORTVERSION= 1.5
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-YAML/Makefile b/devel/p5-IO-YAML/Makefile
index a47224005284..a7e86cb67b2f 100644
--- a/devel/p5-IO-YAML/Makefile
+++ b/devel/p5-IO-YAML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-YAML
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 417c483cadbf..78d356919f25 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO-stringy
PORTVERSION= 2.110
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IO/Makefile b/devel/p5-IO/Makefile
index db41e29d9a0f..1b5455c68b9a 100644
--- a/devel/p5-IO/Makefile
+++ b/devel/p5-IO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IO
PORTVERSION= 1.2301
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-IOC/Makefile b/devel/p5-IOC/Makefile
index a934154fe084..232b4d9038b8 100644
--- a/devel/p5-IOC/Makefile
+++ b/devel/p5-IOC/Makefile
@@ -8,7 +8,7 @@
PORTNAME= IOC
PORTVERSION= 0.29
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile
index 9d72d9df9905..018f9960b7fd 100644
--- a/devel/p5-IPC-Cache/Makefile
+++ b/devel/p5-IPC-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Cache
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-IPC-Cmd/Makefile b/devel/p5-IPC-Cmd/Makefile
index 74fef7cb3309..df7b538661dc 100644
--- a/devel/p5-IPC-Cmd/Makefile
+++ b/devel/p5-IPC-Cmd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Cmd
PORTVERSION= 0.40
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IPC-DirQueue/Makefile b/devel/p5-IPC-DirQueue/Makefile
index df62d15c7021..2137b53aa19e 100644
--- a/devel/p5-IPC-DirQueue/Makefile
+++ b/devel/p5-IPC-DirQueue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-DirQueue
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IPC-Locker/Makefile b/devel/p5-IPC-Locker/Makefile
index 6e7f8596139b..51af43c57659 100644
--- a/devel/p5-IPC-Locker/Makefile
+++ b/devel/p5-IPC-Locker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Locker
PORTVERSION= 1.481
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IPC-MM/Makefile b/devel/p5-IPC-MM/Makefile
index 9c333a8e3a0d..f37555779dcd 100644
--- a/devel/p5-IPC-MM/Makefile
+++ b/devel/p5-IPC-MM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-MM
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-IPC-Mmap-Share/Makefile b/devel/p5-IPC-Mmap-Share/Makefile
index 1c14f4c64d6c..c54590a846a8 100644
--- a/devel/p5-IPC-Mmap-Share/Makefile
+++ b/devel/p5-IPC-Mmap-Share/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Mmap-Share
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-IPC-Open3-Simple/Makefile b/devel/p5-IPC-Open3-Simple/Makefile
index 53e554f9c3e4..08a86502a223 100644
--- a/devel/p5-IPC-Open3-Simple/Makefile
+++ b/devel/p5-IPC-Open3-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Open3-Simple
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-IPC-PubSub/Makefile b/devel/p5-IPC-PubSub/Makefile
index c8e87fd343c3..990d18dbfe66 100644
--- a/devel/p5-IPC-PubSub/Makefile
+++ b/devel/p5-IPC-PubSub/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-PubSub
PORTVERSION= 0.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-IPC-Run/Makefile b/devel/p5-IPC-Run/Makefile
index 6c68477e06ee..67fc2b908f14 100644
--- a/devel/p5-IPC-Run/Makefile
+++ b/devel/p5-IPC-Run/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Run
PORTVERSION= 0.80
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index 4900b37dc05e..dd7baa09bf81 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-SharedCache
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-IPC-Signal/Makefile b/devel/p5-IPC-Signal/Makefile
index 9739e6a83ea0..d25ff726ae69 100644
--- a/devel/p5-IPC-Signal/Makefile
+++ b/devel/p5-IPC-Signal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= IPC-Signal
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= IPC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rouslan@rshell.net
diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile
index 4c62902ea496..6bcf14afb3b6 100644
--- a/devel/p5-Include/Makefile
+++ b/devel/p5-Include/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Include
PORTVERSION= 1.02a
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Include
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Inline-ASM/Makefile b/devel/p5-Inline-ASM/Makefile
index 47fd88ea60c3..da949799d2ec 100644
--- a/devel/p5-Inline-ASM/Makefile
+++ b/devel/p5-Inline-ASM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline-ASM
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Inline-CPP/Makefile b/devel/p5-Inline-CPP/Makefile
index 0fc7aaecd558..73cba5d3c894 100644
--- a/devel/p5-Inline-CPP/Makefile
+++ b/devel/p5-Inline-CPP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline-CPP
PORTVERSION= 0.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Inline-Files/Makefile b/devel/p5-Inline-Files/Makefile
index af8e19f046b3..c203866b7462 100644
--- a/devel/p5-Inline-Files/Makefile
+++ b/devel/p5-Inline-Files/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Inline-Files
PORTVERSION= 0.62
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Inline-Filters/Makefile b/devel/p5-Inline-Filters/Makefile
index 827c096c8b58..67b68f18c499 100644
--- a/devel/p5-Inline-Filters/Makefile
+++ b/devel/p5-Inline-Filters/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline-Filters
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index 37f7cc55dce9..6d69d5ef174a 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Inline-Java
PORTVERSION= 0.52
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/P/PA/PATL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Inline-Tcl/Makefile b/devel/p5-Inline-Tcl/Makefile
index d9d4b0119929..9e684aca881e 100644
--- a/devel/p5-Inline-Tcl/Makefile
+++ b/devel/p5-Inline-Tcl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline-Tcl
PORTVERSION= 0.09
CATEGORIES= devel perl5 tcl
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index 4bd59b7893a9..9f05e942a5ed 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Inline
PORTVERSION= 0.44
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Inline
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index ade01da02d39..6a7d320a225f 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Ioctl
PORTVERSION= 0.81
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Ioctl/JPRIT
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Iterator-IO/Makefile b/devel/p5-Iterator-IO/Makefile
index eff167da11d6..d2923fc7ed40 100644
--- a/devel/p5-Iterator-IO/Makefile
+++ b/devel/p5-Iterator-IO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Iterator-IO
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Iterator
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Iterator-Misc/Makefile b/devel/p5-Iterator-Misc/Makefile
index d4d9a5db5b85..ebdffa475fd9 100644
--- a/devel/p5-Iterator-Misc/Makefile
+++ b/devel/p5-Iterator-Misc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Iterator-Misc
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Iterator
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Iterator-Util/Makefile b/devel/p5-Iterator-Util/Makefile
index 75d28a1133eb..2eada05f872a 100644
--- a/devel/p5-Iterator-Util/Makefile
+++ b/devel/p5-Iterator-Util/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Iterator-Util
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Iterator
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Iterator/Makefile b/devel/p5-Iterator/Makefile
index c2cfb39628c7..c8ca2d3fa750 100644
--- a/devel/p5-Iterator/Makefile
+++ b/devel/p5-Iterator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Iterator
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROODE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile
index f39ebf5f4f85..d5c56c333468 100644
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Java
PORTVERSION= 4.7
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Java
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
diff --git a/devel/p5-Lexical-Alias/Makefile b/devel/p5-Lexical-Alias/Makefile
index 3b98319a9827..3b4c6bcd2ef0 100644
--- a/devel/p5-Lexical-Alias/Makefile
+++ b/devel/p5-Lexical-Alias/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lexical-Alias
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lexical
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Lexical-Persistence/Makefile b/devel/p5-Lexical-Persistence/Makefile
index fc5aeb15dcde..f5b9670b5111 100644
--- a/devel/p5-Lexical-Persistence/Makefile
+++ b/devel/p5-Lexical-Persistence/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Lexical-Persistence
PORTVERSION= 0.97
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Lexical
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-List-Cycle/Makefile b/devel/p5-List-Cycle/Makefile
index 318978a297ff..ac86bb8888c8 100644
--- a/devel/p5-List-Cycle/Makefile
+++ b/devel/p5-List-Cycle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= List-Cycle
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= List
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-List-Group/Makefile b/devel/p5-List-Group/Makefile
index 719c9a1defdc..79f0adb5dbd4 100644
--- a/devel/p5-List-Group/Makefile
+++ b/devel/p5-List-Group/Makefile
@@ -8,8 +8,7 @@
PORTNAME= List-Group
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= List
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tillman@seekingfire.com
diff --git a/devel/p5-Locale-Maketext-Fuzzy/Makefile b/devel/p5-Locale-Maketext-Fuzzy/Makefile
index e8e0b3990e04..7e690537dc83 100644
--- a/devel/p5-Locale-Maketext-Fuzzy/Makefile
+++ b/devel/p5-Locale-Maketext-Fuzzy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-Maketext-Fuzzy
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Locale-Maketext-Simple/Makefile b/devel/p5-Locale-Maketext-Simple/Makefile
index 60a27a6c3231..79c28fd2e276 100644
--- a/devel/p5-Locale-Maketext-Simple/Makefile
+++ b/devel/p5-Locale-Maketext-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-Maketext-Simple
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-Locale-PGetText/Makefile b/devel/p5-Locale-PGetText/Makefile
index 58b39c8b964f..8b6f6861614c 100644
--- a/devel/p5-Locale-PGetText/Makefile
+++ b/devel/p5-Locale-PGetText/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-PGetText
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 23a5936ce93b..bef81bbca7e8 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gettext
PORTVERSION= 1.05
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index 1daea0c822ff..b83698b598f9 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Locale-libintl
PORTVERSION= 1.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= libintl-perl-${PORTVERSION}
diff --git a/devel/p5-LockFile-Simple/Makefile b/devel/p5-LockFile-Simple/Makefile
index 6c4204a954ac..7e86e7d35c4f 100644
--- a/devel/p5-LockFile-Simple/Makefile
+++ b/devel/p5-LockFile-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= LockFile-Simple
PORTVERSION= 0.2.6
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= LockFile
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:R}0${PORTVERSION:E}
diff --git a/devel/p5-Log-Accounting-SVK/Makefile b/devel/p5-Log-Accounting-SVK/Makefile
index 9855e88b0635..fff539509ffc 100644
--- a/devel/p5-Log-Accounting-SVK/Makefile
+++ b/devel/p5-Log-Accounting-SVK/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Log-Accounting-SVK
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/G/GU/GUGOD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile
index 3b3491abc884..23a7ee97973f 100644
--- a/devel/p5-Log-Accounting-SVN/Makefile
+++ b/devel/p5-Log-Accounting-SVN/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Log-Accounting-SVN
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index 210d58af24ce..399eb53d76df 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Log-Agent-Logger
PORTVERSION= 0.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/T/TB/TBONE
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Log-Agent/Makefile b/devel/p5-Log-Agent/Makefile
index 74fa6532affa..5acb4fed81a3 100644
--- a/devel/p5-Log-Agent/Makefile
+++ b/devel/p5-Log-Agent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Agent
PORTVERSION= 0.307
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index 45e6036db1c3..b00ce2078b97 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Dispatch-FileRotate
PORTVERSION= 1.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Log-Dispatch-FileShared/Makefile b/devel/p5-Log-Dispatch-FileShared/Makefile
index bdd8341faeb5..888b6a44dee2 100644
--- a/devel/p5-Log-Dispatch-FileShared/Makefile
+++ b/devel/p5-Log-Dispatch-FileShared/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Dispatch-FileShared
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Log-Dispatch-Perl/Makefile b/devel/p5-Log-Dispatch-Perl/Makefile
index e3aac766887c..f3a32cf44c7a 100644
--- a/devel/p5-Log-Dispatch-Perl/Makefile
+++ b/devel/p5-Log-Dispatch-Perl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Dispatch-Perl
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Log-Message-Simple/Makefile b/devel/p5-Log-Message-Simple/Makefile
index 883452d2c465..7202691cf4d5 100644
--- a/devel/p5-Log-Message-Simple/Makefile
+++ b/devel/p5-Log-Message-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Message-Simple
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Log-Message/Makefile b/devel/p5-Log-Message/Makefile
index 5ca7867e5e3c..ee89cc9634c6 100644
--- a/devel/p5-Log-Message/Makefile
+++ b/devel/p5-Log-Message/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Message
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Log-Report/Makefile b/devel/p5-Log-Report/Makefile
index 612289ba3641..3856d4e2b89b 100644
--- a/devel/p5-Log-Report/Makefile
+++ b/devel/p5-Log-Report/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Report
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Log-Simple/Makefile b/devel/p5-Log-Simple/Makefile
index 75b7ca42bf22..a6b7f71d67b6 100644
--- a/devel/p5-Log-Simple/Makefile
+++ b/devel/p5-Log-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-Simple
PORTVERSION= 1.8
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Log
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Log-TraceMessages/Makefile b/devel/p5-Log-TraceMessages/Makefile
index 8533c4412441..6074c70eeff4 100644
--- a/devel/p5-Log-TraceMessages/Makefile
+++ b/devel/p5-Log-TraceMessages/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Log-TraceMessages
PORTVERSION= 1.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/E/ED/EDAVIS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile
index 545b90f0413e..74aa44c1a6f1 100644
--- a/devel/p5-Luka/Makefile
+++ b/devel/p5-Luka/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Luka
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TP/TPG
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Mac-FileSpec-Unixish/Makefile b/devel/p5-Mac-FileSpec-Unixish/Makefile
index 359e43df6681..c5131f75e9f6 100644
--- a/devel/p5-Mac-FileSpec-Unixish/Makefile
+++ b/devel/p5-Mac-FileSpec-Unixish/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Mac-FileSpec-Unixish
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mac
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Make-Cache/Makefile b/devel/p5-Make-Cache/Makefile
index df2285d50445..76b019dc220a 100644
--- a/devel/p5-Make-Cache/Makefile
+++ b/devel/p5-Make-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Make-Cache
PORTVERSION= 1.043
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Make
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index 91d68c2cec2f..f99305c71d7a 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Make
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Make
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Memoize-ExpireLRU/Makefile b/devel/p5-Memoize-ExpireLRU/Makefile
index d1aa094f0d41..681416b777cd 100644
--- a/devel/p5-Memoize-ExpireLRU/Makefile
+++ b/devel/p5-Memoize-ExpireLRU/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Memoize-ExpireLRU
PORTVERSION= 0.55
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Memoize
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index 80035fd00a92..7aad1d31ca71 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Memoize
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Memoize
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Mknod/Makefile b/devel/p5-Mknod/Makefile
index ee53766ed45e..56a199925d2a 100644
--- a/devel/p5-Mknod/Makefile
+++ b/devel/p5-Mknod/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Mknod
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RL/RLZWART
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Module-Compile/Makefile b/devel/p5-Module-Compile/Makefile
index 33e8b6155925..15953de81cf5 100644
--- a/devel/p5-Module-Compile/Makefile
+++ b/devel/p5-Module-Compile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Compile
PORTVERSION= 0.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/devel/p5-Module-Dependency/Makefile b/devel/p5-Module-Dependency/Makefile
index deb82edf4d6b..120625324c45 100644
--- a/devel/p5-Module-Dependency/Makefile
+++ b/devel/p5-Module-Dependency/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Dependency
PORTVERSION= 1.86
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile
index a97edf2a0a34..1ba2ce8bc331 100644
--- a/devel/p5-Module-Info/Makefile
+++ b/devel/p5-Module-Info/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Info
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/M/MB/MBARBON
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-Module-Pluggable-Fast/Makefile b/devel/p5-Module-Pluggable-Fast/Makefile
index a2ad9d1db6be..ae44d3773fc0 100644
--- a/devel/p5-Module-Pluggable-Fast/Makefile
+++ b/devel/p5-Module-Pluggable-Fast/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Module-Pluggable-Fast
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile
index b0c7cc54374a..593a22fdb8c6 100644
--- a/devel/p5-Module-Release/Makefile
+++ b/devel/p5-Module-Release/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Release
PORTVERSION= 1.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Module-Reload-Sel/Makefile b/devel/p5-Module-Reload-Sel/Makefile
index 4d6420fab1a3..d98c2efdbf59 100644
--- a/devel/p5-Module-Reload-Sel/Makefile
+++ b/devel/p5-Module-Reload-Sel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Reload-Sel
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= simond@irrelevant.org
diff --git a/devel/p5-Module-Reload/Makefile b/devel/p5-Module-Reload/Makefile
index 67da59badc86..644aedd09f57 100644
--- a/devel/p5-Module-Reload/Makefile
+++ b/devel/p5-Module-Reload/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Reload
PORTVERSION= 1.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= andrew@scoop.co.nz
diff --git a/devel/p5-Module-Starter-PBP/Makefile b/devel/p5-Module-Starter-PBP/Makefile
index d2922f0c843d..48063509227f 100644
--- a/devel/p5-Module-Starter-PBP/Makefile
+++ b/devel/p5-Module-Starter-PBP/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Module-Starter-PBP
PORTVERSION= 0.0.3
DISTVERSIONPREFIX= v
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Module-Versions-Report/Makefile b/devel/p5-Module-Versions-Report/Makefile
index a58309872b20..ed47e56ce6a7 100644
--- a/devel/p5-Module-Versions-Report/Makefile
+++ b/devel/p5-Module-Versions-Report/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Module-Versions-Report
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Moose-Policy/Makefile b/devel/p5-Moose-Policy/Makefile
index cfece2c63fa0..e8b6708a0b6d 100644
--- a/devel/p5-Moose-Policy/Makefile
+++ b/devel/p5-Moose-Policy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Moose-Policy
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-MooseX-IOC/Makefile b/devel/p5-MooseX-IOC/Makefile
index 0e8b9a683c95..8fda4cbf0682 100644
--- a/devel/p5-MooseX-IOC/Makefile
+++ b/devel/p5-MooseX-IOC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MooseX-IOC
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STEVAN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile b/devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile
index 6502e668771e..ab3255d3d371 100644
--- a/devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile
+++ b/devel/p5-MooseX-Policy-SemiAffordanceAccessor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MooseX-Policy-SemiAffordanceAccessor
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DR/DROLSKY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile
index d5f63d6ff0b9..49f18cd48d91 100644
--- a/devel/p5-Net-DBus/Makefile
+++ b/devel/p5-Net-DBus/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-DBus
PORTVERSION= 0.33.6
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= novel@FreeBSD.org
diff --git a/devel/p5-Number-Bytes-Human/Makefile b/devel/p5-Number-Bytes-Human/Makefile
index 5ae32465f57b..3eebf84b9afc 100644
--- a/devel/p5-Number-Bytes-Human/Makefile
+++ b/devel/p5-Number-Bytes-Human/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Number-Bytes-Human
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Number
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= madis555@hot.ee
diff --git a/devel/p5-OLE-Storage_Lite/Makefile b/devel/p5-OLE-Storage_Lite/Makefile
index 3aa18d6ccb9a..dc659a4a9dec 100644
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OLE-Storage_Lite
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OLE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-OOTools/Makefile b/devel/p5-OOTools/Makefile
index 6bba20b0e5a3..c7eb4357cd55 100644
--- a/devel/p5-OOTools/Makefile
+++ b/devel/p5-OOTools/Makefile
@@ -8,7 +8,7 @@
PORTNAME= OOTools
PORTVERSION= 2.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DO/DOMIZIO
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-ORBit/Makefile b/devel/p5-ORBit/Makefile
index a73575d8a540..6eef5bd0329d 100644
--- a/devel/p5-ORBit/Makefile
+++ b/devel/p5-ORBit/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ORBit
PORTVERSION= 0.4.7
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/H/HR/HROGERS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= CORBA-ORBit-${PORTVERSION}
diff --git a/devel/p5-Object-Accessor/Makefile b/devel/p5-Object-Accessor/Makefile
index d444ce110cb7..1dd2b98ff057 100644
--- a/devel/p5-Object-Accessor/Makefile
+++ b/devel/p5-Object-Accessor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Accessor
PORTVERSION= 0.32
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Object-Array/Makefile b/devel/p5-Object-Array/Makefile
index df1a498edb8f..de8866b5d397 100644
--- a/devel/p5-Object-Array/Makefile
+++ b/devel/p5-Object-Array/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Array
PORTVERSION= 0.060
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Object-Declare/Makefile b/devel/p5-Object-Declare/Makefile
index da07d0ae75c6..724414e77fc6 100644
--- a/devel/p5-Object-Declare/Makefile
+++ b/devel/p5-Object-Declare/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Declare
PORTVERSION= 0.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Object-Enum/Makefile b/devel/p5-Object-Enum/Makefile
index dcc6645f236f..96e7604d695c 100644
--- a/devel/p5-Object-Enum/Makefile
+++ b/devel/p5-Object-Enum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Enum
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION}0
diff --git a/devel/p5-Object-MultiType/Makefile b/devel/p5-Object-MultiType/Makefile
index 953eb28e0ec7..e2e5f2a96d61 100644
--- a/devel/p5-Object-MultiType/Makefile
+++ b/devel/p5-Object-MultiType/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Object-MultiType
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Object-Signature/Makefile b/devel/p5-Object-Signature/Makefile
index e7856dd39431..c43bf98d1cc2 100644
--- a/devel/p5-Object-Signature/Makefile
+++ b/devel/p5-Object-Signature/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Object-Signature
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Object
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-P4-Client/Makefile b/devel/p5-P4-Client/Makefile
index c60b011005ee..60873dd32c8c 100644
--- a/devel/p5-P4-Client/Makefile
+++ b/devel/p5-P4-Client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= P4-Client
PORTVERSION= 2.4319
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= P4
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-P4/Makefile b/devel/p5-P4/Makefile
index e7c64cd03aeb..ebc8519b1234 100644
--- a/devel/p5-P4/Makefile
+++ b/devel/p5-P4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= P4
PORTVERSION= 1.4320
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= P4
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-PAR-Dist/Makefile b/devel/p5-PAR-Dist/Makefile
index e8041e31e8cd..08e49a6b9879 100644
--- a/devel/p5-PAR-Dist/Makefile
+++ b/devel/p5-PAR-Dist/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PAR-Dist
PORTVERSION= 0.29
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PAR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-PAR-Packer/Makefile b/devel/p5-PAR-Packer/Makefile
index b41de1d51848..b73f1e88cd95 100644
--- a/devel/p5-PAR-Packer/Makefile
+++ b/devel/p5-PAR-Packer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PAR-Packer
PORTVERSION= 0.97.8
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PAR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index 12859a73f8b2..9c2ccd16304d 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PAR
PORTVERSION= 0.97.7
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PAR
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index 22100d77b8bb..6539694de868 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-API-Hooks
PORTVERSION= 1.0500
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SU/SUNGO
+MASTER_SITES= CPAN
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index b9b2d52d0e1e..d9aa7151def7 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -9,8 +9,7 @@ PORTNAME= POE-API-Peek
PORTVERSION= 1.0802
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/SU/SUNGO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-POE-Component-Child/Makefile b/devel/p5-POE-Component-Child/Makefile
index 0bd923baf0c9..7decfbd8ba3d 100644
--- a/devel/p5-POE-Component-Child/Makefile
+++ b/devel/p5-POE-Component-Child/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Child
PORTVERSION= 1.39
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-POE-Component-Daemon/Makefile b/devel/p5-POE-Component-Daemon/Makefile
index 3ff052637d7f..def5801f616a 100644
--- a/devel/p5-POE-Component-Daemon/Makefile
+++ b/devel/p5-POE-Component-Daemon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Daemon
PORTVERSION= 0.1006
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index 3a71e411bc08..2b3e54d086eb 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-DebugShell
PORTVERSION= 1.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index ca7ad1c4776d..66e1be9d0cb3 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-DirWatch
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-IKC/Makefile b/devel/p5-POE-Component-IKC/Makefile
index cdb380b91209..6e6e6e89da29 100644
--- a/devel/p5-POE-Component-IKC/Makefile
+++ b/devel/p5-POE-Component-IKC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-IKC
PORTVERSION= 0.1904
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-POE-Component-JobQueue/Makefile b/devel/p5-POE-Component-JobQueue/Makefile
index 191c169f7984..aa294caa5ce6 100644
--- a/devel/p5-POE-Component-JobQueue/Makefile
+++ b/devel/p5-POE-Component-JobQueue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-JobQueue
PORTVERSION= 0.5500
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index e9fb1bddac60..70454518b622 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Logger
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-RSS/Makefile b/devel/p5-POE-Component-RSS/Makefile
index 3a25e765f2cf..cabc758b1968 100644
--- a/devel/p5-POE-Component-RSS/Makefile
+++ b/devel/p5-POE-Component-RSS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-RSS
PORTVERSION= 0.08
CATEGORIES= devel perl5 textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-RSSAggregator/Makefile b/devel/p5-POE-Component-RSSAggregator/Makefile
index 5342e9155ccb..3fc9a0ae305a 100644
--- a/devel/p5-POE-Component-RSSAggregator/Makefile
+++ b/devel/p5-POE-Component-RSSAggregator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-RSSAggregator
PORTVERSION= 1.02.2
CATEGORIES= devel perl5 textproc
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
diff --git a/devel/p5-POE-Component-Server-XMLRPC/Makefile b/devel/p5-POE-Component-Server-XMLRPC/Makefile
index b7c3b46ab0ae..367263e23276 100644
--- a/devel/p5-POE-Component-Server-XMLRPC/Makefile
+++ b/devel/p5-POE-Component-Server-XMLRPC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-Server-XMLRPC
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jesper@jdn.dk
diff --git a/devel/p5-POE-Component-TSTP/Makefile b/devel/p5-POE-Component-TSTP/Makefile
index ccd488286263..af485c830934 100644
--- a/devel/p5-POE-Component-TSTP/Makefile
+++ b/devel/p5-POE-Component-TSTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-TSTP
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index edf73b58bf07..dc5215d14044 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Devel-Profiler
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Exceptions/Makefile b/devel/p5-POE-Exceptions/Makefile
index d52d53a262d6..50ba0cef4fc0 100644
--- a/devel/p5-POE-Exceptions/Makefile
+++ b/devel/p5-POE-Exceptions/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Exceptions
PORTVERSION= 0.0502
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Session-MultiDispatch/Makefile b/devel/p5-POE-Session-MultiDispatch/Makefile
index cf89e8dad1e9..72c2dd56cf8b 100644
--- a/devel/p5-POE-Session-MultiDispatch/Makefile
+++ b/devel/p5-POE-Session-MultiDispatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Session-MultiDispatch
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POE-Stage/Makefile b/devel/p5-POE-Stage/Makefile
index 6e5570645645..e9b87092bf48 100644
--- a/devel/p5-POE-Stage/Makefile
+++ b/devel/p5-POE-Stage/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Stage
PORTVERSION= 0.0300
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RC/RCAPUTO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.03
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index ddaab9af3357..952b3c917c98 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE
PORTVERSION= 0.9999
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-POSIX-strptime/Makefile b/devel/p5-POSIX-strptime/Makefile
index 0230b6c6fbff..1ba5235668ba 100644
--- a/devel/p5-POSIX-strptime/Makefile
+++ b/devel/p5-POSIX-strptime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POSIX-strptime
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= POSIX
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= douglas@douglasthrift.net
diff --git a/devel/p5-PPerl/Makefile b/devel/p5-PPerl/Makefile
index 5fd9b33fbbd1..e229e829d313 100644
--- a/devel/p5-PPerl/Makefile
+++ b/devel/p5-PPerl/Makefile
@@ -10,7 +10,7 @@ PORTNAME= PPerl
PORTVERSION= 0.25
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/M/MS/MSERGEANT
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 18fae9d182b6..e2641a984d53 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PV
PORTVERSION= 1.5
CATEGORIES= devel net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PV
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= PerlVision-${PORTVERSION}
diff --git a/devel/p5-Package-Constants/Makefile b/devel/p5-Package-Constants/Makefile
index e3e6e09efb8a..63b12902121a 100644
--- a/devel/p5-Package-Constants/Makefile
+++ b/devel/p5-Package-Constants/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Package-Constants
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/K/KA/KANE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-PadWalker/Makefile b/devel/p5-PadWalker/Makefile
index dcdd05b77b96..7f972ff60551 100644
--- a/devel/p5-PadWalker/Makefile
+++ b/devel/p5-PadWalker/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PadWalker
PORTVERSION= 1.7
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROBIN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Parallel-ForkManager/Makefile b/devel/p5-Parallel-ForkManager/Makefile
index 4436a2c6a02f..37c20f4fed64 100644
--- a/devel/p5-Parallel-ForkManager/Makefile
+++ b/devel/p5-Parallel-ForkManager/Makefile
@@ -7,9 +7,8 @@
PORTNAME= Parallel-ForkManager
PORTVERSION= 0.7.5
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://hacks.dlux.hu/Parallel-ForkManager/download/
-MASTER_SITE_SUBDIR= Parallel
PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
diff --git a/devel/p5-Params-CallbackRequest/Makefile b/devel/p5-Params-CallbackRequest/Makefile
index d95374039d28..57280c66f7b5 100644
--- a/devel/p5-Params-CallbackRequest/Makefile
+++ b/devel/p5-Params-CallbackRequest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Params-CallbackRequest
PORTVERSION= 1.17
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Params/DWHEELER
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Params-Coerce/Makefile b/devel/p5-Params-Coerce/Makefile
index f4d3ad7eb5f9..36d1c7045422 100644
--- a/devel/p5-Params-Coerce/Makefile
+++ b/devel/p5-Params-Coerce/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Params-Coerce
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Params
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index 64e01b04ba6b..6cf6089be662 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Params-Validate
PORTVERSION= 0.89
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel/DROLSKY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= dsh@vlink.ru
diff --git a/devel/p5-Parse-PerlConfig/Makefile b/devel/p5-Parse-PerlConfig/Makefile
index 414080c52f61..0311bf9299e3 100644
--- a/devel/p5-Parse-PerlConfig/Makefile
+++ b/devel/p5-Parse-PerlConfig/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Parse-PerlConfig
PORTVERSION= 0.05
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pedersen@meridian-enviro.com
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index fb60785b4f2c..9e15d05efa20 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Parse-RecDescent
PORTVERSION= 1.95.1
DISTVERSIONPREFIX= v
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Parse-Yapp/Makefile b/devel/p5-Parse-Yapp/Makefile
index 44170984e8c3..40dbf3e16d73 100644
--- a/devel/p5-Parse-Yapp/Makefile
+++ b/devel/p5-Parse-Yapp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Parse-Yapp
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lyngbol@wheel.dk
diff --git a/devel/p5-ParseLex/Makefile b/devel/p5-ParseLex/Makefile
index 7ddffa368e51..b71384bb3e9e 100644
--- a/devel/p5-ParseLex/Makefile
+++ b/devel/p5-ParseLex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ParseLex
PORTVERSION= 2.15
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Parse
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@freebsd.org
diff --git a/devel/p5-PatchReader/Makefile b/devel/p5-PatchReader/Makefile
index d897b56a6f39..3ff90378da96 100644
--- a/devel/p5-PatchReader/Makefile
+++ b/devel/p5-PatchReader/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PatchReader
PORTVERSION= 0.9.5
CATEGORIES= devel perl5
-MASTER_SITES=${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/J/JK/JKEISER
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Path-Class/Makefile b/devel/p5-Path-Class/Makefile
index c33f52c0ae12..9f3f43f54867 100644
--- a/devel/p5-Path-Class/Makefile
+++ b/devel/p5-Path-Class/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Path-Class
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/K/KW/KWILLIAMS/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/K/KW/KWILLIAMS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Penguin-Easy/Makefile b/devel/p5-Penguin-Easy/Makefile
index fad365b65cf7..a207b7583291 100644
--- a/devel/p5-Penguin-Easy/Makefile
+++ b/devel/p5-Penguin-Easy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Penguin-Easy
PORTVERSION= 1.1
CATEGORIES= devel security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Penguin
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Penguin/Makefile b/devel/p5-Penguin/Makefile
index 8ec19966aecc..f05ae5d3a63f 100644
--- a/devel/p5-Penguin/Makefile
+++ b/devel/p5-Penguin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Penguin
PORTVERSION= 3.00
CATEGORIES= devel security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Penguin
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Perl6-Builtins/Makefile b/devel/p5-Perl6-Builtins/Makefile
index 222dd931d05a..00dffcc14ee2 100644
--- a/devel/p5-Perl6-Builtins/Makefile
+++ b/devel/p5-Perl6-Builtins/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Builtins
PORTVERSION= 0.0.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Perl6
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Perl6-Export-Attrs/Makefile b/devel/p5-Perl6-Export-Attrs/Makefile
index 336711d1294c..041109fe2fb7 100644
--- a/devel/p5-Perl6-Export-Attrs/Makefile
+++ b/devel/p5-Perl6-Export-Attrs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Export-Attrs
PORTVERSION= 0.0.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Perl6
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Perl6-Export/Makefile b/devel/p5-Perl6-Export/Makefile
index 1a0c22d16618..79ec28d49775 100644
--- a/devel/p5-Perl6-Export/Makefile
+++ b/devel/p5-Perl6-Export/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Export
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Perl6-Form/Makefile b/devel/p5-Perl6-Form/Makefile
index 4ef582812cec..790d5c127d1a 100644
--- a/devel/p5-Perl6-Form/Makefile
+++ b/devel/p5-Perl6-Form/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Form
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-Perl6-Rules/Makefile b/devel/p5-Perl6-Rules/Makefile
index 551f82785c2a..c56bbfad2cb9 100644
--- a/devel/p5-Perl6-Rules/Makefile
+++ b/devel/p5-Perl6-Rules/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Perl6-Rules
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Perl6
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-PerlIO-eol/Makefile b/devel/p5-PerlIO-eol/Makefile
index a7e507ae065b..847f96953695 100644
--- a/devel/p5-PerlIO-eol/Makefile
+++ b/devel/p5-PerlIO-eol/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-eol
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-PerlIO-via-MD5/Makefile b/devel/p5-PerlIO-via-MD5/Makefile
index 0dd91567941c..e0e894d9bdeb 100644
--- a/devel/p5-PerlIO-via-MD5/Makefile
+++ b/devel/p5-PerlIO-via-MD5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-via-MD5
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-PerlIO-via-dynamic/Makefile b/devel/p5-PerlIO-via-dynamic/Makefile
index 4620e0beeb65..0c24c6cb73fb 100644
--- a/devel/p5-PerlIO-via-dynamic/Makefile
+++ b/devel/p5-PerlIO-via-dynamic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-via-dynamic
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-PerlIO-via-symlink/Makefile b/devel/p5-PerlIO-via-symlink/Makefile
index 5e8f9b520f91..b426cccae9b8 100644
--- a/devel/p5-PerlIO-via-symlink/Makefile
+++ b/devel/p5-PerlIO-via-symlink/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PerlIO-via-symlink
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PerlIO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-PerlMenu/Makefile b/devel/p5-PerlMenu/Makefile
index c90228eb3bda..1a724b1dd3cb 100644
--- a/devel/p5-PerlMenu/Makefile
+++ b/devel/p5-PerlMenu/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PerlMenu
PORTVERSION= 4.0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/SK/SKUNZ
PKGNAMEPREFIX= p5-
DISTNAME= perlmenu.v4.0
diff --git a/devel/p5-Pipeline/Makefile b/devel/p5-Pipeline/Makefile
index a0a6e866f8c0..7cd77b838bdf 100644
--- a/devel/p5-Pipeline/Makefile
+++ b/devel/p5-Pipeline/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Pipeline
PORTVERSION= 3.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RC/RCLAMP
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Pod-Tests/Makefile b/devel/p5-Pod-Tests/Makefile
index e5d0c271b317..dbb29788275c 100644
--- a/devel/p5-Pod-Tests/Makefile
+++ b/devel/p5-Pod-Tests/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Pod-Tests
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Proc-Background/Makefile b/devel/p5-Proc-Background/Makefile
index f7ab8ce9538e..f72eaedf8e28 100644
--- a/devel/p5-Proc-Background/Makefile
+++ b/devel/p5-Proc-Background/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Background
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index f4f0efaaf880..5ff245b8cdb1 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Daemon
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Proc-Fork/Makefile b/devel/p5-Proc-Fork/Makefile
index 3bd2491ca525..ccb1d1f09c50 100644
--- a/devel/p5-Proc-Fork/Makefile
+++ b/devel/p5-Proc-Fork/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Fork
PORTVERSION= 0.61
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0$//}
diff --git a/devel/p5-Proc-PID-File/Makefile b/devel/p5-Proc-PID-File/Makefile
index 5fcf48541567..3147fc7db7ea 100644
--- a/devel/p5-Proc-PID-File/Makefile
+++ b/devel/p5-Proc-PID-File/Makefile
@@ -7,8 +7,7 @@
PORTNAME= Proc-PID-File
PORTVERSION= 1.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Proc-PIDFile/Makefile b/devel/p5-Proc-PIDFile/Makefile
index 3ae11f143621..952375b4f6b0 100644
--- a/devel/p5-Proc-PIDFile/Makefile
+++ b/devel/p5-Proc-PIDFile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-PIDFile
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Proc-PID_File-${PORTVERSION}
diff --git a/devel/p5-Proc-ProcessTable/Makefile b/devel/p5-Proc-ProcessTable/Makefile
index 2e005816556d..bd34073efc0d 100644
--- a/devel/p5-Proc-ProcessTable/Makefile
+++ b/devel/p5-Proc-ProcessTable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-ProcessTable
PORTVERSION= 0.42
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Proc-Queue/Makefile b/devel/p5-Proc-Queue/Makefile
index 7445be7e8fb9..e526a4788686 100644
--- a/devel/p5-Proc-Queue/Makefile
+++ b/devel/p5-Proc-Queue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Queue
PORTVERSION= 1.23
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Proc-Reliable/Makefile b/devel/p5-Proc-Reliable/Makefile
index 3ba94e8ba672..2bf496208a59 100644
--- a/devel/p5-Proc-Reliable/Makefile
+++ b/devel/p5-Proc-Reliable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Proc-Reliable
PORTVERSION= 1.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Proc
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index f9b98536fb4b..628f1489a87a 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Project-Gantt
PORTVERSION= 1.03
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AW/AWESTHOLM
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile
index f4899baa2762..2746707b1575 100644
--- a/devel/p5-RRDTool-OO/Makefile
+++ b/devel/p5-RRDTool-OO/Makefile
@@ -8,8 +8,7 @@
PORTNAME= RRDTool-OO
PORTVERSION= 0.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/M/MS/MSCHILLI
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= stefan@fh-mainz.de
diff --git a/devel/p5-Rcs/Makefile b/devel/p5-Rcs/Makefile
index a1bfbf31fd46..6769c9ba45ea 100644
--- a/devel/p5-Rcs/Makefile
+++ b/devel/p5-Rcs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Rcs
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Rcs
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index ed2d6c683922..d53ec404af30 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ReadLine-Gnu
PORTVERSION= 1.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index b32cfbfdaf6c..05f7286e96ac 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ReadLine-Perl
PORTVERSION= 1.0302
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-Readonly/Makefile b/devel/p5-Readonly/Makefile
index 52cdfa26bc3f..f209bda91ac1 100644
--- a/devel/p5-Readonly/Makefile
+++ b/devel/p5-Readonly/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Readonly
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROODE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-XS-${PORTVERSION_XS}${EXTRACT_SUFX}
diff --git a/devel/p5-Regexp-Assemble/Makefile b/devel/p5-Regexp-Assemble/Makefile
index ef69152ee299..8df274e9ccc8 100644
--- a/devel/p5-Regexp-Assemble/Makefile
+++ b/devel/p5-Regexp-Assemble/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-Assemble
PORTVERSION= 0.32
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Regexp-Bind/Makefile b/devel/p5-Regexp-Bind/Makefile
index 38192e622d8c..4150d51deb43 100644
--- a/devel/p5-Regexp-Bind/Makefile
+++ b/devel/p5-Regexp-Bind/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Regexp-Bind
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Regexp-Shellish/Makefile b/devel/p5-Regexp-Shellish/Makefile
index a38577b9b494..a2de15e6537f 100644
--- a/devel/p5-Regexp-Shellish/Makefile
+++ b/devel/p5-Regexp-Shellish/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Regexp-Shellish
PORTVERSION= 0.93
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Regexp
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index 417d5ee60aa5..1625917b6526 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Religion
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Religion
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-ResourcePool/Makefile b/devel/p5-ResourcePool/Makefile
index ae853ba95c4e..428b9e8f66d7 100644
--- a/devel/p5-ResourcePool/Makefile
+++ b/devel/p5-ResourcePool/Makefile
@@ -9,7 +9,7 @@
PORTNAME= ResourcePool
PORTVERSION= 1.0104
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://www.fatalmind.com/projects/ResourcePool/
MASTER_SITE_SUBDIR= ../by-authors/id/M/MW/MWS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index aacdbd97d711..898adf140b70 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Resources
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Resources
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-Return-Value/Makefile b/devel/p5-Return-Value/Makefile
index 61e3de9b5fea..1128fb209c49 100644
--- a/devel/p5-Return-Value/Makefile
+++ b/devel/p5-Return-Value/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Return-Value
PORTVERSION= 1.302
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RJ/RJBS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Rose-DateTime/Makefile b/devel/p5-Rose-DateTime/Makefile
index 89f02c8b3e1c..9ecf8a79d665 100644
--- a/devel/p5-Rose-DateTime/Makefile
+++ b/devel/p5-Rose-DateTime/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Rose-DateTime
PORTVERSION= 0.532
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Rose
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Rose-Object/Makefile b/devel/p5-Rose-Object/Makefile
index dd9adf5f7e90..c0fca9c0693c 100644
--- a/devel/p5-Rose-Object/Makefile
+++ b/devel/p5-Rose-Object/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Rose-Object
PORTVERSION= 0.840
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Rose
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0+$//}
diff --git a/devel/p5-RunApp/Makefile b/devel/p5-RunApp/Makefile
index ad9073f1285b..9e28a0ce1a56 100644
--- a/devel/p5-RunApp/Makefile
+++ b/devel/p5-RunApp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= RunApp
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-SNMP-Persist/Makefile b/devel/p5-SNMP-Persist/Makefile
index 4984e87c9bac..9b4df4d4481f 100644
--- a/devel/p5-SNMP-Persist/Makefile
+++ b/devel/p5-SNMP-Persist/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SNMP-Persist
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SNMP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jadawin@FreeBSD.org
diff --git a/devel/p5-SPOPS/Makefile b/devel/p5-SPOPS/Makefile
index 21df3c08990c..6469b6799b13 100644
--- a/devel/p5-SPOPS/Makefile
+++ b/devel/p5-SPOPS/Makefile
@@ -8,7 +8,7 @@
PORTNAME= SPOPS
PORTVERSION= 0.87
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/C/CW/CWINTERS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-SVN-ACL/Makefile b/devel/p5-SVN-ACL/Makefile
index c359b643099f..8971bd58c244 100644
--- a/devel/p5-SVN-ACL/Makefile
+++ b/devel/p5-SVN-ACL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-ACL
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-SVN-Access/Makefile b/devel/p5-SVN-Access/Makefile
index bca5d0184182..a705aa157468 100644
--- a/devel/p5-SVN-Access/Makefile
+++ b/devel/p5-SVN-Access/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Access
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= glarkin@sourcehosting.net
diff --git a/devel/p5-SVN-Agent/Makefile b/devel/p5-SVN-Agent/Makefile
index 8a4e9e4a2a57..591b3f0d55bc 100644
--- a/devel/p5-SVN-Agent/Makefile
+++ b/devel/p5-SVN-Agent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Agent
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-SVN-Log/Makefile b/devel/p5-SVN-Log/Makefile
index 17235a35a98c..f8cf95174fa5 100644
--- a/devel/p5-SVN-Log/Makefile
+++ b/devel/p5-SVN-Log/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Log
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-SVN-Mirror/Makefile b/devel/p5-SVN-Mirror/Makefile
index bacf124993f3..df00c47fecb5 100644
--- a/devel/p5-SVN-Mirror/Makefile
+++ b/devel/p5-SVN-Mirror/Makefile
@@ -9,8 +9,7 @@ PORTNAME= SVN-Mirror
PORTVERSION= 0.73
PORTREVISION= 0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-SVN-S4/Makefile b/devel/p5-SVN-S4/Makefile
index 1d5c9fac2cfa..164caf3211ff 100644
--- a/devel/p5-SVN-S4/Makefile
+++ b/devel/p5-SVN-S4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= SVN-S4
PORTVERSION= 1.022
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-SVN-Simple/Makefile b/devel/p5-SVN-Simple/Makefile
index 7698ba7a46a9..277a7e86c6cd 100644
--- a/devel/p5-SVN-Simple/Makefile
+++ b/devel/p5-SVN-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Simple
PORTVERSION= 0.27
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-SVN-Statistics/Makefile b/devel/p5-SVN-Statistics/Makefile
index b7596b824d84..ea70425ad930 100644
--- a/devel/p5-SVN-Statistics/Makefile
+++ b/devel/p5-SVN-Statistics/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Statistics
PORTVERSION= 0.041
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ychsiao@ychsiao.org
diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile
index edc27fe15370..2728126c9307 100644
--- a/devel/p5-SVN-Web/Makefile
+++ b/devel/p5-SVN-Web/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SVN-Web
PORTVERSION= 0.53
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SVN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/0$//}
diff --git a/devel/p5-Scalar-Listify/Makefile b/devel/p5-Scalar-Listify/Makefile
index fd2f2e526794..78fcb398fd0e 100644
--- a/devel/p5-Scalar-Listify/Makefile
+++ b/devel/p5-Scalar-Listify/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Scalar-Listify
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Scalar
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/p5-Scalar-Util-Clone/Makefile b/devel/p5-Scalar-Util-Clone/Makefile
index e628afeca8b5..d8aea7563db5 100644
--- a/devel/p5-Scalar-Util-Clone/Makefile
+++ b/devel/p5-Scalar-Util-Clone/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Scalar-Util-Clone
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Scalar
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Scope-Guard/Makefile b/devel/p5-Scope-Guard/Makefile
index 11aa8d5ed0d9..59cbe3361220 100644
--- a/devel/p5-Scope-Guard/Makefile
+++ b/devel/p5-Scope-Guard/Makefile
@@ -8,9 +8,8 @@
PORTNAME= Scope-Guard
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-#MASTER_SITE_SUBDIR= Scope
-MASTER_SITE_SUBDIR= ../by-authors/id/C/CH/CHOCOLATE
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../by-authors/id/C/CH/CHOCOLATE
PKGNAMEPREFIX= p5-
MAINTAINER= cmanley@xs4all.nl
diff --git a/devel/p5-Search-Binary/Makefile b/devel/p5-Search-Binary/Makefile
index 0577e385e2bd..f2709e7c238b 100644
--- a/devel/p5-Search-Binary/Makefile
+++ b/devel/p5-Search-Binary/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Search-Binary
PORTVERSION= 0.95
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Search
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Set-Array/Makefile b/devel/p5-Set-Array/Makefile
index 28d07b8b5788..9c57c398e3bf 100644
--- a/devel/p5-Set-Array/Makefile
+++ b/devel/p5-Set-Array/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-Array
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RS/RSAVAGE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/devel/p5-Set-NestedGroups/Makefile b/devel/p5-Set-NestedGroups/Makefile
index 9b82e467b10a..f6d9c07b491a 100644
--- a/devel/p5-Set-NestedGroups/Makefile
+++ b/devel/p5-Set-NestedGroups/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-NestedGroups
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Set
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Set-Scalar/Makefile b/devel/p5-Set-Scalar/Makefile
index d4a2d17aa338..f675214fa847 100644
--- a/devel/p5-Set-Scalar/Makefile
+++ b/devel/p5-Set-Scalar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Set-Scalar
PORTVERSION= 1.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Set
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Shell-Base/Makefile b/devel/p5-Shell-Base/Makefile
index 7d08c268e44c..4f70009764cb 100644
--- a/devel/p5-Shell-Base/Makefile
+++ b/devel/p5-Shell-Base/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Shell-Base
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Shell
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= boumenot@gmail.com
diff --git a/devel/p5-Shell-EnvImporter/Makefile b/devel/p5-Shell-EnvImporter/Makefile
index 7bda753d45c9..affcd6a11138 100644
--- a/devel/p5-Shell-EnvImporter/Makefile
+++ b/devel/p5-Shell-EnvImporter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Shell-EnvImporter
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Shell
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mhjacks@swbell.net
diff --git a/devel/p5-Shell-Parser/Makefile b/devel/p5-Shell-Parser/Makefile
index 1817dadf5ee3..9d9f4e1efbc5 100644
--- a/devel/p5-Shell-Parser/Makefile
+++ b/devel/p5-Shell-Parser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Shell-Parser
PORTVERSION= 0.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Shell
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Shell-Source/Makefile b/devel/p5-Shell-Source/Makefile
index e5529713e5be..bef33c5f47a9 100644
--- a/devel/p5-Shell-Source/Makefile
+++ b/devel/p5-Shell-Source/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Shell-Source
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Shell
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= timur@FreeBSD.org
diff --git a/devel/p5-Smart-Comments/Makefile b/devel/p5-Smart-Comments/Makefile
index 27dd7bb5b53e..0f8546539d33 100644
--- a/devel/p5-Smart-Comments/Makefile
+++ b/devel/p5-Smart-Comments/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Smart-Comments
PORTVERSION= 1.0.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/D/DC/DCONWAY
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/devel/p5-Sort-Array/Makefile b/devel/p5-Sort-Array/Makefile
index 4f850bea669e..aff046950e6c 100644
--- a/devel/p5-Sort-Array/Makefile
+++ b/devel/p5-Sort-Array/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Array
DISTVERSION= 0.26
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/devel/p5-Sort-ArrayOfArrays/Makefile b/devel/p5-Sort-ArrayOfArrays/Makefile
index 22edf8008046..15968a2486e9 100644
--- a/devel/p5-Sort-ArrayOfArrays/Makefile
+++ b/devel/p5-Sort-ArrayOfArrays/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-ArrayOfArrays
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Sort-Key-DateTime/Makefile b/devel/p5-Sort-Key-DateTime/Makefile
index eb63733ff32e..8ff0f2799c9c 100644
--- a/devel/p5-Sort-Key-DateTime/Makefile
+++ b/devel/p5-Sort-Key-DateTime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Key-DateTime
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Sort-Key/Makefile b/devel/p5-Sort-Key/Makefile
index d5a652774bdd..998ceee9f05d 100644
--- a/devel/p5-Sort-Key/Makefile
+++ b/devel/p5-Sort-Key/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Key
PORTVERSION= 1.28
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Sort-Tree/Makefile b/devel/p5-Sort-Tree/Makefile
index e3b52aedad71..de63857f7ebb 100644
--- a/devel/p5-Sort-Tree/Makefile
+++ b/devel/p5-Sort-Tree/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Tree
PORTVERSION= 1.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Sort-Versions/Makefile b/devel/p5-Sort-Versions/Makefile
index e1e168c013ba..1d5f0bab9ace 100644
--- a/devel/p5-Sort-Versions/Makefile
+++ b/devel/p5-Sort-Versions/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sort-Versions
PORTVERSION= 1.5
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sort
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Spiffy/Makefile b/devel/p5-Spiffy/Makefile
index dc4cb8cf0416..71cd6d848640 100644
--- a/devel/p5-Spiffy/Makefile
+++ b/devel/p5-Spiffy/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Spiffy
PORTVERSION= 0.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index 0f9f2b68fab5..378b8641d57c 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Spoon
PORTVERSION= 0.24
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/I/IN/INGY
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 6aba0b477146..6b5a4063542a 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Storable
PORTVERSION= 2.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Storable
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Stream/Makefile b/devel/p5-Stream/Makefile
index 51ed9268953e..115519fdcd57 100644
--- a/devel/p5-Stream/Makefile
+++ b/devel/p5-Stream/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Stream
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GARY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-String-Approx/Makefile b/devel/p5-String-Approx/Makefile
index 8f7b091bcd50..ebd89a8ae20a 100644
--- a/devel/p5-String-Approx/Makefile
+++ b/devel/p5-String-Approx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= String-Approx
PORTVERSION= 3.26
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-String-CRC32/Makefile b/devel/p5-String-CRC32/Makefile
index 30bd26f64e8a..ef387383777f 100644
--- a/devel/p5-String-CRC32/Makefile
+++ b/devel/p5-String-CRC32/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-CRC32
PORTVERSION= 1.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index 10b9b4f85981..fb058d1c2ca3 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Checker
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-String-LRC/Makefile b/devel/p5-String-LRC/Makefile
index 4996948e9f06..809e3b376ffb 100644
--- a/devel/p5-String-LRC/Makefile
+++ b/devel/p5-String-LRC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-LRC
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-String-Parity/Makefile b/devel/p5-String-Parity/Makefile
index 8362c7cf3d6e..5b7b3b9ee5d1 100644
--- a/devel/p5-String-Parity/Makefile
+++ b/devel/p5-String-Parity/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Parity
PORTVERSION= 1.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-String-Random/Makefile b/devel/p5-String-Random/Makefile
index 11640f50af01..807f20d8e6c2 100644
--- a/devel/p5-String-Random/Makefile
+++ b/devel/p5-String-Random/Makefile
@@ -9,8 +9,7 @@ PORTNAME= String-Random
PORTVERSION= 0.22
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-String-RexxParse/Makefile b/devel/p5-String-RexxParse/Makefile
index c81d21400ddf..718549fd7889 100644
--- a/devel/p5-String-RexxParse/Makefile
+++ b/devel/p5-String-RexxParse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-RexxParse
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-String-Similarity/Makefile b/devel/p5-String-Similarity/Makefile
index ca19e3c4e503..17052f3ed9a6 100644
--- a/devel/p5-String-Similarity/Makefile
+++ b/devel/p5-String-Similarity/Makefile
@@ -8,8 +8,7 @@
PORTNAME= String-Similarity
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= String
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kevlo@FreeBSD.org
diff --git a/devel/p5-Sub-Installer/Makefile b/devel/p5-Sub-Installer/Makefile
index ca6d1bcfa706..76cd636edf5a 100644
--- a/devel/p5-Sub-Installer/Makefile
+++ b/devel/p5-Sub-Installer/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sub-Installer
PORTVERSION= 0.0.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sub
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/devel/p5-Sub-Name/Makefile b/devel/p5-Sub-Name/Makefile
index 3e05d9f90640..9533a905a101 100644
--- a/devel/p5-Sub-Name/Makefile
+++ b/devel/p5-Sub-Name/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sub-Name
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sub
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Sub-Override/Makefile b/devel/p5-Sub-Override/Makefile
index b881f4e40eac..d5264e9d6ffa 100644
--- a/devel/p5-Sub-Override/Makefile
+++ b/devel/p5-Sub-Override/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sub-Override
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sub
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lars.eggert@gmx.net
diff --git a/devel/p5-Sub-WrapPackages/Makefile b/devel/p5-Sub-WrapPackages/Makefile
index b62382401d7d..323cca195e6b 100644
--- a/devel/p5-Sub-WrapPackages/Makefile
+++ b/devel/p5-Sub-WrapPackages/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sub-WrapPackages
PORTVERSION= 1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sub
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hartzell@alerce.com
diff --git a/devel/p5-Sys-Mmap/Makefile b/devel/p5-Sys-Mmap/Makefile
index f1416af938d6..09a66846dbda 100644
--- a/devel/p5-Sys-Mmap/Makefile
+++ b/devel/p5-Sys-Mmap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-Mmap
PORTVERSION= 0.13
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Sys-Sig/Makefile b/devel/p5-Sys-Sig/Makefile
index db73ccfe7f39..3cf5311214c9 100644
--- a/devel/p5-Sys-Sig/Makefile
+++ b/devel/p5-Sys-Sig/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-Sig
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Sys-SigAction/Makefile b/devel/p5-Sys-SigAction/Makefile
index 021e0a85c80f..2d8afe819ff1 100644
--- a/devel/p5-Sys-SigAction/Makefile
+++ b/devel/p5-Sys-SigAction/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Sys-SigAction
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Sys
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= svysh@cryptocom.ru
diff --git a/devel/p5-System2/Makefile b/devel/p5-System2/Makefile
index 83ceb8eba385..4b01a980f529 100644
--- a/devel/p5-System2/Makefile
+++ b/devel/p5-System2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= System2
PORTVERSION= 0.84
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= System2
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Taint-Runtime/Makefile b/devel/p5-Taint-Runtime/Makefile
index 651e550db052..19bf6094a4f3 100644
--- a/devel/p5-Taint-Runtime/Makefile
+++ b/devel/p5-Taint-Runtime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Taint-Runtime
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Taint
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-ANSIColor/Makefile b/devel/p5-Term-ANSIColor/Makefile
index dfb30bb70475..1d0c6118ad02 100644
--- a/devel/p5-Term-ANSIColor/Makefile
+++ b/devel/p5-Term-ANSIColor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ANSIColor
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ANSIColor-${PORTVERSION}
diff --git a/devel/p5-Term-ANSIScreen/Makefile b/devel/p5-Term-ANSIScreen/Makefile
index 9c3f4b805614..73b54e4e84d6 100644
--- a/devel/p5-Term-ANSIScreen/Makefile
+++ b/devel/p5-Term-ANSIScreen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ANSIScreen
PORTVERSION= 1.42
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Term-Animation/Makefile b/devel/p5-Term-Animation/Makefile
index f00afe919229..d318d4c7552f 100644
--- a/devel/p5-Term-Animation/Makefile
+++ b/devel/p5-Term-Animation/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Animation
PORTVERSION= 2.4
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fjoe@FreeBSD.org
diff --git a/devel/p5-Term-CallEditor/Makefile b/devel/p5-Term-CallEditor/Makefile
index 2934ece00840..c3092608e44d 100644
--- a/devel/p5-Term-CallEditor/Makefile
+++ b/devel/p5-Term-CallEditor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-CallEditor
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-Encoding/Makefile b/devel/p5-Term-Encoding/Makefile
index 64221ad36384..ef7559515ab6 100644
--- a/devel/p5-Term-Encoding/Makefile
+++ b/devel/p5-Term-Encoding/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Encoding
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Term-ProgressBar/Makefile b/devel/p5-Term-ProgressBar/Makefile
index 8f295f91c6dd..cb8c3391b1ce 100644
--- a/devel/p5-Term-ProgressBar/Makefile
+++ b/devel/p5-Term-ProgressBar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ProgressBar
PORTVERSION= 2.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/F/FL/FLUFFY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index 5254d3c28226..6f03a428232d 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Prompt
PORTVERSION= 1.04
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index a9a45ed964bb..6a3167e7f29d 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Query
PORTVERSION= 2.0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index a09e14d16641..87a422a3af42 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-ReadKey
PORTVERSION= 2.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= TermReadKey-${PORTVERSION}
diff --git a/devel/p5-Term-ReadLine-Zoid/Makefile b/devel/p5-Term-ReadLine-Zoid/Makefile
index 60b7fc1f9e34..2ec244f7d949 100644
--- a/devel/p5-Term-ReadLine-Zoid/Makefile
+++ b/devel/p5-Term-ReadLine-Zoid/Makefile
@@ -9,9 +9,8 @@
PORTNAME= Term-ReadLine-Zoid
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES= CPAN \
http://zoidberg.student.utwente.nl/downloads/Term-ReadLine-Zoid/
-MASTER_SITE_SUBDIR= Term
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-Screen/Makefile b/devel/p5-Term-Screen/Makefile
index af1ea209a56d..da947eb49f33 100644
--- a/devel/p5-Term-Screen/Makefile
+++ b/devel/p5-Term-Screen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Screen
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Term-Shell/Makefile b/devel/p5-Term-Shell/Makefile
index c49f3abe7bde..6eb649e45e59 100644
--- a/devel/p5-Term-Shell/Makefile
+++ b/devel/p5-Term-Shell/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Term-Shell
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-Size/Makefile b/devel/p5-Term-Size/Makefile
index e81aa2841ef9..4c2207e69259 100644
--- a/devel/p5-Term-Size/Makefile
+++ b/devel/p5-Term-Size/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-Size
PORTVERSION= 0.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= brad@kazrak.com
diff --git a/devel/p5-Term-UI/Makefile b/devel/p5-Term-UI/Makefile
index 9d2dba1339cf..b7c1df3c6b7e 100644
--- a/devel/p5-Term-UI/Makefile
+++ b/devel/p5-Term-UI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Term-UI
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Test-Benchmark/Makefile b/devel/p5-Test-Benchmark/Makefile
index 8f0c07bb5372..13f8752afda6 100644
--- a/devel/p5-Test-Benchmark/Makefile
+++ b/devel/p5-Test-Benchmark/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Benchmark
PORTVERSION= 0.004
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Test-Differences/Makefile b/devel/p5-Test-Differences/Makefile
index ab29f035e466..69b8ec5f89d0 100644
--- a/devel/p5-Test-Differences/Makefile
+++ b/devel/p5-Test-Differences/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Differences
PORTVERSION= 0.47
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Test-Expect/Makefile b/devel/p5-Test-Expect/Makefile
index 148d93d5f4b7..727c7e548edd 100644
--- a/devel/p5-Test-Expect/Makefile
+++ b/devel/p5-Test-Expect/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Expect
PORTVERSION= 0.30
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Test-File-Contents/Makefile b/devel/p5-Test-File-Contents/Makefile
index bb78a77e27c7..45947f955e5e 100644
--- a/devel/p5-Test-File-Contents/Makefile
+++ b/devel/p5-Test-File-Contents/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-File-Contents
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-HTML-Tidy/Makefile b/devel/p5-Test-HTML-Tidy/Makefile
index 05fac48bfbdb..f0f564a9af74 100644
--- a/devel/p5-Test-HTML-Tidy/Makefile
+++ b/devel/p5-Test-HTML-Tidy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-HTML-Tidy
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rafan@FreeBSD.org
diff --git a/devel/p5-Test-HasVersion/Makefile b/devel/p5-Test-HasVersion/Makefile
index 214b0f6f928f..7e989c72a242 100644
--- a/devel/p5-Test-HasVersion/Makefile
+++ b/devel/p5-Test-HasVersion/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-HasVersion
PORTVERSION= 0.01.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/F/FE/FERREIRA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-0.012
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index 8e5212e31c07..38c1ac7f0527 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Inline
PORTVERSION= 2.208
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Test-LongString/Makefile b/devel/p5-Test-LongString/Makefile
index f9ce8f3b6e4d..1a025ac53044 100644
--- a/devel/p5-Test-LongString/Makefile
+++ b/devel/p5-Test-LongString/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-LongString
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= fbsdports@commit.it
diff --git a/devel/p5-Test-MockModule/Makefile b/devel/p5-Test-MockModule/Makefile
index 34ef6329de1f..3603539dfefa 100644
--- a/devel/p5-Test-MockModule/Makefile
+++ b/devel/p5-Test-MockModule/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-MockModule
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 73f37c50d4d4..e581b7eec8dc 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-MockObject
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Test-MockTime/Makefile b/devel/p5-Test-MockTime/Makefile
index 582880c369c7..7c18fa55d4db 100644
--- a/devel/p5-Test-MockTime/Makefile
+++ b/devel/p5-Test-MockTime/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-MockTime
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= timur@FreeBSD.org
diff --git a/devel/p5-Test-NoWarnings/Makefile b/devel/p5-Test-NoWarnings/Makefile
index 74da915b4fe5..3c42744e0458 100644
--- a/devel/p5-Test-NoWarnings/Makefile
+++ b/devel/p5-Test-NoWarnings/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-NoWarnings
PORTVERSION= 0.083
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= alex@kapranoff.ru
diff --git a/devel/p5-Test-Number-Delta/Makefile b/devel/p5-Test-Number-Delta/Makefile
index 32cb02b728ea..26423853d586 100644
--- a/devel/p5-Test-Number-Delta/Makefile
+++ b/devel/p5-Test-Number-Delta/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Number-Delta
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/devel/p5-Test-Output/Makefile b/devel/p5-Test-Output/Makefile
index ed101e9fddb9..0bc834b63363 100644
--- a/devel/p5-Test-Output/Makefile
+++ b/devel/p5-Test-Output/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Output
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Test-Pod-Coverage/Makefile b/devel/p5-Test-Pod-Coverage/Makefile
index b0e07fffcce6..2a72b6e17a96 100644
--- a/devel/p5-Test-Pod-Coverage/Makefile
+++ b/devel/p5-Test-Pod-Coverage/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Pod-Coverage
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-Pod/Makefile b/devel/p5-Test-Pod/Makefile
index cd539b86e211..0931e7f0c18f 100644
--- a/devel/p5-Test-Pod/Makefile
+++ b/devel/p5-Test-Pod/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Pod
PORTVERSION= 1.26
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-RandomResults/Makefile b/devel/p5-Test-RandomResults/Makefile
index ad95b3f670ec..4ef09bac96f3 100644
--- a/devel/p5-Test-RandomResults/Makefile
+++ b/devel/p5-Test-RandomResults/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-RandomResults
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Test-Singleton/Makefile b/devel/p5-Test-Singleton/Makefile
index a34e35e281ff..c35f02b5a1b3 100644
--- a/devel/p5-Test-Singleton/Makefile
+++ b/devel/p5-Test-Singleton/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Test-Singleton
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TP/TPG
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Test-Strict/Makefile b/devel/p5-Test-Strict/Makefile
index a0783804cf7e..9f9aade9aae2 100644
--- a/devel/p5-Test-Strict/Makefile
+++ b/devel/p5-Test-Strict/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Strict
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Test-TAP-HTMLMatrix/Makefile b/devel/p5-Test-TAP-HTMLMatrix/Makefile
index f2efc6b73db0..658c33207785 100644
--- a/devel/p5-Test-TAP-HTMLMatrix/Makefile
+++ b/devel/p5-Test-TAP-HTMLMatrix/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-TAP-HTMLMatrix
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Test-TAP-Model/Makefile b/devel/p5-Test-TAP-Model/Makefile
index f4a4f9dc3aed..ce9500842b04 100644
--- a/devel/p5-Test-TAP-Model/Makefile
+++ b/devel/p5-Test-TAP-Model/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-TAP-Model
PORTVERSION= 0.09
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Test-Unit/Makefile b/devel/p5-Test-Unit/Makefile
index 5968be4e98cb..d7be2191f5d8 100644
--- a/devel/p5-Test-Unit/Makefile
+++ b/devel/p5-Test-Unit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Unit
PORTVERSION= 0.25
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Test-Warn/Makefile b/devel/p5-Test-Warn/Makefile
index 1ad08b2d70f7..b4fc04d54d08 100644
--- a/devel/p5-Test-Warn/Makefile
+++ b/devel/p5-Test-Warn/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-Warn
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-XML/Makefile b/devel/p5-Test-XML/Makefile
index 49454a5e618f..bbeb7ca86150 100644
--- a/devel/p5-Test-XML/Makefile
+++ b/devel/p5-Test-XML/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-XML
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-use-ok/Makefile b/devel/p5-Test-use-ok/Makefile
index 5e5d9ad11fa4..5bd16661b19c 100644
--- a/devel/p5-Test-use-ok/Makefile
+++ b/devel/p5-Test-use-ok/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Test-use-ok
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Test
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-Text-LevenshteinXS/Makefile b/devel/p5-Text-LevenshteinXS/Makefile
index 14bc646fefb0..03ee9dd65232 100644
--- a/devel/p5-Text-LevenshteinXS/Makefile
+++ b/devel/p5-Text-LevenshteinXS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-LevenshteinXS
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Text
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= christian@karg.org
diff --git a/devel/p5-Text-vFile-asData/Makefile b/devel/p5-Text-vFile-asData/Makefile
index 6f51416ea1e6..5f73d4e42bf6 100644
--- a/devel/p5-Text-vFile-asData/Makefile
+++ b/devel/p5-Text-vFile-asData/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Text-vFile-asData
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RC/RCLAMP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Thread-Apartment/Makefile b/devel/p5-Thread-Apartment/Makefile
index 8a8f48107ca1..74740a2f35c9 100644
--- a/devel/p5-Thread-Apartment/Makefile
+++ b/devel/p5-Thread-Apartment/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Thread-Apartment
PORTVERSION= 0.51
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Thread
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/devel/p5-Thread-Pool-Simple/Makefile b/devel/p5-Thread-Pool-Simple/Makefile
index ace29019ea1b..5e0c2b35708f 100644
--- a/devel/p5-Thread-Pool-Simple/Makefile
+++ b/devel/p5-Thread-Pool-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Thread-Pool-Simple
PORTVERSION= 0.23
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Thread
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Thread-Queue-Duplex/Makefile b/devel/p5-Thread-Queue-Duplex/Makefile
index 91676d74dc9d..bfa5aa015cbf 100644
--- a/devel/p5-Thread-Queue-Duplex/Makefile
+++ b/devel/p5-Thread-Queue-Duplex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Thread-Queue-Duplex
PORTVERSION= 0.92
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Thread
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
diff --git a/devel/p5-Tie-Array-Pack/Makefile b/devel/p5-Tie-Array-Pack/Makefile
index d67a3171bc81..b394bbbf2994 100644
--- a/devel/p5-Tie-Array-Pack/Makefile
+++ b/devel/p5-Tie-Array-Pack/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Array-Pack
PORTVERSION= 0.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kaoru@kaisei.org
diff --git a/devel/p5-Tie-Array-Sorted/Makefile b/devel/p5-Tie-Array-Sorted/Makefile
index a03191cb82c8..3cd7fb24c33d 100644
--- a/devel/p5-Tie-Array-Sorted/Makefile
+++ b/devel/p5-Tie-Array-Sorted/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Array-Sorted
PORTVERSION= 1.4.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
diff --git a/devel/p5-Tie-CPHash/Makefile b/devel/p5-Tie-CPHash/Makefile
index 5d6a2018f7d7..44a790c2db54 100644
--- a/devel/p5-Tie-CPHash/Makefile
+++ b/devel/p5-Tie-CPHash/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Tie-CPHash
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= direct@klatha.com
diff --git a/devel/p5-Tie-Cache/Makefile b/devel/p5-Tie-Cache/Makefile
index 0f7a219158ca..a20767d792f8 100644
--- a/devel/p5-Tie-Cache/Makefile
+++ b/devel/p5-Tie-Cache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Cache
PORTVERSION= 0.17
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/devel/p5-Tie-DB_File-SplitHash/Makefile b/devel/p5-Tie-DB_File-SplitHash/Makefile
index 2379430121bc..886d553aacfd 100644
--- a/devel/p5-Tie-DB_File-SplitHash/Makefile
+++ b/devel/p5-Tie-DB_File-SplitHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-DB_File-SplitHash
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Tie-DB_FileLock/Makefile b/devel/p5-Tie-DB_FileLock/Makefile
index f309f6ac6dbc..a7c4c8a5e2b1 100644
--- a/devel/p5-Tie-DB_FileLock/Makefile
+++ b/devel/p5-Tie-DB_FileLock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-DB_FileLock
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= josh@zipperup.org
diff --git a/devel/p5-Tie-FileLRUCache/Makefile b/devel/p5-Tie-FileLRUCache/Makefile
index c6199a30f79d..e452343535be 100644
--- a/devel/p5-Tie-FileLRUCache/Makefile
+++ b/devel/p5-Tie-FileLRUCache/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-FileLRUCache
PORTVERSION= 1.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/p5-Tie-Hash-Indexed/Makefile b/devel/p5-Tie-Hash-Indexed/Makefile
index 3ff60a0722c3..e9ceae63a8f9 100644
--- a/devel/p5-Tie-Hash-Indexed/Makefile
+++ b/devel/p5-Tie-Hash-Indexed/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Hash-Indexed
PORTVERSION= 0.05
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Tie-Hash-Regex/Makefile b/devel/p5-Tie-Hash-Regex/Makefile
index eef417650937..538aebc2a331 100644
--- a/devel/p5-Tie-Hash-Regex/Makefile
+++ b/devel/p5-Tie-Hash-Regex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Hash-Regex
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tie-Hash-Sorted/Makefile b/devel/p5-Tie-Hash-Sorted/Makefile
index 6cb369e8ad8d..26af7c16582e 100644
--- a/devel/p5-Tie-Hash-Sorted/Makefile
+++ b/devel/p5-Tie-Hash-Sorted/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Hash-Sorted
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Tie-Hash-TwoWay/Makefile b/devel/p5-Tie-Hash-TwoWay/Makefile
index 49b59ac460f5..3d8020115e1e 100644
--- a/devel/p5-Tie-Hash-TwoWay/Makefile
+++ b/devel/p5-Tie-Hash-TwoWay/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Hash-TwoWay
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index 2385ea3f69a7..39352d486681 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-IxHash
PORTVERSION= 1.21
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Tie-Restore/Makefile b/devel/p5-Tie-Restore/Makefile
index d3ce9fe84f90..00e6917626ac 100644
--- a/devel/p5-Tie-Restore/Makefile
+++ b/devel/p5-Tie-Restore/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Restore
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/p5-Tie-ShareLite/Makefile b/devel/p5-Tie-ShareLite/Makefile
index 27f433124486..a9b499545ff5 100644
--- a/devel/p5-Tie-ShareLite/Makefile
+++ b/devel/p5-Tie-ShareLite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-ShareLite
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@csie.nctu.edu.tw
diff --git a/devel/p5-Tie-Simple/Makefile b/devel/p5-Tie-Simple/Makefile
index 5c28f999b91b..e6e750900958 100644
--- a/devel/p5-Tie-Simple/Makefile
+++ b/devel/p5-Tie-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-Simple
PORTVERSION= 1.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/devel/p5-Time-Clock/Makefile b/devel/p5-Time-Clock/Makefile
index 6b5076ec8b5a..5a2d8402dd51 100644
--- a/devel/p5-Time-Clock/Makefile
+++ b/devel/p5-Time-Clock/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Clock
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Time-Duration/Makefile b/devel/p5-Time-Duration/Makefile
index c85a29d26822..9a6c5863ef20 100644
--- a/devel/p5-Time-Duration/Makefile
+++ b/devel/p5-Time-Duration/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Duration
PORTVERSION= 1.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 1489f2f1345f..adf9b89396ce 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Time-HiRes
PORTVERSION= 1.9712
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Time-Interval/Makefile b/devel/p5-Time-Interval/Makefile
index a0dbad2a8142..bb0e95e5f170 100644
--- a/devel/p5-Time-Interval/Makefile
+++ b/devel/p5-Time-Interval/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Interval
PORTVERSION= 1.22
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Time-Object/Makefile b/devel/p5-Time-Object/Makefile
index 9281208c1714..d6f6f79f35d8 100644
--- a/devel/p5-Time-Object/Makefile
+++ b/devel/p5-Time-Object/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Time-Object
PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-Time-Period/Makefile b/devel/p5-Time-Period/Makefile
index 2a718a626f96..fa208eaccd2e 100644
--- a/devel/p5-Time-Period/Makefile
+++ b/devel/p5-Time-Period/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Period
PORTVERSION= 1.20
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Period-${PORTVERSION}
diff --git a/devel/p5-Time-Piece-Range/Makefile b/devel/p5-Time-Piece-Range/Makefile
index 205dcdc39ef4..2f949746128e 100644
--- a/devel/p5-Time-Piece-Range/Makefile
+++ b/devel/p5-Time-Piece-Range/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Piece-Range
PORTVERSION= 1.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/devel/p5-Time-Piece/Makefile b/devel/p5-Time-Piece/Makefile
index 4d06533400ac..0679570b05d1 100644
--- a/devel/p5-Time-Piece/Makefile
+++ b/devel/p5-Time-Piece/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Piece
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Time-Progress/Makefile b/devel/p5-Time-Progress/Makefile
index 2573724fb37e..110245292c9a 100644
--- a/devel/p5-Time-Progress/Makefile
+++ b/devel/p5-Time-Progress/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Progress
PORTVERSION= 1.3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Time-Stopwatch/Makefile b/devel/p5-Time-Stopwatch/Makefile
index b649d3c22ac4..8968fe0d0694 100644
--- a/devel/p5-Time-Stopwatch/Makefile
+++ b/devel/p5-Time-Stopwatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-Stopwatch
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= madis555@hot.ee
diff --git a/devel/p5-Time-modules/Makefile b/devel/p5-Time-modules/Makefile
index db4e78ef421c..bfcec7b7bffe 100644
--- a/devel/p5-Time-modules/Makefile
+++ b/devel/p5-Time-modules/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Time-modules
PORTVERSION= 2006.0814
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index bb09c17cb2e7..e9b052908bc7 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -9,8 +9,7 @@ PORTNAME= TimeDate
PORTVERSION= 1.16
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index 19a74ff4ac6a..f8bd4f9907d8 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= TraceFuncs
PORTVERSION= 0.1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= traceFunc-${PORTVERSION}
diff --git a/devel/p5-Tree-Binary-Dictionary/Makefile b/devel/p5-Tree-Binary-Dictionary/Makefile
index b35c3dd14b11..a80e8d9a17c9 100644
--- a/devel/p5-Tree-Binary-Dictionary/Makefile
+++ b/devel/p5-Tree-Binary-Dictionary/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Binary-Dictionary
PORTVERSION= 1.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Binary/Makefile b/devel/p5-Tree-Binary/Makefile
index 50e6b3747847..5b71a8155578 100644
--- a/devel/p5-Tree-Binary/Makefile
+++ b/devel/p5-Tree-Binary/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Binary
PORTVERSION= 0.07
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Node/Makefile b/devel/p5-Tree-Node/Makefile
index 4b18ac29fc57..4e04f6b350a0 100644
--- a/devel/p5-Tree-Node/Makefile
+++ b/devel/p5-Tree-Node/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Node
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Parser/Makefile b/devel/p5-Tree-Parser/Makefile
index a70509a34f92..0f33c07479fe 100644
--- a/devel/p5-Tree-Parser/Makefile
+++ b/devel/p5-Tree-Parser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Parser
PORTVERSION= 0.15
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Simple-View/Makefile b/devel/p5-Tree-Simple-View/Makefile
index edf6925261e5..7c6b92fe75b0 100644
--- a/devel/p5-Tree-Simple-View/Makefile
+++ b/devel/p5-Tree-Simple-View/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Simple-View
PORTVERSION= 0.16
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Simple-VisitorFactory/Makefile b/devel/p5-Tree-Simple-VisitorFactory/Makefile
index 33b1449ed25e..a8ac323b73b1 100644
--- a/devel/p5-Tree-Simple-VisitorFactory/Makefile
+++ b/devel/p5-Tree-Simple-VisitorFactory/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Simple-VisitorFactory
PORTVERSION= 0.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/devel/p5-Tree-Simple/Makefile b/devel/p5-Tree-Simple/Makefile
index b0b1316a54b6..2ac8a3d65ad1 100644
--- a/devel/p5-Tree-Simple/Makefile
+++ b/devel/p5-Tree-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Simple
PORTVERSION= 1.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-UI-Dialog/Makefile b/devel/p5-UI-Dialog/Makefile
index a74083a7be7e..642da90cf39a 100644
--- a/devel/p5-UI-Dialog/Makefile
+++ b/devel/p5-UI-Dialog/Makefile
@@ -8,7 +8,7 @@
PORTNAME= UI-Dialog
PORTVERSION= 1.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/K/KC/KCK
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-UNIVERSAL-can/Makefile b/devel/p5-UNIVERSAL-can/Makefile
index 0da04b798fb4..241ed5c045d8 100644
--- a/devel/p5-UNIVERSAL-can/Makefile
+++ b/devel/p5-UNIVERSAL-can/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-can
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/C/CH/CHROMATIC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-isa/Makefile b/devel/p5-UNIVERSAL-isa/Makefile
index dc185bdf2dd1..e35c39281422 100644
--- a/devel/p5-UNIVERSAL-isa/Makefile
+++ b/devel/p5-UNIVERSAL-isa/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-isa
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/C/CH/CHROMATIC
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lbr@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-moniker/Makefile b/devel/p5-UNIVERSAL-moniker/Makefile
index f3026a322843..93b7ac7c103b 100644
--- a/devel/p5-UNIVERSAL-moniker/Makefile
+++ b/devel/p5-UNIVERSAL-moniker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-moniker
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= UNIVERSAL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-require/Makefile b/devel/p5-UNIVERSAL-require/Makefile
index 488d05247ccd..fd163d46e1bc 100644
--- a/devel/p5-UNIVERSAL-require/Makefile
+++ b/devel/p5-UNIVERSAL-require/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-require
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MS/MSCHWERN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-which/Makefile b/devel/p5-UNIVERSAL-which/Makefile
index f6d058da9e60..fc7bfd9a7055 100644
--- a/devel/p5-UNIVERSAL-which/Makefile
+++ b/devel/p5-UNIVERSAL-which/Makefile
@@ -8,8 +8,7 @@
PORTNAME= UNIVERSAL-which
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= UNIVERSAL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Unix-Statgrab/Makefile b/devel/p5-Unix-Statgrab/Makefile
index 7b8ebd2fead9..0809fa969ddb 100644
--- a/devel/p5-Unix-Statgrab/Makefile
+++ b/devel/p5-Unix-Statgrab/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Unix-Statgrab
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Unix
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tdb@FreeBSD.org
diff --git a/devel/p5-VCP-Dest-svk/Makefile b/devel/p5-VCP-Dest-svk/Makefile
index 32db078ca56d..e3b860d8141d 100644
--- a/devel/p5-VCP-Dest-svk/Makefile
+++ b/devel/p5-VCP-Dest-svk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= VCP-Dest-svk
PORTVERSION= 0.29
PORTREVISION= 0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-VCP-Source-cvsbk/Makefile b/devel/p5-VCP-Source-cvsbk/Makefile
index f64aded53dc0..7c26d72d6d12 100644
--- a/devel/p5-VCP-Source-cvsbk/Makefile
+++ b/devel/p5-VCP-Source-cvsbk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= VCP-Source-cvsbk
PORTVERSION= 0.11
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile
index 86300c056780..ec7246171459 100644
--- a/devel/p5-VCP-autrijus/Makefile
+++ b/devel/p5-VCP-autrijus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= VCP
PORTVERSION= 0.9.20050110
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AU/AUTRIJUS
PKGNAMEPREFIX= p5-
PKGNAMESUFFIX= -autrijus
diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile
index 04406064b1b4..00cca7c4cd51 100644
--- a/devel/p5-VCS/Makefile
+++ b/devel/p5-VCS/Makefile
@@ -9,8 +9,7 @@ PORTNAME= VCS
PORTVERSION= 0.14
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= VCS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Want/Makefile b/devel/p5-Want/Makefile
index f820f6c3fd4b..8a7d0210fa8e 100644
--- a/devel/p5-Want/Makefile
+++ b/devel/p5-Want/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Want
PORTVERSION= 0.18
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RO/ROBIN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-WeakRef/Makefile b/devel/p5-WeakRef/Makefile
index 2f110643aeec..99162d5bf9ec 100644
--- a/devel/p5-WeakRef/Makefile
+++ b/devel/p5-WeakRef/Makefile
@@ -8,8 +8,8 @@
PORTNAME= WeakRef
PORTVERSION= 0.01
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/L/LU/LUKKA/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/L/LU/LUKKA
PKGNAMEPREFIX= p5-
MAINTAINER= amdmi3@amdmi3.ru
diff --git a/devel/p5-Workflow/Makefile b/devel/p5-Workflow/Makefile
index b0a812217dfe..6a6134b07604 100644
--- a/devel/p5-Workflow/Makefile
+++ b/devel/p5-Workflow/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Workflow
PORTVERSION= 0.31
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Workflow
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= svysh@pn.sinp.msu.ru
diff --git a/devel/p5-XSLoader/Makefile b/devel/p5-XSLoader/Makefile
index 0d5dff43e189..48aa2a82d134 100644
--- a/devel/p5-XSLoader/Makefile
+++ b/devel/p5-XSLoader/Makefile
@@ -8,7 +8,7 @@
PORTNAME= XSLoader
PORTVERSION= 0.08
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAPER
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Yada-Yada-Yada/Makefile b/devel/p5-Yada-Yada-Yada/Makefile
index a420651f968d..42e79485208d 100644
--- a/devel/p5-Yada-Yada-Yada/Makefile
+++ b/devel/p5-Yada-Yada-Yada/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Yada-Yada-Yada
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/T/TM/TMTM
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-accessors/Makefile b/devel/p5-accessors/Makefile
index 66cf00d50ea2..09a3b7f368d9 100644
--- a/devel/p5-accessors/Makefile
+++ b/devel/p5-accessors/Makefile
@@ -8,7 +8,7 @@
PORTNAME= accessors
PORTVERSION= 1.00
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/S/SP/SPURKIS
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-base/Makefile b/devel/p5-base/Makefile
index 3342932e06d3..f129db69c67b 100644
--- a/devel/p5-base/Makefile
+++ b/devel/p5-base/Makefile
@@ -8,7 +8,7 @@
PORTNAME= base
PORTVERSION= 2.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/R/RG/RGARCIA
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-capitalization/Makefile b/devel/p5-capitalization/Makefile
index 48d0cae18799..14bf124fa281 100644
--- a/devel/p5-capitalization/Makefile
+++ b/devel/p5-capitalization/Makefile
@@ -8,7 +8,7 @@
PORTNAME= capitalization
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/M/MI/MIYAGAWA
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-enum/Makefile b/devel/p5-enum/Makefile
index 18d0aa945a47..8fa32c18d323 100644
--- a/devel/p5-enum/Makefile
+++ b/devel/p5-enum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= enum
PORTVERSION= 1.016
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= enum
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p5-iCal-Parser/Makefile b/devel/p5-iCal-Parser/Makefile
index 62786903e0b6..bb6e5c1d4fe9 100644
--- a/devel/p5-iCal-Parser/Makefile
+++ b/devel/p5-iCal-Parser/Makefile
@@ -8,8 +8,7 @@
PORTNAME= iCal-Parser
PORTVERSION= 1.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/R/RF/RFRANKEL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-mixin/Makefile b/devel/p5-mixin/Makefile
index 0c5cfc82b08a..3357c27d088c 100644
--- a/devel/p5-mixin/Makefile
+++ b/devel/p5-mixin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mixin
PORTVERSION= 0.06
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/M/MS/MSCHWERN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-orz/Makefile b/devel/p5-orz/Makefile
index 395b497ab848..c8eba37d4ae3 100644
--- a/devel/p5-orz/Makefile
+++ b/devel/p5-orz/Makefile
@@ -8,8 +8,7 @@
PORTNAME= orz
PORTVERSION= 0.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CPAN/INGY
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/devel/p5-parent/Makefile b/devel/p5-parent/Makefile
index 8d775b3aaaad..96df5c7eca2d 100644
--- a/devel/p5-parent/Makefile
+++ b/devel/p5-parent/Makefile
@@ -8,7 +8,7 @@
PORTNAME= parent
PORTVERSION= 0.221
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CO/CORION
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-prefork/Makefile b/devel/p5-prefork/Makefile
index d81229f5f5f9..300758535515 100644
--- a/devel/p5-prefork/Makefile
+++ b/devel/p5-prefork/Makefile
@@ -8,7 +8,7 @@
PORTNAME= prefork
PORTVERSION= 1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AD/ADAMK
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-reaper/Makefile b/devel/p5-reaper/Makefile
index b37393fffcb9..27f057f9ed3b 100644
--- a/devel/p5-reaper/Makefile
+++ b/devel/p5-reaper/Makefile
@@ -8,7 +8,7 @@
PORTNAME= reaper
PORTVERSION= 0.03
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/J/JG/JGS/reaper
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-rpm-build-perl/Makefile b/devel/p5-rpm-build-perl/Makefile
index 16f61a69a5b4..41ecd3bf4663 100644
--- a/devel/p5-rpm-build-perl/Makefile
+++ b/devel/p5-rpm-build-perl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rpm-build-perl
PORTVERSION= 0.6.7
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AT/ATOURBIN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-threads-shared/Makefile b/devel/p5-threads-shared/Makefile
index e41f59d5e541..bc1e67b7185a 100644
--- a/devel/p5-threads-shared/Makefile
+++ b/devel/p5-threads-shared/Makefile
@@ -8,8 +8,7 @@
PORTNAME= threads-shared
PORTVERSION= 1.12
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/J/JD/JDHEDDEN
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ruben@verweg.com
diff --git a/devel/p5-threads/Makefile b/devel/p5-threads/Makefile
index 07e0768f1ffe..dd0e8ae5d190 100644
--- a/devel/p5-threads/Makefile
+++ b/devel/p5-threads/Makefile
@@ -8,7 +8,7 @@
PORTNAME= threads
PORTVERSION= 1.67
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/J/JD/JDHEDDEN
PKGNAMEPREFIX= p5-
diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile
index 7c9d36c01a15..58fa15fb171c 100644
--- a/devel/pushmi/Makefile
+++ b/devel/pushmi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pushmi
PORTVERSION= 1.0.0
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
DISTNAME= Pushmi-v${PORTVERSION}
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index a46cf0c8a4ed..cc1dd76772f9 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= svk
PORTVERSION= 2.0.2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
DISTNAME= SVK-v${PORTVERSION}