aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2003-10-24 12:05:09 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2003-10-24 12:05:09 +0000
commitc634b4bb839753aec2ae1040e2c80a5282402cb8 (patch)
treed8b3fc97550f860aeb41c57751d2550e9ad6273e /devel
parent386f40a6b587557ff9ef6bed9fccca2490a5d78d (diff)
downloadports-c634b4bb839753aec2ae1040e2c80a5282402cb8.tar.gz
ports-c634b4bb839753aec2ae1040e2c80a5282402cb8.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/bugzilla/Makefile2
-rw-r--r--devel/bugzilla2/Makefile2
-rw-r--r--devel/bugzilla3/Makefile2
-rw-r--r--devel/cons-test/Makefile2
-rw-r--r--devel/cons/Makefile2
-rw-r--r--devel/make++/Makefile2
-rw-r--r--devel/p5-Agent/Makefile3
-rw-r--r--devel/p5-Agent/pkg-plist16
-rw-r--r--devel/p5-Algorithm-Diff/Makefile1
-rw-r--r--devel/p5-Algorithm-Diff/pkg-plist20
-rw-r--r--devel/p5-Algorithm-MDiff/Makefile1
-rw-r--r--devel/p5-Algorithm-MDiff/pkg-plist16
-rw-r--r--devel/p5-Alias/Makefile1
-rw-r--r--devel/p5-Alias/pkg-plist10
-rw-r--r--devel/p5-AppConfig-Std/pkg-plist10
-rw-r--r--devel/p5-AtExit/Makefile1
-rw-r--r--devel/p5-AtExit/pkg-plist6
-rw-r--r--devel/p5-Attribute-Handlers/pkg-plist12
-rw-r--r--devel/p5-B-Graph/Makefile1
-rw-r--r--devel/p5-B-Graph/pkg-plist10
-rw-r--r--devel/p5-BSD-Resource/pkg-plist68
-rw-r--r--devel/p5-BSD-stat/Makefile1
-rw-r--r--devel/p5-BSD-stat/pkg-plist16
-rw-r--r--devel/p5-C-Scan/Makefile3
-rw-r--r--devel/p5-C-Scan/pkg-plist10
-rw-r--r--devel/p5-Cache-Mmap/Makefile4
-rw-r--r--devel/p5-Cache-Mmap/pkg-plist14
-rw-r--r--devel/p5-Carp-Assert/Makefile3
-rw-r--r--devel/p5-Carp-Assert/pkg-plist10
-rw-r--r--devel/p5-Carp-Datum/Makefile2
-rw-r--r--devel/p5-Carp-Datum/pkg-plist28
-rw-r--r--devel/p5-Cdk/pkg-plist62
-rw-r--r--devel/p5-Class-Accessor/Makefile1
-rw-r--r--devel/p5-Class-ArrayObjects/pkg-plist10
-rw-r--r--devel/p5-Class-BlackHole/Makefile1
-rw-r--r--devel/p5-Class-BlackHole/pkg-plist10
-rw-r--r--devel/p5-Class-Contract/Makefile1
-rw-r--r--devel/p5-Class-Contract/pkg-plist14
-rw-r--r--devel/p5-Class-Data-Inheritable/Makefile3
-rw-r--r--devel/p5-Class-Data-Inheritable/pkg-plist14
-rw-r--r--devel/p5-Class-Date/Makefile1
-rw-r--r--devel/p5-Class-Date/pkg-plist20
-rw-r--r--devel/p5-Class-Default/Makefile2
-rw-r--r--devel/p5-Class-Default/pkg-plist10
-rw-r--r--devel/p5-Class-Generate/Makefile2
-rw-r--r--devel/p5-Class-Generate/pkg-plist12
-rw-r--r--devel/p5-Class-Hook/Makefile5
-rw-r--r--devel/p5-Class-Hook/pkg-plist12
-rw-r--r--devel/p5-Class-ISA/Makefile1
-rw-r--r--devel/p5-Class-ISA/pkg-plist10
-rw-r--r--devel/p5-Class-Inner/pkg-plist10
-rw-r--r--devel/p5-Class-Loader/Makefile1
-rw-r--r--devel/p5-Class-Loader/pkg-plist12
-rw-r--r--devel/p5-Class-MakeMethods/Makefile1
-rw-r--r--devel/p5-Class-MakeMethods/pkg-plist128
-rw-r--r--devel/p5-Class-ReturnValue/pkg-plist10
-rw-r--r--devel/p5-Class-Singleton/Makefile3
-rw-r--r--devel/p5-Class-Singleton/pkg-plist10
-rw-r--r--devel/p5-Class-Tangram/Makefile9
-rw-r--r--devel/p5-Class-Tangram/pkg-plist10
-rw-r--r--devel/p5-Class-Tom/Makefile1
-rw-r--r--devel/p5-Class-Tom/pkg-plist20
-rw-r--r--devel/p5-Class-WhiteHole/Makefile1
-rw-r--r--devel/p5-Class-WhiteHole/pkg-plist10
-rw-r--r--devel/p5-Clone/Makefile1
-rw-r--r--devel/p5-Clone/pkg-plist12
-rw-r--r--devel/p5-Config-Ini/Makefile3
-rw-r--r--devel/p5-Config-Ini/pkg-plist16
-rw-r--r--devel/p5-Config-Setting/Makefile3
-rw-r--r--devel/p5-Config-Setting/pkg-plist18
-rw-r--r--devel/p5-ConfigReader/pkg-plist10
-rw-r--r--devel/p5-Coro/Makefile1
-rw-r--r--devel/p5-Coro/pkg-plist52
-rw-r--r--devel/p5-Curses-Application/Makefile1
-rw-r--r--devel/p5-Curses-Forms/Makefile1
-rw-r--r--devel/p5-Curses-Widgets/Makefile1
-rw-r--r--devel/p5-Curses/Makefile1
-rw-r--r--devel/p5-Curses/pkg-plist10
-rw-r--r--devel/p5-DB_File-Lock/Makefile1
-rw-r--r--devel/p5-DB_File-Lock/pkg-plist10
-rw-r--r--devel/p5-Data-Compare/Makefile1
-rw-r--r--devel/p5-Data-Compare/pkg-plist10
-rw-r--r--devel/p5-Data-DumpXML/Makefile3
-rw-r--r--devel/p5-Data-DumpXML/pkg-plist14
-rw-r--r--devel/p5-Data-HexDump/Makefile1
-rw-r--r--devel/p5-Data-HexDump/pkg-plist10
-rw-r--r--devel/p5-Data-Properties/Makefile1
-rw-r--r--devel/p5-Data-Properties/pkg-plist10
-rw-r--r--devel/p5-Data-ShowTable/pkg-plist10
-rw-r--r--devel/p5-Date-Calc/Makefile3
-rw-r--r--devel/p5-Date-Calc/pkg-plist38
-rw-r--r--devel/p5-Date-DayOfWeek/pkg-plist20
-rw-r--r--devel/p5-Date-Leapyear/Makefile3
-rw-r--r--devel/p5-Date-Leapyear/pkg-plist10
-rw-r--r--devel/p5-Date-Pcalc/Makefile1
-rw-r--r--devel/p5-Date-Pcalc/pkg-plist10
-rw-r--r--devel/p5-Date-Roman/Makefile3
-rw-r--r--devel/p5-Date-Roman/pkg-plist10
-rw-r--r--devel/p5-Date-Simple/Makefile3
-rw-r--r--devel/p5-Date-Simple/pkg-plist20
-rw-r--r--devel/p5-DateConvert/Makefile1
-rw-r--r--devel/p5-DateConvert/pkg-plist10
-rw-r--r--devel/p5-Devel-Constants/Makefile1
-rw-r--r--devel/p5-Devel-Constants/pkg-plist10
-rw-r--r--devel/p5-Devel-DProf/pkg-plist14
-rw-r--r--devel/p5-Devel-Leak/pkg-plist14
-rw-r--r--devel/p5-Devel-Modlist/Makefile1
-rw-r--r--devel/p5-Devel-Modlist/pkg-plist10
-rw-r--r--devel/p5-Devel-ObjectTracker/pkg-plist10
-rw-r--r--devel/p5-Devel-Peek/Makefile1
-rw-r--r--devel/p5-Devel-Peek/pkg-plist14
-rw-r--r--devel/p5-Devel-StackTrace/Makefile3
-rw-r--r--devel/p5-Devel-StackTrace/pkg-plist10
-rw-r--r--devel/p5-Devel-Symdump/Makefile1
-rw-r--r--devel/p5-Devel-Symdump/pkg-plist14
-rw-r--r--devel/p5-Dialog/Makefile1
-rw-r--r--devel/p5-Errno/Makefile1
-rw-r--r--devel/p5-Errno/pkg-plist6
-rw-r--r--devel/p5-Exception-Class/Makefile7
-rw-r--r--devel/p5-Exception-Class/pkg-plist10
-rw-r--r--devel/p5-File-BasicFlock/Makefile1
-rw-r--r--devel/p5-File-BasicFlock/pkg-plist10
-rw-r--r--devel/p5-File-Cache/pkg-plist10
-rw-r--r--devel/p5-File-FTS/Makefile1
-rw-r--r--devel/p5-File-FTS/pkg-plist10
-rw-r--r--devel/p5-File-Flock/Makefile1
-rw-r--r--devel/p5-File-Flock/pkg-plist10
-rw-r--r--devel/p5-File-Lock/pkg-plist24
-rw-r--r--devel/p5-File-NFSLock/pkg-plist10
-rw-r--r--devel/p5-File-ReadBackwards/Makefile1
-rw-r--r--devel/p5-File-ReadBackwards/pkg-plist10
-rw-r--r--devel/p5-File-Remove/Makefile1
-rw-r--r--devel/p5-File-Remove/pkg-plist6
-rw-r--r--devel/p5-File-Slurp/Makefile1
-rw-r--r--devel/p5-File-Sync/Makefile1
-rw-r--r--devel/p5-File-Sync/pkg-plist16
-rw-r--r--devel/p5-File-Tail/Makefile3
-rw-r--r--devel/p5-File-Tail/pkg-plist16
-rw-r--r--devel/p5-File-Temp/Makefile3
-rw-r--r--devel/p5-File-Temp/pkg-plist8
-rw-r--r--devel/p5-Filter-CBC/Makefile6
-rw-r--r--devel/p5-Filter-CBC/pkg-plist12
-rw-r--r--devel/p5-FreezeThaw/pkg-plist6
-rw-r--r--devel/p5-Getargs-Long/Makefile3
-rw-r--r--devel/p5-Getargs-Long/pkg-plist10
-rw-r--r--devel/p5-Getopt-Declare/Makefile3
-rw-r--r--devel/p5-Getopt-Declare/pkg-plist10
-rw-r--r--devel/p5-Getopt-Long/Makefile1
-rw-r--r--devel/p5-Getopt-Long/pkg-plist12
-rw-r--r--devel/p5-Getopt-Mixed/Makefile1
-rw-r--r--devel/p5-Getopt-Mixed/pkg-plist10
-rw-r--r--devel/p5-Glade-Perl/Makefile4
-rw-r--r--devel/p5-Glade-Perl/pkg-plist22
-rw-r--r--devel/p5-Heap/Makefile1
-rw-r--r--devel/p5-Heap/pkg-plist74
-rw-r--r--devel/p5-IO-Multiplex/Makefile3
-rw-r--r--devel/p5-IO-Multiplex/pkg-plist12
-rw-r--r--devel/p5-IO-Stty/pkg-plist12
-rw-r--r--devel/p5-IO-Tty/Makefile1
-rw-r--r--devel/p5-IO-Tty/pkg-plist24
-rw-r--r--devel/p5-IO-stringy/Makefile1
-rw-r--r--devel/p5-IO-stringy/pkg-plist24
-rw-r--r--devel/p5-IPC-Cache/Makefile6
-rw-r--r--devel/p5-IPC-Cache/pkg-plist10
-rw-r--r--devel/p5-IPC-Locker/pkg-plist20
-rw-r--r--devel/p5-IPC-Shareable/Makefile3
-rw-r--r--devel/p5-IPC-Shareable/pkg-plist14
-rw-r--r--devel/p5-IPC-SharedCache/Makefile5
-rw-r--r--devel/p5-IPC-SharedCache/pkg-plist10
-rw-r--r--devel/p5-Include/Makefile1
-rw-r--r--devel/p5-Include/pkg-plist6
-rw-r--r--devel/p5-Inline-ASM/Makefile3
-rw-r--r--devel/p5-Inline-ASM/pkg-plist12
-rw-r--r--devel/p5-Inline-Filters/Makefile3
-rw-r--r--devel/p5-Inline-Filters/pkg-plist12
-rw-r--r--devel/p5-Inline-Java/Makefile3
-rw-r--r--devel/p5-Inline-Java/pkg-plist32
-rw-r--r--devel/p5-Ioctl/Makefile1
-rw-r--r--devel/p5-Ioctl/pkg-plist12
-rw-r--r--devel/p5-Locale-PGetText/pkg-plist10
-rw-r--r--devel/p5-Locale-gettext/Makefile1
-rw-r--r--devel/p5-Locale-gettext/pkg-plist14
-rw-r--r--devel/p5-LockFile-Simple/Makefile1
-rw-r--r--devel/p5-LockFile-Simple/pkg-plist18
-rw-r--r--devel/p5-Log-Agent-Logger/Makefile5
-rw-r--r--devel/p5-Log-Agent-Logger/pkg-plist8
-rw-r--r--devel/p5-Log-Dispatch-Config/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-Config/pkg-plist20
-rw-r--r--devel/p5-Log-Dispatch/pkg-plist38
-rw-r--r--devel/p5-Log-TraceMessages/Makefile3
-rw-r--r--devel/p5-Log-TraceMessages/pkg-plist16
-rw-r--r--devel/p5-Mac-FileSpec-Unixish/Makefile1
-rw-r--r--devel/p5-Mac-FileSpec-Unixish/pkg-plist16
-rw-r--r--devel/p5-Make/pkg-plist6
-rw-r--r--devel/p5-Memoize/Makefile3
-rw-r--r--devel/p5-Memoize/pkg-plist24
-rw-r--r--devel/p5-OLE-Storage_Lite/Makefile3
-rw-r--r--devel/p5-OLE-Storage_Lite/pkg-plist12
-rw-r--r--devel/p5-PCSC-Card/pkg-plist22
-rw-r--r--devel/p5-POE-Component-Client-POP3/Makefile3
-rw-r--r--devel/p5-POE-Component-Client-POP3/pkg-plist18
-rw-r--r--devel/p5-POE-Component-DirWatch/Makefile2
-rw-r--r--devel/p5-POE-Component-DirWatch/pkg-plist14
-rw-r--r--devel/p5-POE-Component-IKC-ReallySimple/Makefile5
-rw-r--r--devel/p5-POE-Component-IKC-ReallySimple/pkg-plist18
-rw-r--r--devel/p5-POE-Component-Logger/Makefile5
-rw-r--r--devel/p5-POE-Component-Logger/pkg-plist16
-rw-r--r--devel/p5-POE-Session-Cascading/Makefile3
-rw-r--r--devel/p5-POE-Session-Cascading/pkg-plist12
-rw-r--r--devel/p5-PPerl/pkg-plist10
-rw-r--r--devel/p5-PV/Makefile2
-rw-r--r--devel/p5-PV/pkg-plist2
-rw-r--r--devel/p5-Parse-PerlConfig/pkg-plist10
-rw-r--r--devel/p5-Parse-RecDescent/pkg-plist6
-rw-r--r--devel/p5-Penguin-Easy/Makefile3
-rw-r--r--devel/p5-Penguin-Easy/pkg-plist6
-rw-r--r--devel/p5-Penguin/pkg-plist42
-rw-r--r--devel/p5-PerlMenu/Makefile4
-rw-r--r--devel/p5-PerlMenu/pkg-plist2
-rw-r--r--devel/p5-Proc-Background/pkg-plist16
-rw-r--r--devel/p5-Proc-Daemon/Makefile1
-rw-r--r--devel/p5-Proc-Daemon/pkg-plist10
-rw-r--r--devel/p5-Proc-Simple/Makefile1
-rw-r--r--devel/p5-Proc-Simple/pkg-plist16
-rw-r--r--devel/p5-Rcs/Makefile1
-rw-r--r--devel/p5-Rcs/pkg-plist6
-rw-r--r--devel/p5-Religion/Makefile1
-rw-r--r--devel/p5-Religion/pkg-plist6
-rw-r--r--devel/p5-ResourcePool/Makefile4
-rw-r--r--devel/p5-ResourcePool/pkg-plist62
-rw-r--r--devel/p5-Resources/Makefile1
-rw-r--r--devel/p5-Resources/pkg-plist6
-rw-r--r--devel/p5-SDL/pkg-plist60
-rw-r--r--devel/p5-Search-Binary/Makefile1
-rw-r--r--devel/p5-Search-Binary/pkg-plist10
-rw-r--r--devel/p5-Server-FastPL/Makefile1
-rw-r--r--devel/p5-Server-FastPL/pkg-plist16
-rw-r--r--devel/p5-Set-NestedGroups/Makefile1
-rw-r--r--devel/p5-Set-NestedGroups/pkg-plist14
-rw-r--r--devel/p5-Set-Object/Makefile1
-rw-r--r--devel/p5-Set-Object/pkg-plist16
-rw-r--r--devel/p5-Set-Scalar/Makefile1
-rw-r--r--devel/p5-Set-Scalar/pkg-plist26
-rw-r--r--devel/p5-Shape/pkg-plist14
-rw-r--r--devel/p5-Sort-ArrayOfArrays/Makefile1
-rw-r--r--devel/p5-Sort-ArrayOfArrays/pkg-plist10
-rw-r--r--devel/p5-Sort-Versions/Makefile1
-rw-r--r--devel/p5-Sort-Versions/pkg-plist10
-rw-r--r--devel/p5-String-CRC32/Makefile3
-rw-r--r--devel/p5-String-CRC32/pkg-plist16
-rw-r--r--devel/p5-String-Checker/Makefile3
-rw-r--r--devel/p5-String-Checker/pkg-plist10
-rw-r--r--devel/p5-String-LRC/Makefile2
-rw-r--r--devel/p5-String-LRC/pkg-plist18
-rw-r--r--devel/p5-String-Parity/Makefile2
-rw-r--r--devel/p5-String-Parity/pkg-plist10
-rw-r--r--devel/p5-String-RexxParse/Makefile1
-rw-r--r--devel/p5-String-RexxParse/pkg-plist10
-rw-r--r--devel/p5-String-Similarity/Makefile1
-rw-r--r--devel/p5-String-Similarity/pkg-plist14
-rw-r--r--devel/p5-Sub-Uplevel/pkg-plist12
-rw-r--r--devel/p5-System2/Makefile1
-rw-r--r--devel/p5-System2/pkg-plist10
-rw-r--r--devel/p5-Term-ProgressBar/Makefile3
-rw-r--r--devel/p5-Term-ProgressBar/pkg-plist8
-rw-r--r--devel/p5-Term-Prompt/Makefile3
-rw-r--r--devel/p5-Term-Prompt/pkg-plist8
-rw-r--r--devel/p5-Term-Query/Makefile3
-rw-r--r--devel/p5-Term-Query/pkg-plist14
-rw-r--r--devel/p5-Term-ReadKey/Makefile1
-rw-r--r--devel/p5-Term-ReadKey/pkg-plist16
-rw-r--r--devel/p5-Term-Screen/pkg-plist10
-rw-r--r--devel/p5-Term-Size/Makefile1
-rw-r--r--devel/p5-Term-Size/pkg-plist18
-rw-r--r--devel/p5-Test-Class/Makefile22
-rw-r--r--devel/p5-Test-Class/pkg-plist8
-rw-r--r--devel/p5-Test-Differences/Makefile6
-rw-r--r--devel/p5-Test-Differences/pkg-plist10
-rw-r--r--devel/p5-Test-Exception/Makefile8
-rw-r--r--devel/p5-Test-Exception/pkg-plist8
-rw-r--r--devel/p5-Test-Inline/Makefile6
-rw-r--r--devel/p5-Test-Inline/pkg-plist22
-rw-r--r--devel/p5-Test-Manifest/Makefile1
-rw-r--r--devel/p5-Test-Simple/Makefile2
-rw-r--r--devel/p5-Test-Simple/pkg-plist16
-rw-r--r--devel/p5-Test-Unit/Makefile8
-rw-r--r--devel/p5-Test-Unit/pkg-plist76
-rw-r--r--devel/p5-Tie-Cache/Makefile1
-rw-r--r--devel/p5-Tie-Cache/pkg-plist12
-rw-r--r--devel/p5-Tie-DB_FileLock/Makefile1
-rw-r--r--devel/p5-Tie-DB_FileLock/pkg-plist10
-rw-r--r--devel/p5-Tie-IxHash/Makefile1
-rw-r--r--devel/p5-Tie-IxHash/pkg-plist10
-rw-r--r--devel/p5-Time-Duration/pkg-plist10
-rw-r--r--devel/p5-Time-Object/pkg-plist16
-rw-r--r--devel/p5-Time-Period/Makefile1
-rw-r--r--devel/p5-Time-Period/pkg-plist6
-rw-r--r--devel/p5-Time-Piece/Makefile1
-rw-r--r--devel/p5-Time-Piece/pkg-plist16
-rw-r--r--devel/p5-TimeDate/Makefile1
-rw-r--r--devel/p5-TimeDate/pkg-plist64
-rw-r--r--devel/p5-TraceFuncs/Makefile1
-rw-r--r--devel/p5-TraceFuncs/pkg-plist8
-rw-r--r--devel/p5-Tree-DAG_Node/Makefile1
-rw-r--r--devel/p5-Tree-DAG_Node/pkg-plist10
-rw-r--r--devel/p5-UNIVERSAL-exports/Makefile3
-rw-r--r--devel/p5-UNIVERSAL-exports/pkg-plist12
-rw-r--r--devel/p5-VCS-CVS/Makefile1
-rw-r--r--devel/p5-VCS-CVS/pkg-plist10
309 files changed, 1447 insertions, 1566 deletions
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index eece3edf5253..8733d2f2543b 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -46,7 +46,7 @@ NO_BUILD= yes
BINMODE= 700
PKGMESSAGE= ${WRKDIR}/pkg-message
-PERL_SITEDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITEDIR= ${SITE_PERL}
BUGZILLADIR?= www/data/bugzilla
BUGZILLADOCS= html images txt rel_notes.txt
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index eece3edf5253..8733d2f2543b 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -46,7 +46,7 @@ NO_BUILD= yes
BINMODE= 700
PKGMESSAGE= ${WRKDIR}/pkg-message
-PERL_SITEDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITEDIR= ${SITE_PERL}
BUGZILLADIR?= www/data/bugzilla
BUGZILLADOCS= html images txt rel_notes.txt
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index eece3edf5253..8733d2f2543b 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -46,7 +46,7 @@ NO_BUILD= yes
BINMODE= 700
PKGMESSAGE= ${WRKDIR}/pkg-message
-PERL_SITEDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITEDIR= ${SITE_PERL}
BUGZILLADIR?= www/data/bugzilla
BUGZILLADOCS= html images txt rel_notes.txt
diff --git a/devel/cons-test/Makefile b/devel/cons-test/Makefile
index 94a017148944..b766dd5c03be 100644
--- a/devel/cons-test/Makefile
+++ b/devel/cons-test/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= rv@FreeBSD.org
COMMENT= A test bed for `Cons' development
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 ${LOCALBASE}/bin/cons:${PORTSDIR}/devel/cons
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 ${LOCALBASE}/bin/cons:${PORTSDIR}/devel/cons
USE_PERL5= yes
NO_BUILD= yes
diff --git a/devel/cons/Makefile b/devel/cons/Makefile
index 1503224a3b42..d577a7cb8e1f 100644
--- a/devel/cons/Makefile
+++ b/devel/cons/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= rv@gnu.org
COMMENT= A Perl-based Make Replacement
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
USE_PERL5= yes
NO_BUILD= yes
diff --git a/devel/make++/Makefile b/devel/make++/Makefile
index b0333e4c5ae1..223bd0789396 100644
--- a/devel/make++/Makefile
+++ b/devel/make++/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME:S/+/p/g}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A drop-in replacement for GNU make
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
USE_PERL5= yes
DATADIR= ${PREFIX}/share/makepp
diff --git a/devel/p5-Agent/Makefile b/devel/p5-Agent/Makefile
index 13ca110f60de..89c6b0887111 100644
--- a/devel/p5-Agent/Makefile
+++ b/devel/p5-Agent/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module that provides a foundation for software agent developers
BUILD_DEPENDS= ${SITE_PERL}/Class/Tom.pm:${PORTSDIR}/devel/p5-Class-Tom
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Agent.3 Agent::Transport::TCP.3 \
Agent::Transport.3 Agent::Message.3
diff --git a/devel/p5-Agent/pkg-plist b/devel/p5-Agent/pkg-plist
index 1b63cd115f90..1596be8b1e93 100644
--- a/devel/p5-Agent/pkg-plist
+++ b/devel/p5-Agent/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Agent/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Agent/Transport.pm
-lib/perl5/site_perl/%%PERL_VER%%/Agent/Transport/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Agent/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Agent
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Agent/Transport
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Agent
+%%SITE_PERL%%/Agent.pm
+%%SITE_PERL%%/Agent/Message.pm
+%%SITE_PERL%%/Agent/Transport.pm
+%%SITE_PERL%%/Agent/Transport/TCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Agent/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Agent
+@dirrm %%SITE_PERL%%/Agent/Transport
+@dirrm %%SITE_PERL%%/Agent
diff --git a/devel/p5-Algorithm-Diff/Makefile b/devel/p5-Algorithm-Diff/Makefile
index 61fe2221a9ff..ee04f528c6d1 100644
--- a/devel/p5-Algorithm-Diff/Makefile
+++ b/devel/p5-Algorithm-Diff/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl interface to compute differences between two objects
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Algorithm::Diff.3 Algorithm::DiffOld.3
.include <bsd.port.mk>
diff --git a/devel/p5-Algorithm-Diff/pkg-plist b/devel/p5-Algorithm-Diff/pkg-plist
index c3cf8d0ac8f2..fdfdd6b3a417 100644
--- a/devel/p5-Algorithm-Diff/pkg-plist
+++ b/devel/p5-Algorithm-Diff/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm/Diff/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Algorithm/Diff.pm
-lib/perl5/site_perl/%%PERL_VER%%/Algorithm/DiffOld.pm
-lib/perl5/site_perl/%%PERL_VER%%/Algorithm/cdiff.pl
-lib/perl5/site_perl/%%PERL_VER%%/Algorithm/diff.pl
-lib/perl5/site_perl/%%PERL_VER%%/Algorithm/diffnew.pl
-lib/perl5/site_perl/%%PERL_VER%%/Algorithm/htmldiff.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm/Diff
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Algorithm 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Diff/.packlist
+%%SITE_PERL%%/Algorithm/Diff.pm
+%%SITE_PERL%%/Algorithm/DiffOld.pm
+%%SITE_PERL%%/Algorithm/cdiff.pl
+%%SITE_PERL%%/Algorithm/diff.pl
+%%SITE_PERL%%/Algorithm/diffnew.pl
+%%SITE_PERL%%/Algorithm/htmldiff.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Diff
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
diff --git a/devel/p5-Algorithm-MDiff/Makefile b/devel/p5-Algorithm-MDiff/Makefile
index 4910ad2dd1d2..615fd3adfeab 100644
--- a/devel/p5-Algorithm-MDiff/Makefile
+++ b/devel/p5-Algorithm-MDiff/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl interface to calculate m-difference between two objects
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Algorithm::MDiff.3
.include <bsd.port.mk>
diff --git a/devel/p5-Algorithm-MDiff/pkg-plist b/devel/p5-Algorithm-MDiff/pkg-plist
index 25e5f2f4bff5..78925d600a40 100644
--- a/devel/p5-Algorithm-MDiff/pkg-plist
+++ b/devel/p5-Algorithm-MDiff/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Algorithm/MDiff.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/MDiff.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/MDiff.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm/MDiff
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/MDiff.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/MDiff.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/MDiff.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
diff --git a/devel/p5-Alias/Makefile b/devel/p5-Alias/Makefile
index c32776946be9..ed4b5d06be2f 100644
--- a/devel/p5-Alias/Makefile
+++ b/devel/p5-Alias/Makefile
@@ -17,7 +17,6 @@ COMMENT= A perl module that performs aliasing services
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Alias.3
.include <bsd.port.mk>
diff --git a/devel/p5-Alias/pkg-plist b/devel/p5-Alias/pkg-plist
index 6b52838759d0..aebca86458f6 100644
--- a/devel/p5-Alias/pkg-plist
+++ b/devel/p5-Alias/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Alias.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Alias/Alias.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Alias/Alias.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Alias/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Alias
+%%SITE_PERL%%/%%PERL_ARCH%%/Alias.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Alias/Alias.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Alias/Alias.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Alias/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Alias
diff --git a/devel/p5-AppConfig-Std/pkg-plist b/devel/p5-AppConfig-Std/pkg-plist
index e6336a780171..4965e6bf5bef 100644
--- a/devel/p5-AppConfig-Std/pkg-plist
+++ b/devel/p5-AppConfig-Std/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/AppConfig/Std.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AppConfig/Std/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AppConfig 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AppConfig/Std
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AppConfig 2>/dev/null || true
+%%SITE_PERL%%/AppConfig/Std.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig/Std/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/AppConfig 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig/Std
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig 2>/dev/null || true
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 07cabe2e4896..7c93b0bb5ac8 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -18,7 +18,6 @@ COMMENT= AtExit - Perform exit processing for a program or object
PERL_CONFIGURE= yes
CONFIGURE_ARGS= INSTALLDIRS=site
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AtExit.3
.include <bsd.port.mk>
diff --git a/devel/p5-AtExit/pkg-plist b/devel/p5-AtExit/pkg-plist
index 9f56ef1cce25..71868c9eb447 100644
--- a/devel/p5-AtExit/pkg-plist
+++ b/devel/p5-AtExit/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AtExit/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/AtExit.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AtExit
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AtExit/.packlist
+%%SITE_PERL%%/AtExit.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AtExit
diff --git a/devel/p5-Attribute-Handlers/pkg-plist b/devel/p5-Attribute-Handlers/pkg-plist
index 9e8ab9a82d7e..45c64922201c 100644
--- a/devel/p5-Attribute-Handlers/pkg-plist
+++ b/devel/p5-Attribute-Handlers/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Attribute/Handlers/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Attribute/Handlers.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Attribute/Handlers
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Attribute
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/mach/auto 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Attribute
+%%SITE_PERL%%/mach/auto/Attribute/Handlers/.packlist
+%%SITE_PERL%%/Attribute/Handlers.pm
+@dirrm %%SITE_PERL%%/mach/auto/Attribute/Handlers
+@dirrm %%SITE_PERL%%/mach/auto/Attribute
+@unexec rmdir %D/%%SITE_PERL%%/mach/auto 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Attribute
diff --git a/devel/p5-B-Graph/Makefile b/devel/p5-B-Graph/Makefile
index cca5e0842853..6a432376dba6 100644
--- a/devel/p5-B-Graph/Makefile
+++ b/devel/p5-B-Graph/Makefile
@@ -17,6 +17,5 @@ COMMENT= Perl Compiler backend to diagram OP trees
PERL_CONFIGURE= yes
MAN3= B::Graph.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-B-Graph/pkg-plist b/devel/p5-B-Graph/pkg-plist
index d4928258a10b..b76ec491d4f4 100644
--- a/devel/p5-B-Graph/pkg-plist
+++ b/devel/p5-B-Graph/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/B/Graph.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/Graph/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/Graph
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/B 2>/dev/null || true
+%%SITE_PERL%%/B/Graph.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/B 2>/dev/null || true
diff --git a/devel/p5-BSD-Resource/pkg-plist b/devel/p5-BSD-Resource/pkg-plist
index b207c6d4ce3c..dd71c6bb7b2b 100644
--- a/devel/p5-BSD-Resource/pkg-plist
+++ b/devel/p5-BSD-Resource/pkg-plist
@@ -1,34 +1,34 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BSD/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/Resource.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/Resource.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/_g.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/get_rlimits.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/getpriority.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/getrlimit.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/getrusage.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/hard.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/idrss.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/inblock.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/isrss.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/ixrss.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/majflt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/maxrss.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/minflt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/msgrcv.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/msgsnd.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/nivcsw.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/nsignals.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/nswap.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/nvcsw.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/oublock.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/setpriority.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/setrlimit.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/soft.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/stime.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/times.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/utime.al
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BSD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/BSD/Resource.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/Resource.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/Resource.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/_g.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/get_rlimits.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/getpriority.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/getrlimit.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/getrusage.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/hard.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/idrss.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/inblock.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/isrss.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/ixrss.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/majflt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/maxrss.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/minflt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/msgrcv.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/msgsnd.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/nivcsw.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/nsignals.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/nswap.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/nvcsw.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/oublock.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/setpriority.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/setrlimit.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/soft.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/stime.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/times.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/utime.al
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/BSD 2>/dev/null || true
diff --git a/devel/p5-BSD-stat/Makefile b/devel/p5-BSD-stat/Makefile
index 492514cdd8f7..ab6e83bea6f0 100644
--- a/devel/p5-BSD-stat/Makefile
+++ b/devel/p5-BSD-stat/Makefile
@@ -17,7 +17,6 @@ COMMENT= A stat() with BSD 4.4 extentions
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= BSD::stat.3
.include <bsd.port.mk>
diff --git a/devel/p5-BSD-stat/pkg-plist b/devel/p5-BSD-stat/pkg-plist
index 78c6ed240643..ef56630a3308 100644
--- a/devel/p5-BSD-stat/pkg-plist
+++ b/devel/p5-BSD-stat/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/stat/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/stat/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/stat/stat.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/stat/stat.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BSD/stat.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/stat
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BSD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/stat.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/stat.so
+%%SITE_PERL%%/%%PERL_ARCH%%/BSD/stat.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/BSD 2>/dev/null || true
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index d9e9f1e87d78..a06d4ec813fd 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl5 module to scan C language files for easily recognized constructs
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/Flow.pm:${PORTSDIR}/devel/p5-Data-Flow
+BUILD_DEPENDS= ${SITE_PERL}/Data/Flow.pm:${PORTSDIR}/devel/p5-Data-Flow
PERL_CONFIGURE= yes
MAN3= C::Scan.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-C-Scan/pkg-plist b/devel/p5-C-Scan/pkg-plist
index 00aa50692937..34a1bd7c3967 100644
--- a/devel/p5-C-Scan/pkg-plist
+++ b/devel/p5-C-Scan/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/C/Scan.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/C/Scan/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/C/Scan
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/C 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/C 2> /dev/null || true
+%%SITE_PERL%%/C/Scan.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/C/Scan/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/C/Scan
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/C 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/C 2> /dev/null || true
diff --git a/devel/p5-Cache-Mmap/Makefile b/devel/p5-Cache-Mmap/Makefile
index ee67943c79cf..b159d470d71b 100644
--- a/devel/p5-Cache-Mmap/Makefile
+++ b/devel/p5-Cache-Mmap/Makefile
@@ -22,8 +22,8 @@ MAN3= Cache::Mmap.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Cache-Mmap/pkg-plist b/devel/p5-Cache-Mmap/pkg-plist
index d2d07423be3c..38133f0bc79c 100644
--- a/devel/p5-Cache-Mmap/pkg-plist
+++ b/devel/p5-Cache-Mmap/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cache/Mmap/Mmap.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cache/Mmap/Mmap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cache/Mmap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cache/Mmap.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cache/Mmap
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Mmap/Mmap.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Mmap/Mmap.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Mmap/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Cache/Mmap.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Mmap
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Cache 2>/dev/null || true
diff --git a/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile
index ff9c6aaafc51..fa7cf2119202 100644
--- a/devel/p5-Carp-Assert/Makefile
+++ b/devel/p5-Carp-Assert/Makefile
@@ -17,13 +17,12 @@ COMMENT= Executable comments like the ANSI C library assert.h
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Carp::Assert.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
.endif
diff --git a/devel/p5-Carp-Assert/pkg-plist b/devel/p5-Carp-Assert/pkg-plist
index 9634056ccf8d..9ae66fc4624d 100644
--- a/devel/p5-Carp-Assert/pkg-plist
+++ b/devel/p5-Carp-Assert/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Carp/Assert/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Assert.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Carp/Assert
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Carp 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Carp 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Assert/.packlist
+%%SITE_PERL%%/Carp/Assert.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Assert
+@unexec rmdir %D/%%SITE_PERL%%/Carp 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp 2>/dev/null || true
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index 1ba67500cb1a..82bb1aec0e90 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PM_BASE}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent \
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-PM_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PM_BASE= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN1= datum_strip.1
diff --git a/devel/p5-Carp-Datum/pkg-plist b/devel/p5-Carp-Datum/pkg-plist
index c5bd234e72d7..13d87ca2860e 100644
--- a/devel/p5-Carp-Datum/pkg-plist
+++ b/devel/p5-Carp-Datum/pkg-plist
@@ -1,15 +1,15 @@
bin/datum_strip
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum.pm
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum/Assert.pm
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum/Cfg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum/Flags.pm
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum/MakeMaker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum/Makefile
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum/Parser.y
-lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum/Strip.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Carp/Datum/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Carp/Datum
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Carp/Datum
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Carp 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Carp 2>/dev/null || true
+%%SITE_PERL%%/Carp/Datum.pm
+%%SITE_PERL%%/Carp/Datum/Assert.pm
+%%SITE_PERL%%/Carp/Datum/Cfg.pm
+%%SITE_PERL%%/Carp/Datum/Flags.pm
+%%SITE_PERL%%/Carp/Datum/MakeMaker.pm
+%%SITE_PERL%%/Carp/Datum/Makefile
+%%SITE_PERL%%/Carp/Datum/Parser.pm
+%%SITE_PERL%%/Carp/Datum/Parser.y
+%%SITE_PERL%%/Carp/Datum/Strip.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Datum/.packlist
+@dirrm %%SITE_PERL%%/Carp/Datum
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Datum
+@unexec rmdir %D/%%SITE_PERL%%/Carp 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp 2>/dev/null || true
diff --git a/devel/p5-Cdk/pkg-plist b/devel/p5-Cdk/pkg-plist
index 2e05c50c08c6..8033a6dc9197 100644
--- a/devel/p5-Cdk/pkg-plist
+++ b/devel/p5-Cdk/pkg-plist
@@ -1,31 +1,31 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Alphalist.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Buttonbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Calendar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Diag.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Dialog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Entry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Fselect.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Graph.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Histogram.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Itemlist.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Marquee.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Matrix.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Menu.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Mentry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Label.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Radio.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Scale.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Scroll.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Selection.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Slider.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Swindow.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk/Viewer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cdk/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cdk/Cdk.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cdk/Cdk.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cdk/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cdk
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cdk
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Alphalist.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Buttonbox.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Calendar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Debug.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Diag.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Dialog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Entry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Fselect.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Graph.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Histogram.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Itemlist.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Marquee.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Matrix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Menu.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Mentry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Label.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Radio.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Scale.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Scroll.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Selection.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Slider.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Swindow.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Template.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cdk/Viewer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cdk/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cdk/Cdk.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cdk/Cdk.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cdk/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cdk
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cdk
diff --git a/devel/p5-Class-Accessor/Makefile b/devel/p5-Class-Accessor/Makefile
index f06f79a722f4..ead193f746a8 100644
--- a/devel/p5-Class-Accessor/Makefile
+++ b/devel/p5-Class-Accessor/Makefile
@@ -17,7 +17,6 @@ COMMENT= Automated accessor generation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::Accessor.3 Class::Accessor::Fast.3
.include <bsd.port.pre.mk>
diff --git a/devel/p5-Class-ArrayObjects/pkg-plist b/devel/p5-Class-ArrayObjects/pkg-plist
index bc0dba9d6aec..d8d012277191 100644
--- a/devel/p5-Class-ArrayObjects/pkg-plist
+++ b/devel/p5-Class-ArrayObjects/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/ArrayObjects/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/ArrayObjects.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/ArrayObjects
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ArrayObjects/.packlist
+%%SITE_PERL%%/Class/ArrayObjects.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ArrayObjects
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-BlackHole/Makefile b/devel/p5-Class-BlackHole/Makefile
index 5b02c89fa9ff..35d78cf77a4c 100644
--- a/devel/p5-Class-BlackHole/Makefile
+++ b/devel/p5-Class-BlackHole/Makefile
@@ -17,7 +17,6 @@ COMMENT= Base class to treat unhandled method calls as no-ops
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::BlackHole.3
.include <bsd.port.mk>
diff --git a/devel/p5-Class-BlackHole/pkg-plist b/devel/p5-Class-BlackHole/pkg-plist
index 1842d35c5914..06e0d3ee40dc 100644
--- a/devel/p5-Class-BlackHole/pkg-plist
+++ b/devel/p5-Class-BlackHole/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/BlackHole/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/BlackHole.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/BlackHole
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/BlackHole/.packlist
+%%SITE_PERL%%/Class/BlackHole.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/BlackHole
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Contract/Makefile b/devel/p5-Class-Contract/Makefile
index c82b7f1dc6c8..5580bd70f6d8 100644
--- a/devel/p5-Class-Contract/Makefile
+++ b/devel/p5-Class-Contract/Makefile
@@ -18,7 +18,6 @@ COMMENT= Design-by-Contract OO in Perl
PERL_CONFIGURE= yes
PLIST_SUB+= EXAMPLESDIR="share/examples/${PORTNAME}"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::Contract.3 Class::Contract::Production.3
post-patch:
diff --git a/devel/p5-Class-Contract/pkg-plist b/devel/p5-Class-Contract/pkg-plist
index 74e53c6298cf..f1933c591230 100644
--- a/devel/p5-Class-Contract/pkg-plist
+++ b/devel/p5-Class-Contract/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Contract/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/Contract.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/Contract/Production.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Contract/.packlist
+%%SITE_PERL%%/Class/Contract.pm
+%%SITE_PERL%%/Class/Contract/Production.pm
%%PORTDOCS%%%%EXAMPLESDIR%%/demo.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Contract
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Contract
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Class/Contract
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Contract
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Data-Inheritable/Makefile b/devel/p5-Class-Data-Inheritable/Makefile
index d2bc3973c59a..35d4b26e8a96 100644
--- a/devel/p5-Class-Data-Inheritable/Makefile
+++ b/devel/p5-Class-Data-Inheritable/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Inheritable, overridable class data
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/base.pm:${PORTSDIR}/devel/p5-Class-Fields
+BUILD_DEPENDS= ${SITE_PERL}/base.pm:${PORTSDIR}/devel/p5-Class-Fields
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::Data::Inheritable.3
.include <bsd.port.mk>
diff --git a/devel/p5-Class-Data-Inheritable/pkg-plist b/devel/p5-Class-Data-Inheritable/pkg-plist
index 845f29ac7bbc..6c86a1d05c42 100644
--- a/devel/p5-Class-Data-Inheritable/pkg-plist
+++ b/devel/p5-Class-Data-Inheritable/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Data/Inheritable/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/Data/Inheritable.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Data/Inheritable
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data/Inheritable/.packlist
+%%SITE_PERL%%/Class/Data/Inheritable.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data/Inheritable
+@unexec rmdir %D/%%SITE_PERL%%/Class/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Date/Makefile b/devel/p5-Class-Date/Makefile
index 5117b4529c94..a23a5ed1d983 100644
--- a/devel/p5-Class-Date/Makefile
+++ b/devel/p5-Class-Date/Makefile
@@ -17,7 +17,6 @@ COMMENT= A Perl class for easy date and time manipulation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::Date.3
.include <bsd.port.mk>
diff --git a/devel/p5-Class-Date/pkg-plist b/devel/p5-Class-Date/pkg-plist
index 8a0f116c05e9..cd13f7bb71e4 100644
--- a/devel/p5-Class-Date/pkg-plist
+++ b/devel/p5-Class-Date/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class/Date.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class/Date/Const.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Date/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Date/Date.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Date/Date.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Date
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class/Date
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/Date.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/Date.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/Date/Const.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date/Date.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date/Date.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Class/Date
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Default/Makefile b/devel/p5-Class-Default/Makefile
index 3980c1685d64..6c924cb02bc2 100644
--- a/devel/p5-Class-Default/Makefile
+++ b/devel/p5-Class-Default/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Static calls apply to a default instantiation
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS= ${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-Default/pkg-plist b/devel/p5-Class-Default/pkg-plist
index c744ee0f56b9..9c8910bf99d0 100644
--- a/devel/p5-Class-Default/pkg-plist
+++ b/devel/p5-Class-Default/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Default/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/Default.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Default
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Default/.packlist
+%%SITE_PERL%%/Class/Default.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Default
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Generate/Makefile b/devel/p5-Class-Generate/Makefile
index a4d182eb3528..bcf90d3db146 100644
--- a/devel/p5-Class-Generate/Makefile
+++ b/devel/p5-Class-Generate/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Perl5 module to simplify creating class hierarchies
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::Generate.3
diff --git a/devel/p5-Class-Generate/pkg-plist b/devel/p5-Class-Generate/pkg-plist
index 5871c5d5b56d..299183788eba 100644
--- a/devel/p5-Class-Generate/pkg-plist
+++ b/devel/p5-Class-Generate/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Class/Generate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/Generate.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Generate/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Class
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Generate
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class
+%%SITE_PERL%%/Class/Generate.pm
+%%SITE_PERL%%/Class/Generate.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Generate/.packlist
+@dirrm %%SITE_PERL%%/Class
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Generate
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Hook/Makefile b/devel/p5-Class-Hook/Makefile
index 4d23f44fa3d6..b0a7d0fd03db 100644
--- a/devel/p5-Class-Hook/Makefile
+++ b/devel/p5-Class-Hook/Makefile
@@ -22,9 +22,8 @@ BUILD_DEPENDS= ${ARCH_PERL}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
PERL_CONFIGURE= yes
MAN3= Class::Hook.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-ARCH_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}
.include <bsd.port.mk>
diff --git a/devel/p5-Class-Hook/pkg-plist b/devel/p5-Class-Hook/pkg-plist
index eab3fc0bb924..f00bdf1b2309 100644
--- a/devel/p5-Class-Hook/pkg-plist
+++ b/devel/p5-Class-Hook/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Class/Hook.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/FOO.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Hook/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Hook
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
+%%SITE_PERL%%/Class/Hook.pm
+%%SITE_PERL%%/Class/FOO.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Hook/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Hook
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
diff --git a/devel/p5-Class-ISA/Makefile b/devel/p5-Class-ISA/Makefile
index 56e6f0760279..d8be6dd896b3 100644
--- a/devel/p5-Class-ISA/Makefile
+++ b/devel/p5-Class-ISA/Makefile
@@ -17,7 +17,6 @@ COMMENT= Report the search path for a class's ISA tree
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::ISA.3
.include <bsd.port.mk>
diff --git a/devel/p5-Class-ISA/pkg-plist b/devel/p5-Class-ISA/pkg-plist
index bd78ebcc6527..0ac9ecc99ead 100644
--- a/devel/p5-Class-ISA/pkg-plist
+++ b/devel/p5-Class-ISA/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/ISA/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/ISA.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/ISA
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ISA/.packlist
+%%SITE_PERL%%/Class/ISA.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ISA
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Inner/pkg-plist b/devel/p5-Class-Inner/pkg-plist
index fa8d7e4151e1..c1ede60f095b 100644
--- a/devel/p5-Class-Inner/pkg-plist
+++ b/devel/p5-Class-Inner/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Inner/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/Inner.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Inner
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Inner/.packlist
+%%SITE_PERL%%/Class/Inner.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Inner
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Loader/Makefile b/devel/p5-Class-Loader/Makefile
index a6f38f0086fe..3aeeeee1d919 100644
--- a/devel/p5-Class-Loader/Makefile
+++ b/devel/p5-Class-Loader/Makefile
@@ -18,6 +18,5 @@ COMMENT= Load modules and create objects on demand
PERL_CONFIGURE= yes
MAN3= Class::Loader.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Class-Loader/pkg-plist b/devel/p5-Class-Loader/pkg-plist
index 89e97c5b517e..0bd75aec555b 100644
--- a/devel/p5-Class-Loader/pkg-plist
+++ b/devel/p5-Class-Loader/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Loader/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/Loader.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/LoaderTest.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Loader
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Loader/.packlist
+%%SITE_PERL%%/Class/Loader.pm
+%%SITE_PERL%%/Class/LoaderTest.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Loader
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-MakeMethods/Makefile b/devel/p5-Class-MakeMethods/Makefile
index 74d9f02f8893..5014b7de6343 100644
--- a/devel/p5-Class-MakeMethods/Makefile
+++ b/devel/p5-Class-MakeMethods/Makefile
@@ -65,6 +65,5 @@ MAN3= Class::MakeMethods.3 \
Class::MakeMethods::Utility::ArraySplicer.3 \
Class::MakeMethods::Utility::Inheritable.3 \
Class::MakeMethods::Utility::Ref.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Class-MakeMethods/pkg-plist b/devel/p5-Class-MakeMethods/pkg-plist
index ec4638ed0d0a..7056fd6f3916 100644
--- a/devel/p5-Class-MakeMethods/pkg-plist
+++ b/devel/p5-Class-MakeMethods/pkg-plist
@@ -1,64 +1,64 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/MakeMethods/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Attribute.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Autoload.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Basic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Basic/Array.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Basic/Global.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Basic/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Composite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Composite/Array.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Composite/Global.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Composite/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Composite/Inheritable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Composite/Universal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Docs/Catalog.pod
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Docs/Changes.pod
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Docs/Examples.pod
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Docs/ReadMe.pod
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Docs/RelatedModules.pod
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Docs/ToDo.pod
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Emulator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Emulator/AccessorFast.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Emulator/Inheritable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Emulator/MethodMaker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Emulator/Singleton.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Emulator/Struct.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Standard.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Standard/Array.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Standard/Global.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Standard/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Standard/Inheritable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Standard/Universal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Class.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/ClassInherit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/ClassName.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/ClassVar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/DiskCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Flyweight.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/PackageVar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/PseudoHash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Ref.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Scalar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Static.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Struct.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/StructBuiltin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/TextBuilder.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template/Universal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Utility/ArraySplicer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Utility/Inheritable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Utility/Ref.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Basic 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Composite 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Docs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Emulator 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Standard 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Template 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods/Utility 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class/MakeMethods 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/MakeMethods 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MakeMethods/.packlist
+%%SITE_PERL%%/Class/MakeMethods.pm
+%%SITE_PERL%%/Class/MakeMethods/Attribute.pm
+%%SITE_PERL%%/Class/MakeMethods/Autoload.pm
+%%SITE_PERL%%/Class/MakeMethods/Basic.pm
+%%SITE_PERL%%/Class/MakeMethods/Basic/Array.pm
+%%SITE_PERL%%/Class/MakeMethods/Basic/Global.pm
+%%SITE_PERL%%/Class/MakeMethods/Basic/Hash.pm
+%%SITE_PERL%%/Class/MakeMethods/Composite.pm
+%%SITE_PERL%%/Class/MakeMethods/Composite/Array.pm
+%%SITE_PERL%%/Class/MakeMethods/Composite/Global.pm
+%%SITE_PERL%%/Class/MakeMethods/Composite/Hash.pm
+%%SITE_PERL%%/Class/MakeMethods/Composite/Inheritable.pm
+%%SITE_PERL%%/Class/MakeMethods/Composite/Universal.pm
+%%SITE_PERL%%/Class/MakeMethods/Docs/Catalog.pod
+%%SITE_PERL%%/Class/MakeMethods/Docs/Changes.pod
+%%SITE_PERL%%/Class/MakeMethods/Docs/Examples.pod
+%%SITE_PERL%%/Class/MakeMethods/Docs/ReadMe.pod
+%%SITE_PERL%%/Class/MakeMethods/Docs/RelatedModules.pod
+%%SITE_PERL%%/Class/MakeMethods/Docs/ToDo.pod
+%%SITE_PERL%%/Class/MakeMethods/Emulator.pm
+%%SITE_PERL%%/Class/MakeMethods/Emulator/AccessorFast.pm
+%%SITE_PERL%%/Class/MakeMethods/Emulator/Inheritable.pm
+%%SITE_PERL%%/Class/MakeMethods/Emulator/MethodMaker.pm
+%%SITE_PERL%%/Class/MakeMethods/Emulator/Singleton.pm
+%%SITE_PERL%%/Class/MakeMethods/Emulator/Struct.pm
+%%SITE_PERL%%/Class/MakeMethods/Standard.pm
+%%SITE_PERL%%/Class/MakeMethods/Standard/Array.pm
+%%SITE_PERL%%/Class/MakeMethods/Standard/Global.pm
+%%SITE_PERL%%/Class/MakeMethods/Standard/Hash.pm
+%%SITE_PERL%%/Class/MakeMethods/Standard/Inheritable.pm
+%%SITE_PERL%%/Class/MakeMethods/Standard/Universal.pm
+%%SITE_PERL%%/Class/MakeMethods/Template.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Class.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/ClassInherit.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/ClassName.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/ClassVar.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/DiskCache.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Flyweight.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Generic.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Hash.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/PackageVar.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/PseudoHash.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Ref.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Scalar.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Static.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Struct.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/StructBuiltin.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/TextBuilder.pm
+%%SITE_PERL%%/Class/MakeMethods/Template/Universal.pm
+%%SITE_PERL%%/Class/MakeMethods/Utility/ArraySplicer.pm
+%%SITE_PERL%%/Class/MakeMethods/Utility/Inheritable.pm
+%%SITE_PERL%%/Class/MakeMethods/Utility/Ref.pm
+@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Basic 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Composite 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Docs 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Emulator 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Standard 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Template 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Utility 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MakeMethods 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-ReturnValue/pkg-plist b/devel/p5-Class-ReturnValue/pkg-plist
index 0ece6e1729bc..c75871ac96ae 100644
--- a/devel/p5-Class-ReturnValue/pkg-plist
+++ b/devel/p5-Class-ReturnValue/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/ReturnValue/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/ReturnValue.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/ReturnValue
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ReturnValue/.packlist
+%%SITE_PERL%%/Class/ReturnValue.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ReturnValue
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Singleton/Makefile b/devel/p5-Class-Singleton/Makefile
index 4388fd15790c..73bbb51ec428 100644
--- a/devel/p5-Class-Singleton/Makefile
+++ b/devel/p5-Class-Singleton/Makefile
@@ -15,10 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl module that describes a singular object class
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::Singleton.3
.include <bsd.port.mk>
diff --git a/devel/p5-Class-Singleton/pkg-plist b/devel/p5-Class-Singleton/pkg-plist
index 432a33a5784c..429f35e5b447 100644
--- a/devel/p5-Class-Singleton/pkg-plist
+++ b/devel/p5-Class-Singleton/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Class/Singleton.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Singleton/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Singleton
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
+%%SITE_PERL%%/Class/Singleton.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Singleton/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Singleton
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Tangram/Makefile b/devel/p5-Class-Tangram/Makefile
index a58a8ddf2c87..f85ef2bd96de 100644
--- a/devel/p5-Class-Tangram/Makefile
+++ b/devel/p5-Class-Tangram/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Create constructors, accessor, update methods for objects from Tangram
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Set/Object.pm:${PORTSDIR}/devel/p5-Set-Object \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Constants.pm:${PORTSDIR}/textproc/p5-Pod-Constants \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Tangram.pm:${PORTSDIR}/databases/p5-Tangram
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Set/Object.pm:${PORTSDIR}/devel/p5-Set-Object \
+ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
+ ${SITE_PERL}/Pod/Constants.pm:${PORTSDIR}/textproc/p5-Pod-Constants \
+ ${SITE_PERL}/Tangram.pm:${PORTSDIR}/databases/p5-Tangram
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::Tangram.3
.include <bsd.port.mk>
diff --git a/devel/p5-Class-Tangram/pkg-plist b/devel/p5-Class-Tangram/pkg-plist
index 9a2158b46d5c..623a7654bd43 100644
--- a/devel/p5-Class-Tangram/pkg-plist
+++ b/devel/p5-Class-Tangram/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Tangram/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/Tangram.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Tangram
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tangram/.packlist
+%%SITE_PERL%%/Class/Tangram.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tangram
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 383f658c6ea1..7aa40d3adf4e 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
SITE_PERL= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::Tom.3
.include <bsd.port.mk>
diff --git a/devel/p5-Class-Tom/pkg-plist b/devel/p5-Class-Tom/pkg-plist
index cb0ebaaa605b..2c0dc9d8d1e3 100644
--- a/devel/p5-Class-Tom/pkg-plist
+++ b/devel/p5-Class-Tom/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/Class/Tom/Encode.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/Tom/Encode/Base64.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/Tom/Code.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/Tom.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Tom/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Tom
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Tom/Encode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Tom
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
+%%SITE_PERL%%/Class/Tom/Encode.pm
+%%SITE_PERL%%/Class/Tom/Encode/Base64.pm
+%%SITE_PERL%%/Class/Tom/Code.pm
+%%SITE_PERL%%/Class/Tom.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tom/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tom
+@dirrm %%SITE_PERL%%/Class/Tom/Encode
+@dirrm %%SITE_PERL%%/Class/Tom
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
diff --git a/devel/p5-Class-WhiteHole/Makefile b/devel/p5-Class-WhiteHole/Makefile
index 35412f308d94..d311972a9800 100644
--- a/devel/p5-Class-WhiteHole/Makefile
+++ b/devel/p5-Class-WhiteHole/Makefile
@@ -17,7 +17,6 @@ COMMENT= Base class to treat unhandled method calls as errors
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Class::WhiteHole.3
.include <bsd.port.mk>
diff --git a/devel/p5-Class-WhiteHole/pkg-plist b/devel/p5-Class-WhiteHole/pkg-plist
index 1477f7e49595..48798fbb2a00 100644
--- a/devel/p5-Class-WhiteHole/pkg-plist
+++ b/devel/p5-Class-WhiteHole/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/WhiteHole/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Class/WhiteHole.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/WhiteHole
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/WhiteHole/.packlist
+%%SITE_PERL%%/Class/WhiteHole.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/WhiteHole
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Clone/Makefile b/devel/p5-Clone/Makefile
index 880310b29793..5676fb5179ff 100644
--- a/devel/p5-Clone/Makefile
+++ b/devel/p5-Clone/Makefile
@@ -18,7 +18,6 @@ COMMENT= Clone - recursively copy Perl datatypes
PERL_CONFIGURE= yes
MAN3= Clone.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e 'm.OPTIMIZE.&&s,.,,sg' ${WRKSRC}/Makefile.PL
diff --git a/devel/p5-Clone/pkg-plist b/devel/p5-Clone/pkg-plist
index 302c14e63d6b..ae7b16123494 100644
--- a/devel/p5-Clone/pkg-plist
+++ b/devel/p5-Clone/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Clone/Clone.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Clone/Clone.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Clone/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Clone/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Clone.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Clone
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/Clone.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/Clone.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Clone.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clone
diff --git a/devel/p5-Config-Ini/Makefile b/devel/p5-Config-Ini/Makefile
index 7f65f0a82f6a..679bec96b880 100644
--- a/devel/p5-Config-Ini/Makefile
+++ b/devel/p5-Config-Ini/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl interface to MS-Windows registry and .ini files
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS= ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Config::Ini.3
.include <bsd.port.mk>
diff --git a/devel/p5-Config-Ini/pkg-plist b/devel/p5-Config-Ini/pkg-plist
index c346af32fcdd..06e60960faca 100644
--- a/devel/p5-Config-Ini/pkg-plist
+++ b/devel/p5-Config-Ini/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Config/Ini.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Config/Ini/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config/Ini/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config/Ini
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Config/Ini
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Config 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Config 2>/dev/null || true
+%%SITE_PERL%%/Config/Ini.pm
+%%SITE_PERL%%/auto/Config/Ini/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Ini/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Ini
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/Config/Ini
+@unexec rmdir %D/%%SITE_PERL%%/auto/Config 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
diff --git a/devel/p5-Config-Setting/Makefile b/devel/p5-Config-Setting/Makefile
index 50320a590058..4a25c428de93 100644
--- a/devel/p5-Config-Setting/Makefile
+++ b/devel/p5-Config-Setting/Makefile
@@ -14,11 +14,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
COMMENT= A class that provides an easy interface to use config files
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Config::Setting.3 \
Config::Setting::Fileprovider.3 \
Config::Setting::IniParser.3 \
diff --git a/devel/p5-Config-Setting/pkg-plist b/devel/p5-Config-Setting/pkg-plist
index 1f233d35343a..c10b58d1b6d7 100644
--- a/devel/p5-Config-Setting/pkg-plist
+++ b/devel/p5-Config-Setting/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Config/Setting.pm
-lib/perl5/site_perl/%%PERL_VER%%/Config/Setting/FileProvider.pm
-lib/perl5/site_perl/%%PERL_VER%%/Config/Setting/IniParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/Config/Setting/XMLParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config/Setting/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config/Setting
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Config/Setting
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Config 2>/dev/null || true
+%%SITE_PERL%%/Config/Setting.pm
+%%SITE_PERL%%/Config/Setting/FileProvider.pm
+%%SITE_PERL%%/Config/Setting/IniParser.pm
+%%SITE_PERL%%/Config/Setting/XMLParser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Setting/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Setting
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Config/Setting
+@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
diff --git a/devel/p5-ConfigReader/pkg-plist b/devel/p5-ConfigReader/pkg-plist
index 8d3e68fe814a..4657e53f90bb 100644
--- a/devel/p5-ConfigReader/pkg-plist
+++ b/devel/p5-ConfigReader/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/ConfigReader/DirectiveStyle.pm
-lib/perl5/site_perl/%%PERL_VER%%/ConfigReader/Spec.pm
-lib/perl5/site_perl/%%PERL_VER%%/ConfigReader/Values.pm
-lib/perl5/site_perl/%%PERL_VER%%/ConfigReader.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ConfigReader
+%%SITE_PERL%%/ConfigReader/DirectiveStyle.pm
+%%SITE_PERL%%/ConfigReader/Spec.pm
+%%SITE_PERL%%/ConfigReader/Values.pm
+%%SITE_PERL%%/ConfigReader.pod
+@dirrm %%SITE_PERL%%/ConfigReader
diff --git a/devel/p5-Coro/Makefile b/devel/p5-Coro/Makefile
index 6f2e39a86c54..19958d5bbb0c 100644
--- a/devel/p5-Coro/Makefile
+++ b/devel/p5-Coro/Makefile
@@ -28,7 +28,6 @@ PERL_CONFIGURE= yes
BROKEN= "This port requires perl 5.6 or newer"
.endif
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Coro.3 \
Coro::Channel.3 \
Coro::Cont.3 \
diff --git a/devel/p5-Coro/pkg-plist b/devel/p5-Coro/pkg-plist
index 41b51e1655de..8fa2f8e4cc14 100644
--- a/devel/p5-Coro/pkg-plist
+++ b/devel/p5-Coro/pkg-plist
@@ -1,26 +1,26 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Coro/Event/Event.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Coro/Event/Event.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Coro/State/State.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Coro/State/State.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Coro/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Cont.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/State.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Channel.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Semaphore.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/SemaphoreSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/RWLock.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/CoroAPI.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Specific.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Timer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/MakeMaker.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Signal.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Handle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Event.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro/Socket.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Coro/Event
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Coro/State
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Coro
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Coro
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/mach 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/Event/Event.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/Event/Event.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/State/State.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/State/State.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Cont.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/State.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Channel.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Semaphore.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/SemaphoreSet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/RWLock.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/CoroAPI.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Specific.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Timer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/MakeMaker.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Signal.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Handle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Event.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Coro/Socket.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/Event
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro/State
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Coro
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Coro
+@unexec rmdir %D/%%SITE_PERL%%/mach 2>/dev/null || true
diff --git a/devel/p5-Curses-Application/Makefile b/devel/p5-Curses-Application/Makefile
index 23d74a194b16..1d2d78e9507c 100644
--- a/devel/p5-Curses-Application/Makefile
+++ b/devel/p5-Curses-Application/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Curses::Application.3
.include <bsd.port.mk>
diff --git a/devel/p5-Curses-Forms/Makefile b/devel/p5-Curses-Forms/Makefile
index 953dd5333631..3046825c7bf6 100644
--- a/devel/p5-Curses-Forms/Makefile
+++ b/devel/p5-Curses-Forms/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Curses::Forms.3 \
Curses::Forms::Dialog.3 \
Curses::Forms::Dialog::Input.3 \
diff --git a/devel/p5-Curses-Widgets/Makefile b/devel/p5-Curses-Widgets/Makefile
index eb54ab943d6f..45bf80b1e57a 100644
--- a/devel/p5-Curses-Widgets/Makefile
+++ b/devel/p5-Curses-Widgets/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Curses::Widgets::Label.3 \
Curses::Widgets.3 \
Curses::Widgets::TextMemo.3 \
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index e741658bb70b..d64c7f20ffaa 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl5 module for terminal screen handling and optimization
PERL_CONFIGURE= yes
MAN3= Curses.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-configure:
@${LN} -s ${WRKSRC}/hints/c-freebsd.ncurses.h \
diff --git a/devel/p5-Curses/pkg-plist b/devel/p5-Curses/pkg-plist
index 666976165cda..a9c7ab4ce820 100644
--- a/devel/p5-Curses/pkg-plist
+++ b/devel/p5-Curses/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Curses.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Curses/Curses.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Curses/Curses.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Curses/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Curses
+%%SITE_PERL%%/%%PERL_ARCH%%/Curses.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/Curses.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/Curses.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses
diff --git a/devel/p5-DB_File-Lock/Makefile b/devel/p5-DB_File-Lock/Makefile
index b9d638e3633b..b4a6029eecb5 100644
--- a/devel/p5-DB_File-Lock/Makefile
+++ b/devel/p5-DB_File-Lock/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= DB_File::Lock.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-DB_File-Lock/pkg-plist b/devel/p5-DB_File-Lock/pkg-plist
index cd093f21fdbe..ac59f0a78742 100644
--- a/devel/p5-DB_File-Lock/pkg-plist
+++ b/devel/p5-DB_File-Lock/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/DB_File/Lock.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File/Lock/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File/Lock 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DB_File 2>/dev/null || true
+%%SITE_PERL%%/DB_File/Lock.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File/Lock/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File/Lock 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DB_File 2>/dev/null || true
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index 0ea7c5cc48b9..7e3bd1a44ed8 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -18,6 +18,5 @@ COMMENT= Data::Compare - compare perl data structures
PERL_CONFIGURE= yes
MAN3= Data::Compare.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Data-Compare/pkg-plist b/devel/p5-Data-Compare/pkg-plist
index 10cb9cd66f0a..1495000b7c1b 100644
--- a/devel/p5-Data-Compare/pkg-plist
+++ b/devel/p5-Data-Compare/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Compare/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/Compare.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Compare
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Compare/.packlist
+%%SITE_PERL%%/Data/Compare.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Compare
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
diff --git a/devel/p5-Data-DumpXML/Makefile b/devel/p5-Data-DumpXML/Makefile
index 52a43921a0a5..638ef50eecfc 100644
--- a/devel/p5-Data-DumpXML/Makefile
+++ b/devel/p5-Data-DumpXML/Makefile
@@ -20,12 +20,11 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Array/RefElem.pm:${PORTSDIR}/misc/p5-Ar
${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Data::DumpXML.3 \
Data::DumpXML::Parser.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Data-DumpXML/pkg-plist b/devel/p5-Data-DumpXML/pkg-plist
index a82141639f0d..b4847c9f1602 100644
--- a/devel/p5-Data-DumpXML/pkg-plist
+++ b/devel/p5-Data-DumpXML/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Data/DumpXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Data/DumpXML/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/DumpXML/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data/DumpXML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/DumpXML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+%%SITE_PERL%%/Data/DumpXML.pm
+%%SITE_PERL%%/Data/DumpXML/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/DumpXML/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Data/DumpXML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/DumpXML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
diff --git a/devel/p5-Data-HexDump/Makefile b/devel/p5-Data-HexDump/Makefile
index e04d863c2fbf..26a9b439f5da 100644
--- a/devel/p5-Data-HexDump/Makefile
+++ b/devel/p5-Data-HexDump/Makefile
@@ -17,7 +17,6 @@ COMMENT= A simple hexadecimal dumper
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Data::HexDump.3
.include <bsd.port.mk>
diff --git a/devel/p5-Data-HexDump/pkg-plist b/devel/p5-Data-HexDump/pkg-plist
index e4c95e982120..32d0209704f7 100644
--- a/devel/p5-Data-HexDump/pkg-plist
+++ b/devel/p5-Data-HexDump/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/HexDump/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/HexDump/.packlist
bin/hexdump
-lib/perl5/site_perl/%%PERL_VER%%/Data/HexDump.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/HexDump
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+%%SITE_PERL%%/Data/HexDump.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/HexDump
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
diff --git a/devel/p5-Data-Properties/Makefile b/devel/p5-Data-Properties/Makefile
index 04baf4873854..6eea93921f8a 100644
--- a/devel/p5-Data-Properties/Makefile
+++ b/devel/p5-Data-Properties/Makefile
@@ -18,6 +18,5 @@ COMMENT= Data::Properties - persistent properties
PERL_CONFIGURE= yes
MAN3= Data::Properties.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Data-Properties/pkg-plist b/devel/p5-Data-Properties/pkg-plist
index cc583cb80fb5..ad985a0bd276 100644
--- a/devel/p5-Data-Properties/pkg-plist
+++ b/devel/p5-Data-Properties/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Properties/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/Properties.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Properties
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Properties/.packlist
+%%SITE_PERL%%/Data/Properties.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Properties
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
diff --git a/devel/p5-Data-ShowTable/pkg-plist b/devel/p5-Data-ShowTable/pkg-plist
index 77d8b2c37144..d401bab5ae4d 100644
--- a/devel/p5-Data-ShowTable/pkg-plist
+++ b/devel/p5-Data-ShowTable/pkg-plist
@@ -1,6 +1,6 @@
bin/showtable
-lib/perl5/site_perl/%%PERL_VER%%/Data/ShowTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/ShowTable/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/ShowTable
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+%%SITE_PERL%%/Data/ShowTable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ShowTable/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ShowTable
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index ba3edc577049..c49fbd90f2f9 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -22,7 +22,6 @@ PERL_CONFIGURE= yes
MAN3= Date::Calc.3 Date::Calc::Object.3 Date::Calendar.3 \
Date::Calendar::Profiles.3 Date::Calendar::Year.3
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+SITE_PERL= ${SITE_PERL}
.include <bsd.port.mk>
diff --git a/devel/p5-Date-Calc/pkg-plist b/devel/p5-Date-Calc/pkg-plist
index f867a601279b..ac50746e80c5 100644
--- a/devel/p5-Date-Calc/pkg-plist
+++ b/devel/p5-Date-Calc/pkg-plist
@@ -1,19 +1,19 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calc.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calc/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calc/Object.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calendar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calendar.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calendar/Profiles.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calendar/Profiles.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calendar/Year.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calendar/Year.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Calc/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Calc/Calc.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Calc/Calc.bs
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Calc
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calendar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc/Object.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc/Object.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar/Profiles.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar/Profiles.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar/Year.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar/Year.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/Calc.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/Calc.bs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
diff --git a/devel/p5-Date-DayOfWeek/pkg-plist b/devel/p5-Date-DayOfWeek/pkg-plist
index 4f7f116f2f37..f61888e719b1 100644
--- a/devel/p5-Date-DayOfWeek/pkg-plist
+++ b/devel/p5-Date-DayOfWeek/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/Date/Doomsday.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/DayOfWeek.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/DayOfWeek/Birthday.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/DayOfWeek/Nails.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/DayOfWeek/Sneeze.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/DayOfWeek/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Date/DayOfWeek
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/DayOfWeek
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+%%SITE_PERL%%/Date/Doomsday.pm
+%%SITE_PERL%%/Date/DayOfWeek.pm
+%%SITE_PERL%%/Date/DayOfWeek/Birthday.pm
+%%SITE_PERL%%/Date/DayOfWeek/Nails.pm
+%%SITE_PERL%%/Date/DayOfWeek/Sneeze.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/DayOfWeek/.packlist
+@dirrm %%SITE_PERL%%/Date/DayOfWeek
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/DayOfWeek
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
diff --git a/devel/p5-Date-Leapyear/Makefile b/devel/p5-Date-Leapyear/Makefile
index da9902f6985b..773897934419 100644
--- a/devel/p5-Date-Leapyear/Makefile
+++ b/devel/p5-Date-Leapyear/Makefile
@@ -16,12 +16,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl module to determine if a particular year a leap year
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Date::Leapyear.3
.include <bsd.port.mk>
diff --git a/devel/p5-Date-Leapyear/pkg-plist b/devel/p5-Date-Leapyear/pkg-plist
index 74ad061abbe7..626a0af1ceae 100644
--- a/devel/p5-Date-Leapyear/pkg-plist
+++ b/devel/p5-Date-Leapyear/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Date/Leapyear.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Leapyear/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Leapyear
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
+%%SITE_PERL%%/Date/Leapyear.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Leapyear/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Leapyear
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
diff --git a/devel/p5-Date-Pcalc/Makefile b/devel/p5-Date-Pcalc/Makefile
index 5bbca69db8c1..8eebd48145f9 100644
--- a/devel/p5-Date-Pcalc/Makefile
+++ b/devel/p5-Date-Pcalc/Makefile
@@ -20,6 +20,5 @@ COMMENT= Gregorian calendar date calculations
PERL_CONFIGURE= yes
MAN3= Date::Pcalc.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Date-Pcalc/pkg-plist b/devel/p5-Date-Pcalc/pkg-plist
index b3088dd09985..ce74c2508d1f 100644
--- a/devel/p5-Date-Pcalc/pkg-plist
+++ b/devel/p5-Date-Pcalc/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Date/Pcalc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Pcalc/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Pcalc
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
+%%SITE_PERL%%/Date/Pcalc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Pcalc/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Pcalc
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
diff --git a/devel/p5-Date-Roman/Makefile b/devel/p5-Date-Roman/Makefile
index 809dd38ca689..4287a8554c5e 100644
--- a/devel/p5-Date-Roman/Makefile
+++ b/devel/p5-Date-Roman/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Date::Roman.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
.include <bsd.port.mk>
diff --git a/devel/p5-Date-Roman/pkg-plist b/devel/p5-Date-Roman/pkg-plist
index 4f9b55d7af34..f78d6ef6a2c5 100644
--- a/devel/p5-Date-Roman/pkg-plist
+++ b/devel/p5-Date-Roman/pkg-plist
@@ -1,7 +1,7 @@
bin/RomanDate
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Roman/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Date/Roman.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Roman/.packlist
+%%SITE_PERL%%/Date/Roman.pm
man/man1/RomanDate.1
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Roman
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Roman
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
diff --git a/devel/p5-Date-Simple/Makefile b/devel/p5-Date-Simple/Makefile
index fb5ec337a94f..90f764a628e3 100644
--- a/devel/p5-Date-Simple/Makefile
+++ b/devel/p5-Date-Simple/Makefile
@@ -18,7 +18,6 @@ COMMENT= A simple date object
PERL_CONFIGURE= yes
MAN3= Date::Simple.3 Date::Simple::NoXS.3
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+SITE_PERL= ${SITE_PERL}
.include <bsd.port.mk>
diff --git a/devel/p5-Date-Simple/pkg-plist b/devel/p5-Date-Simple/pkg-plist
index 92b0533ff356..5240a964095f 100644
--- a/devel/p5-Date-Simple/pkg-plist
+++ b/devel/p5-Date-Simple/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Simple/NoXS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Simple/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Simple/Simple.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Simple/Simple.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Simple
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple/NoXS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple/Simple.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple/Simple.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
diff --git a/devel/p5-DateConvert/Makefile b/devel/p5-DateConvert/Makefile
index b88fa5c55e03..2e6d2150460a 100644
--- a/devel/p5-DateConvert/Makefile
+++ b/devel/p5-DateConvert/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to convert dates between any two calendrical formats
PERL_CONFIGURE= YES
MAN3= Date::Convert.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-DateConvert/pkg-plist b/devel/p5-DateConvert/pkg-plist
index 6d11a277433c..ce4d4935f615 100644
--- a/devel/p5-DateConvert/pkg-plist
+++ b/devel/p5-DateConvert/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Date/Convert.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Convert/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Convert
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
+%%SITE_PERL%%/Date/Convert.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Convert/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Convert
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
diff --git a/devel/p5-Devel-Constants/Makefile b/devel/p5-Devel-Constants/Makefile
index b763abc914cc..c5b570e184d5 100644
--- a/devel/p5-Devel-Constants/Makefile
+++ b/devel/p5-Devel-Constants/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to translate constants back to their named symbols
PERL_CONFIGURE= yes
MAN3= Devel::Constants.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Devel-Constants/pkg-plist b/devel/p5-Devel-Constants/pkg-plist
index 44afa9a1fd04..78c912f4949f 100644
--- a/devel/p5-Devel-Constants/pkg-plist
+++ b/devel/p5-Devel-Constants/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Constants/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Devel/Constants.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Constants
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Devel 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Constants/.packlist
+%%SITE_PERL%%/Devel/Constants.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Constants
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
diff --git a/devel/p5-Devel-DProf/pkg-plist b/devel/p5-Devel-DProf/pkg-plist
index 1ff2ca10797d..e7d7a38bcbaf 100644
--- a/devel/p5-Devel-DProf/pkg-plist
+++ b/devel/p5-Devel-DProf/pkg-plist
@@ -1,8 +1,8 @@
bin/dprofpp
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Devel/DProf.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf/DProf.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf/DProf.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Devel/DProf.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProf/DProf.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProf/DProf.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProf/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProf
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
diff --git a/devel/p5-Devel-Leak/pkg-plist b/devel/p5-Devel-Leak/pkg-plist
index e6e5586bfedc..bb472d3a6a75 100644
--- a/devel/p5-Devel-Leak/pkg-plist
+++ b/devel/p5-Devel-Leak/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Leak/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Devel/Leak.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Leak/Leak.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Leak/Leak.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Leak
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Leak.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Leak.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Leak.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
diff --git a/devel/p5-Devel-Modlist/Makefile b/devel/p5-Devel-Modlist/Makefile
index cba8c47f784e..38543d738c11 100644
--- a/devel/p5-Devel-Modlist/Makefile
+++ b/devel/p5-Devel-Modlist/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension to collect module use information
PERL_CONFIGURE= yes
MAN3= Devel::Modlist.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Devel-Modlist/pkg-plist b/devel/p5-Devel-Modlist/pkg-plist
index c81ad8b8df1c..a5d409be0d2e 100644
--- a/devel/p5-Devel-Modlist/pkg-plist
+++ b/devel/p5-Devel-Modlist/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Modlist/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Devel/Modlist.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Modlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Devel 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Modlist/.packlist
+%%SITE_PERL%%/Devel/Modlist.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Modlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
diff --git a/devel/p5-Devel-ObjectTracker/pkg-plist b/devel/p5-Devel-ObjectTracker/pkg-plist
index ef53158a4474..8bf0a8229dc9 100644
--- a/devel/p5-Devel-ObjectTracker/pkg-plist
+++ b/devel/p5-Devel-ObjectTracker/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/ObjectTracker/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Devel/ObjectTracker.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/ObjectTracker
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ObjectTracker/.packlist
+%%SITE_PERL%%/Devel/ObjectTracker.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ObjectTracker
+@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
diff --git a/devel/p5-Devel-Peek/Makefile b/devel/p5-Devel-Peek/Makefile
index e319bb6c0a2b..74d49da357d5 100644
--- a/devel/p5-Devel-Peek/Makefile
+++ b/devel/p5-Devel-Peek/Makefile
@@ -23,7 +23,6 @@ BROKEN= "Does not compile"
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Devel::Peek.3
.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Peek/pkg-plist b/devel/p5-Devel-Peek/pkg-plist
index c07f1067ea13..da5c08330a6a 100644
--- a/devel/p5-Devel-Peek/pkg-plist
+++ b/devel/p5-Devel-Peek/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Devel/Peek.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Peek.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Peek/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Peek
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
diff --git a/devel/p5-Devel-StackTrace/Makefile b/devel/p5-Devel-StackTrace/Makefile
index 7929df8f654e..661259fa2d0f 100644
--- a/devel/p5-Devel-StackTrace/Makefile
+++ b/devel/p5-Devel-StackTrace/Makefile
@@ -18,13 +18,12 @@ COMMENT= Stack trace and stack trace frame objects
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Devel::StackTrace.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
.endif
diff --git a/devel/p5-Devel-StackTrace/pkg-plist b/devel/p5-Devel-StackTrace/pkg-plist
index 31da4d21705d..c1f35b5f4049 100644
--- a/devel/p5-Devel-StackTrace/pkg-plist
+++ b/devel/p5-Devel-StackTrace/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Devel/StackTrace.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/StackTrace/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/StackTrace
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+%%SITE_PERL%%/Devel/StackTrace.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StackTrace/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StackTrace
+@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index 839194a49ece..9a2aa6bbce6c 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -17,7 +17,6 @@ COMMENT= A perl5 module that dumps symbol names or the symbol table
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Devel::Symdump.3
.include <bsd.port.mk>
diff --git a/devel/p5-Devel-Symdump/pkg-plist b/devel/p5-Devel-Symdump/pkg-plist
index 1670db79bae4..5fc614b88659 100644
--- a/devel/p5-Devel-Symdump/pkg-plist
+++ b/devel/p5-Devel-Symdump/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump.pm
-lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump/Export.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Symdump/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Symdump
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+%%SITE_PERL%%/Devel/Symdump.pm
+%%SITE_PERL%%/Devel/Symdump/Export.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Symdump/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Symdump
+@dirrm %%SITE_PERL%%/Devel/Symdump
+@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
diff --git a/devel/p5-Dialog/Makefile b/devel/p5-Dialog/Makefile
index 178c6c215e1a..ab58daa0e8e1 100644
--- a/devel/p5-Dialog/Makefile
+++ b/devel/p5-Dialog/Makefile
@@ -22,7 +22,6 @@ EXTRA_PATCHES= ${FILESDIR}/extra-Dialog.xs
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Dialog.3
.include <bsd.port.post.mk>
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index cf080ec0f269..c769e5c9f9df 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -17,7 +17,6 @@ COMMENT= A perl5 module providing access to System errno constants
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Errno.3
.include <bsd.port.mk>
diff --git a/devel/p5-Errno/pkg-plist b/devel/p5-Errno/pkg-plist
index 3e8c8eed9b6f..5a08c7cf1dbc 100644
--- a/devel/p5-Errno/pkg-plist
+++ b/devel/p5-Errno/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Errno.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Errno/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Errno
+%%SITE_PERL%%/Errno.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Errno/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Errno
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index 819528419039..d421fab627f6 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -16,19 +16,18 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= A module that allows you to declare real exception classes in Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Devel/StackTrace.pm:${PORTSDIR}/devel/p5-Devel-StackTrace \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS= ${SITE_PERL}/Devel/StackTrace.pm:${PORTSDIR}/devel/p5-Devel-StackTrace \
+ ${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Exception::Class.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Exception-Class/pkg-plist b/devel/p5-Exception-Class/pkg-plist
index 1fc63a82d8d3..35ae160a4820 100644
--- a/devel/p5-Exception-Class/pkg-plist
+++ b/devel/p5-Exception-Class/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Exception/Class.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Exception/Class/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Exception
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Exception/Class
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Exception
+%%SITE_PERL%%/Exception/Class.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exception/Class/.packlist
+@dirrm %%SITE_PERL%%/Exception
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Exception/Class
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Exception
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index 36a485e7771f..a705710e6acf 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module for file locking with flock
PERL_CONFIGURE= YES
MAN3= File::BasicFlock.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-File-BasicFlock/pkg-plist b/devel/p5-File-BasicFlock/pkg-plist
index 88cbc9c7e529..e02c155292f8 100644
--- a/devel/p5-File-BasicFlock/pkg-plist
+++ b/devel/p5-File-BasicFlock/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/File/BasicFlock.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/BasicFlock/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/BasicFlock
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+%%SITE_PERL%%/File/BasicFlock.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BasicFlock/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BasicFlock
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
diff --git a/devel/p5-File-Cache/pkg-plist b/devel/p5-File-Cache/pkg-plist
index 6cb7651cfa62..9ccefad85b4f 100644
--- a/devel/p5-File-Cache/pkg-plist
+++ b/devel/p5-File-Cache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/File/Cache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Cache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Cache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
+%%SITE_PERL%%/File/Cache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Cache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Cache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
diff --git a/devel/p5-File-FTS/Makefile b/devel/p5-File-FTS/Makefile
index 0e13b5f900c4..9ef5b0353a73 100644
--- a/devel/p5-File-FTS/Makefile
+++ b/devel/p5-File-FTS/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for File Traversing System
PERL_CONFIGURE= yes
MAN3= File::FTS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-File-FTS/pkg-plist b/devel/p5-File-FTS/pkg-plist
index ad50f526ab45..fecd548aacbf 100644
--- a/devel/p5-File-FTS/pkg-plist
+++ b/devel/p5-File-FTS/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/FTS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/File/FTS.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/FTS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FTS/.packlist
+%%SITE_PERL%%/File/FTS.pm
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FTS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
diff --git a/devel/p5-File-Flock/Makefile b/devel/p5-File-Flock/Makefile
index 783d76a9fc30..9373d2b114d7 100644
--- a/devel/p5-File-Flock/Makefile
+++ b/devel/p5-File-Flock/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module for file locking with flock
PERL_CONFIGURE= yes
MAN3= File::Flock.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-File-Flock/pkg-plist b/devel/p5-File-Flock/pkg-plist
index 7ecc11e53ed3..94ceb789ca8e 100644
--- a/devel/p5-File-Flock/pkg-plist
+++ b/devel/p5-File-Flock/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/File/Flock.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Flock/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Flock
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+%%SITE_PERL%%/File/Flock.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Flock/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Flock
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
diff --git a/devel/p5-File-Lock/pkg-plist b/devel/p5-File-Lock/pkg-plist
index 6d116a487fd6..bb1426211cda 100644
--- a/devel/p5-File-Lock/pkg-plist
+++ b/devel/p5-File-Lock/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/File/Lock.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/info.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/pid.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/sysid.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/test.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/Lock.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/Lock.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/File
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Lock.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/info.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/pid.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/sysid.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/test.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/Lock.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/Lock.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
diff --git a/devel/p5-File-NFSLock/pkg-plist b/devel/p5-File-NFSLock/pkg-plist
index 73e22c59b2fc..5ed412b087b2 100644
--- a/devel/p5-File-NFSLock/pkg-plist
+++ b/devel/p5-File-NFSLock/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/NFSLock/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/File/NFSLock.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/NFSLock
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/NFSLock/.packlist
+%%SITE_PERL%%/File/NFSLock.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/NFSLock
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
diff --git a/devel/p5-File-ReadBackwards/Makefile b/devel/p5-File-ReadBackwards/Makefile
index a05bd6210e26..8eb91148cf3e 100644
--- a/devel/p5-File-ReadBackwards/Makefile
+++ b/devel/p5-File-ReadBackwards/Makefile
@@ -22,6 +22,5 @@ SITE_PERL= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
PERL_CONFIGURE= yes
MAN3= File::ReadBackwards.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-File-ReadBackwards/pkg-plist b/devel/p5-File-ReadBackwards/pkg-plist
index c1c54df6ac33..604e94014bcd 100644
--- a/devel/p5-File-ReadBackwards/pkg-plist
+++ b/devel/p5-File-ReadBackwards/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/ReadBackwards/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/File/ReadBackwards.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/ReadBackwards
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ReadBackwards/.packlist
+%%SITE_PERL%%/File/ReadBackwards.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ReadBackwards
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Remove/Makefile b/devel/p5-File-Remove/Makefile
index 2f2a8577a20a..0154e0e3542a 100644
--- a/devel/p5-File-Remove/Makefile
+++ b/devel/p5-File-Remove/Makefile
@@ -19,6 +19,5 @@ COMMENT= Perl5 module to easily removes files and directories
PERL_CONFIGURE= YES
MAN3= File::Remove.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-File-Remove/pkg-plist b/devel/p5-File-Remove/pkg-plist
index f20e2ce47d34..d4527207f1fe 100644
--- a/devel/p5-File-Remove/pkg-plist
+++ b/devel/p5-File-Remove/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/File/Remove.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
+%%SITE_PERL%%/File/Remove.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Slurp/Makefile b/devel/p5-File-Slurp/Makefile
index b195fb1f6ed5..6a29123b5413 100644
--- a/devel/p5-File-Slurp/Makefile
+++ b/devel/p5-File-Slurp/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module for single call read & write file routines
PERL_CONFIGURE= YES
MAN3= File::Slurp.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index 8ce010c29af9..03d881459d48 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module interface to the UNIX sync(2) and POSIX.1b fsync(2)
PERL_CONFIGURE= yes
MAN3= File::Sync.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-File-Sync/pkg-plist b/devel/p5-File-Sync/pkg-plist
index 654ce78b283b..6ae0059be524 100644
--- a/devel/p5-File-Sync/pkg-plist
+++ b/devel/p5-File-Sync/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/File/Sync.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync/Sync.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync/Sync.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/File
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Sync.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/Sync.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/Sync.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
diff --git a/devel/p5-File-Tail/Makefile b/devel/p5-File-Tail/Makefile
index 78a4d30d0a5b..34c87df7945b 100644
--- a/devel/p5-File-Tail/Makefile
+++ b/devel/p5-File-Tail/Makefile
@@ -18,11 +18,10 @@ COMMENT= Perl Module to read the end of a file as it's appended to
BUILD_DEPENDS= ${site_perl}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
RUN_DEPENDS= ${BUILD_DEPENDS}
-site_perl= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+site_perl= ${SITE_PERL}/${PERL_ARCH}
PERL_CONFIGURE= YES
MAN3= File::Tail.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-File-Tail/pkg-plist b/devel/p5-File-Tail/pkg-plist
index 0a1c2e3fce06..e9a0c2ca0f80 100644
--- a/devel/p5-File-Tail/pkg-plist
+++ b/devel/p5-File-Tail/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/File/Tail.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/File/Tail/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Tail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Tail
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/File/Tail
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
+%%SITE_PERL%%/File/Tail.pm
+%%SITE_PERL%%/auto/File/Tail/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tail
+@dirrm %%SITE_PERL%%/auto/File/Tail
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index a4a02388f367..ddc8701060c5 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -21,11 +21,10 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= File::Temp.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL?= ${SITE_PERL}
.if ${PERL_LEVEL} < 500601
BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
diff --git a/devel/p5-File-Temp/pkg-plist b/devel/p5-File-Temp/pkg-plist
index 6a83feba211c..3d447a8abb2e 100644
--- a/devel/p5-File-Temp/pkg-plist
+++ b/devel/p5-File-Temp/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/File/Temp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Temp/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Temp
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
+%%SITE_PERL%%/File/Temp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Temp/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Temp
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
diff --git a/devel/p5-Filter-CBC/Makefile b/devel/p5-Filter-CBC/Makefile
index 1537265e215a..c76913aa51e4 100644
--- a/devel/p5-Filter-CBC/Makefile
+++ b/devel/p5-Filter-CBC/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Source filter for Cipher Block Chaining
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
+ ${SITE_PERL}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
+ ${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/devel/p5-Filter-CBC/pkg-plist b/devel/p5-Filter-CBC/pkg-plist
index 3e278b272f6d..94989c6b4e2b 100644
--- a/devel/p5-Filter-CBC/pkg-plist
+++ b/devel/p5-Filter-CBC/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/CBC/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Filter/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Filter/cbc2code.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/CBC/.packlist
+%%SITE_PERL%%/Filter/CBC.pm
+%%SITE_PERL%%/Filter/cbc2code.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/autofilter.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/blowfish.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/defaults.pl
@@ -14,6 +14,6 @@ lib/perl5/site_perl/%%PERL_VER%%/Filter/cbc2code.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/tea.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/twofish.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/CBC
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/CBC
+@unexec rmdir %D/%%SITE_PERL%%/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
diff --git a/devel/p5-FreezeThaw/pkg-plist b/devel/p5-FreezeThaw/pkg-plist
index 12d0f55fcf9f..db12b3259d47 100644
--- a/devel/p5-FreezeThaw/pkg-plist
+++ b/devel/p5-FreezeThaw/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/FreezeThaw.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreezeThaw/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreezeThaw
+%%SITE_PERL%%/FreezeThaw.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreezeThaw/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreezeThaw
diff --git a/devel/p5-Getargs-Long/Makefile b/devel/p5-Getargs-Long/Makefile
index fe00cbb85db8..d1fd5ea33543 100644
--- a/devel/p5-Getargs-Long/Makefile
+++ b/devel/p5-Getargs-Long/Makefile
@@ -18,10 +18,9 @@ COMMENT= Parse routine arguments
BUILD_DEPENDS= ${SITE_PERL}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Getargs::Long.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Getargs-Long/pkg-plist b/devel/p5-Getargs-Long/pkg-plist
index 29e4014bdf74..5d3305bae512 100644
--- a/devel/p5-Getargs-Long/pkg-plist
+++ b/devel/p5-Getargs-Long/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Getargs/Long.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getargs/Long/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getargs/Long
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getargs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Getargs 2>/dev/null || true
+%%SITE_PERL%%/Getargs/Long.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs/Long/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs/Long
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Getargs 2>/dev/null || true
diff --git a/devel/p5-Getopt-Declare/Makefile b/devel/p5-Getopt-Declare/Makefile
index 0134d68ec17d..c167900d7b98 100644
--- a/devel/p5-Getopt-Declare/Makefile
+++ b/devel/p5-Getopt-Declare/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Declaratively Expressed Command-Line Arguments via Regular Expressions
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced
+BUILD_DEPENDS= ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Getopt::Declare.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Getopt-Declare/pkg-plist b/devel/p5-Getopt-Declare/pkg-plist
index 8702d06fb0b6..53a66fec6a15 100644
--- a/devel/p5-Getopt-Declare/pkg-plist
+++ b/devel/p5-Getopt-Declare/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Declare/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Getopt/Declare.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Declare
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Getopt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Declare/.packlist
+%%SITE_PERL%%/Getopt/Declare.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Declare
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true
diff --git a/devel/p5-Getopt-Long/Makefile b/devel/p5-Getopt-Long/Makefile
index a9c4b84f3169..4dfa3600a9c7 100644
--- a/devel/p5-Getopt-Long/Makefile
+++ b/devel/p5-Getopt-Long/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl module for extended processing of command line options
PERL_CONFIGURE= yes
MAN3= Getopt::Long.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-configure:
${PERL} -pi -e 'm.INSTALLDIRS.&&s,.,,sg' ${WRKSRC}/Makefile.PL
diff --git a/devel/p5-Getopt-Long/pkg-plist b/devel/p5-Getopt-Long/pkg-plist
index cb56694bf936..35535de40756 100644
--- a/devel/p5-Getopt-Long/pkg-plist
+++ b/devel/p5-Getopt-Long/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Long/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/newgetopt.pl
-lib/perl5/site_perl/%%PERL_VER%%/Getopt/Long.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Long
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Getopt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Long/.packlist
+%%SITE_PERL%%/newgetopt.pl
+%%SITE_PERL%%/Getopt/Long.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Long
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true
diff --git a/devel/p5-Getopt-Mixed/Makefile b/devel/p5-Getopt-Mixed/Makefile
index ca990783b55b..214c67bb7dcb 100644
--- a/devel/p5-Getopt-Mixed/Makefile
+++ b/devel/p5-Getopt-Mixed/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl module for processing of both short and long command line options
PERL_CONFIGURE= yes
MAN3= Getopt::Mixed.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-configure:
${PERL} -pi -e 'm.INSTALLDIRS.&&s,.,,sg' ${WRKSRC}/Makefile.PL
diff --git a/devel/p5-Getopt-Mixed/pkg-plist b/devel/p5-Getopt-Mixed/pkg-plist
index 22c42cb1a725..272069541de7 100644
--- a/devel/p5-Getopt-Mixed/pkg-plist
+++ b/devel/p5-Getopt-Mixed/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Mixed/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Getopt/Mixed.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Mixed
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mixed 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Getopt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Mixed/.packlist
+%%SITE_PERL%%/Getopt/Mixed.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Mixed
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mixed 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true
diff --git a/devel/p5-Glade-Perl/Makefile b/devel/p5-Glade-Perl/Makefile
index 18e2f12e124c..5010c961ca64 100644
--- a/devel/p5-Glade-Perl/Makefile
+++ b/devel/p5-Glade-Perl/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= marcus@FreeBSD.org
COMMENT= The Perl project building code for Glade
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
RUN_DEPENDS= ${BUILD_DEPENDS} \
glade:${PORTSDIR}/devel/glade
diff --git a/devel/p5-Glade-Perl/pkg-plist b/devel/p5-Glade-Perl/pkg-plist
index ff1bc417026d..e5157b532fe5 100644
--- a/devel/p5-Glade-Perl/pkg-plist
+++ b/devel/p5-Glade-Perl/pkg-plist
@@ -1,12 +1,12 @@
bin/glade2perl
-lib/perl5/site_perl/%%PERL_VER%%/Glade/PerlProject.pm
-lib/perl5/site_perl/%%PERL_VER%%/Glade/PerlGenerate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Glade/PerlUI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Glade/PerlXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Glade/PerlSource.pm
-lib/perl5/site_perl/%%PERL_VER%%/Glade/PerlUIExtra.pm
-lib/perl5/site_perl/%%PERL_VER%%/Glade/PerlUIGtk.pm
-lib/perl5/site_perl/%%PERL_VER%%/Glade/PerlRun.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Glade/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Glade
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Glade
+%%SITE_PERL%%/Glade/PerlProject.pm
+%%SITE_PERL%%/Glade/PerlGenerate.pm
+%%SITE_PERL%%/Glade/PerlUI.pm
+%%SITE_PERL%%/Glade/PerlXML.pm
+%%SITE_PERL%%/Glade/PerlSource.pm
+%%SITE_PERL%%/Glade/PerlUIExtra.pm
+%%SITE_PERL%%/Glade/PerlUIGtk.pm
+%%SITE_PERL%%/Glade/PerlRun.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Glade/.packlist
+@dirrm %%SITE_PERL%%/Glade
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Glade
diff --git a/devel/p5-Heap/Makefile b/devel/p5-Heap/Makefile
index 5a3e9e9bb5da..85dfb20efeab 100644
--- a/devel/p5-Heap/Makefile
+++ b/devel/p5-Heap/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl extensions for keeping data partially sorted
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Heap.3 Heap::Binary.3 Heap::Binomial.3 Heap::Elem::Num.3 \
Heap::Elem::NumRev.3 Heap::Elem::Ref.3 Heap::Elem::RefRev.3 \
Heap::Elem::Str.3 Heap::Elem::StrRev.3 Heap::Elem.3 \
diff --git a/devel/p5-Heap/pkg-plist b/devel/p5-Heap/pkg-plist
index 52536c389f38..9fe6a15da4de 100644
--- a/devel/p5-Heap/pkg-plist
+++ b/devel/p5-Heap/pkg-plist
@@ -1,37 +1,37 @@
-lib/perl5/site_perl/%%PERL_VER%%/Heap.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Binary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Binomial.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Elem.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Elem/Num.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Elem/NumRev.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Elem/Ref.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Elem/RefRev.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Elem/Str.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Elem/StrRev.pm
-lib/perl5/site_perl/%%PERL_VER%%/Heap/Fibonacci.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Heap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Binary/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Binomial/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/Num/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/NumRev/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/Ref/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/RefRev/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/Str/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/StrRev/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Fibonacci/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Heap/Elem
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Heap
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Binary
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Binomial
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Fibonacci
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/Num
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/NumRev
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/Ref
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/RefRev
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/Str
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem/StrRev
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap/Elem
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Heap
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Heap
+%%SITE_PERL%%/Heap.pm
+%%SITE_PERL%%/Heap/Binary.pm
+%%SITE_PERL%%/Heap/Binomial.pm
+%%SITE_PERL%%/Heap/Elem.pm
+%%SITE_PERL%%/Heap/Elem/Num.pm
+%%SITE_PERL%%/Heap/Elem/NumRev.pm
+%%SITE_PERL%%/Heap/Elem/Ref.pm
+%%SITE_PERL%%/Heap/Elem/RefRev.pm
+%%SITE_PERL%%/Heap/Elem/Str.pm
+%%SITE_PERL%%/Heap/Elem/StrRev.pm
+%%SITE_PERL%%/Heap/Fibonacci.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/.packlist
+%%SITE_PERL%%/auto/Heap/Binary/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Binomial/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Elem/Num/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Elem/NumRev/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Elem/Ref/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Elem/RefRev/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Elem/Str/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Elem/StrRev/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Elem/autosplit.ix
+%%SITE_PERL%%/auto/Heap/Fibonacci/autosplit.ix
+%%SITE_PERL%%/auto/Heap/autosplit.ix
+@dirrm %%SITE_PERL%%/Heap/Elem
+@dirrm %%SITE_PERL%%/Heap
+@dirrm %%SITE_PERL%%/auto/Heap/Binary
+@dirrm %%SITE_PERL%%/auto/Heap/Binomial
+@dirrm %%SITE_PERL%%/auto/Heap/Fibonacci
+@dirrm %%SITE_PERL%%/auto/Heap/Elem/Num
+@dirrm %%SITE_PERL%%/auto/Heap/Elem/NumRev
+@dirrm %%SITE_PERL%%/auto/Heap/Elem/Ref
+@dirrm %%SITE_PERL%%/auto/Heap/Elem/RefRev
+@dirrm %%SITE_PERL%%/auto/Heap/Elem/Str
+@dirrm %%SITE_PERL%%/auto/Heap/Elem/StrRev
+@dirrm %%SITE_PERL%%/auto/Heap/Elem
+@dirrm %%SITE_PERL%%/auto/Heap
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap
diff --git a/devel/p5-IO-Multiplex/Makefile b/devel/p5-IO-Multiplex/Makefile
index 14b9fec38818..3e42ee41e0af 100644
--- a/devel/p5-IO-Multiplex/Makefile
+++ b/devel/p5-IO-Multiplex/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= IO::Multiplex - Manage IO on many file handles
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= IO::Multiplex.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-IO-Multiplex/pkg-plist b/devel/p5-IO-Multiplex/pkg-plist
index 2c8a3bb2787a..98bf10d62f42 100644
--- a/devel/p5-IO-Multiplex/pkg-plist
+++ b/devel/p5-IO-Multiplex/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Multiplex/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/IO/Multiplex.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Multiplex
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IO 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Multiplex/.packlist
+%%SITE_PERL%%/IO/Multiplex.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Multiplex
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
diff --git a/devel/p5-IO-Stty/pkg-plist b/devel/p5-IO-Stty/pkg-plist
index 456fdb5a88eb..eb22f3ad2d55 100644
--- a/devel/p5-IO-Stty/pkg-plist
+++ b/devel/p5-IO-Stty/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/IO/stty.pl
-lib/perl5/site_perl/%%PERL_VER%%/IO/Stty.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Stty/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Stty
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+%%SITE_PERL%%/IO/stty.pl
+%%SITE_PERL%%/IO/Stty.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stty/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stty
+@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index d58c4b58d60c..36edd3dd4fd6 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -17,7 +17,6 @@ COMMENT= Flexible I/O Perl5 module that allows manipulation of pseudo-TTYs
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= IO::Pty.3 \
IO::Tty.3 \
IO::Tty::Constant.3
diff --git a/devel/p5-IO-Tty/pkg-plist b/devel/p5-IO-Tty/pkg-plist
index 8d88af07c436..e36f3cd3b64c 100644
--- a/devel/p5-IO-Tty/pkg-plist
+++ b/devel/p5-IO-Tty/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Tty/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Pty.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Tty.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Tty/Constant.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Tty
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Tty 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Pty.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty/Constant.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 83ac2bea7379..ab5fbc5e2f1c 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -20,7 +20,6 @@ PERL_CONFIGURE= YES
MAN3= IO::AtomicFile.3 IO::InnerFile.3 IO::Lines.3 IO::Scalar.3 \
IO::ScalarArray.3 IO::Stringy.3 \
IO::Wrap.3 IO::WrapTie.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
# Install documentation
EG_DIR= ${WRKSRC}/docs
diff --git a/devel/p5-IO-stringy/pkg-plist b/devel/p5-IO-stringy/pkg-plist
index df20365aa0d6..e607dbddf82f 100644
--- a/devel/p5-IO-stringy/pkg-plist
+++ b/devel/p5-IO-stringy/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/IO/AtomicFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/InnerFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/Lines.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/Scalar.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/Scalar.pm.html
-lib/perl5/site_perl/%%PERL_VER%%/IO/ScalarArray.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/Stringy.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/Wrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/WrapTie.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IO 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO-stringy/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO-stringy
+%%SITE_PERL%%/IO/AtomicFile.pm
+%%SITE_PERL%%/IO/InnerFile.pm
+%%SITE_PERL%%/IO/Lines.pm
+%%SITE_PERL%%/IO/Scalar.pm
+%%SITE_PERL%%/IO/Scalar.pm.html
+%%SITE_PERL%%/IO/ScalarArray.pm
+%%SITE_PERL%%/IO/Stringy.pm
+%%SITE_PERL%%/IO/Wrap.pm
+%%SITE_PERL%%/IO/WrapTie.pm
+@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO-stringy/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO-stringy
%%PORTDOCS%%share/doc/p5-IO-stringy/IO/AtomicFile.pm.html
%%PORTDOCS%%share/doc/p5-IO-stringy/IO/InnerFile.pm.html
%%PORTDOCS%%share/doc/p5-IO-stringy/IO/Lines.pm.html
diff --git a/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile
index 69edf60a352b..9d72d9df9905 100644
--- a/devel/p5-IPC-Cache/Makefile
+++ b/devel/p5-IPC-Cache/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Persist data across processes via shared memory
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -25,8 +25,8 @@ MAN3= IPC::Cache.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-IPC-Cache/pkg-plist b/devel/p5-IPC-Cache/pkg-plist
index 366682b3872f..bfa316da4f13 100644
--- a/devel/p5-IPC-Cache/pkg-plist
+++ b/devel/p5-IPC-Cache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/IPC/Cache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/Cache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/Cache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IPC 2>/dev/null || true
+%%SITE_PERL%%/IPC/Cache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
diff --git a/devel/p5-IPC-Locker/pkg-plist b/devel/p5-IPC-Locker/pkg-plist
index 76608a6db7e2..d2cc1d153455 100644
--- a/devel/p5-IPC-Locker/pkg-plist
+++ b/devel/p5-IPC-Locker/pkg-plist
@@ -1,13 +1,13 @@
bin/pidwatch
bin/lockerd
bin/pidstatd
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/Locker/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/IPC/Locker/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/IPC/Locker.pm
-lib/perl5/site_perl/%%PERL_VER%%/IPC/PidStat.pm
-lib/perl5/site_perl/%%PERL_VER%%/IPC/PidStat/PidServer.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/Locker
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IPC/Locker
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IPC/PidStat
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IPC 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Locker/.packlist
+%%SITE_PERL%%/IPC/Locker/Server.pm
+%%SITE_PERL%%/IPC/Locker.pm
+%%SITE_PERL%%/IPC/PidStat.pm
+%%SITE_PERL%%/IPC/PidStat/PidServer.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Locker
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
+@dirrm %%SITE_PERL%%/IPC/Locker
+@dirrm %%SITE_PERL%%/IPC/PidStat
+@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
diff --git a/devel/p5-IPC-Shareable/Makefile b/devel/p5-IPC-Shareable/Makefile
index 82c11aeec751..192675ee702b 100644
--- a/devel/p5-IPC-Shareable/Makefile
+++ b/devel/p5-IPC-Shareable/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
COMMENT= Share Perl variables between processes
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= IPC::Shareable.3 IPC::Shareable::SharedMem.3
.include <bsd.port.mk>
diff --git a/devel/p5-IPC-Shareable/pkg-plist b/devel/p5-IPC-Shareable/pkg-plist
index 0a0d020536ac..2ad5abd7d9f5 100644
--- a/devel/p5-IPC-Shareable/pkg-plist
+++ b/devel/p5-IPC-Shareable/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/IPC/Shareable.pm
-lib/perl5/site_perl/%%PERL_VER%%/IPC/Shareable/SharedMem.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/Shareable/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/Shareable
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IPC/Shareable
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IPC
+%%SITE_PERL%%/IPC/Shareable.pm
+%%SITE_PERL%%/IPC/Shareable/SharedMem.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Shareable/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Shareable
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrm %%SITE_PERL%%/IPC/Shareable
+@dirrm %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index 0bf6733c54e6..16e75085e430 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
COMMENT= Perl module for managing a SysV IPC shared memory cache
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite \
+ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -24,6 +24,5 @@ PERL_CONFIGURE= yes
MAN3= IPC::SharedCache.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-IPC-SharedCache/pkg-plist b/devel/p5-IPC-SharedCache/pkg-plist
index b04d554e323c..9cbfcf5e82b6 100644
--- a/devel/p5-IPC-SharedCache/pkg-plist
+++ b/devel/p5-IPC-SharedCache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/IPC/SharedCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SharedCache/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SharedCache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IPC 2>/dev/null || true
+%%SITE_PERL%%/IPC/SharedCache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile
index 162a04475987..b56be7598b80 100644
--- a/devel/p5-Include/Makefile
+++ b/devel/p5-Include/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 package which allows use of macros defined in 'C' header files
PERL_CONFIGURE= YES
MAN3= Include.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Include/pkg-plist b/devel/p5-Include/pkg-plist
index f1d6ee770a92..98708cb6d700 100644
--- a/devel/p5-Include/pkg-plist
+++ b/devel/p5-Include/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Include.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Include/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Include
+%%SITE_PERL%%/Include.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Include/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Include
diff --git a/devel/p5-Inline-ASM/Makefile b/devel/p5-Inline-ASM/Makefile
index 6320fc5aad71..50dde8bd5286 100644
--- a/devel/p5-Inline-ASM/Makefile
+++ b/devel/p5-Inline-ASM/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= Write Perl Subroutines in assembler
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Inline.pm:${PORTSDIR}/devel/p5-Inline
+BUILD_DEPENDS= ${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
CONFIGURE_ARGS= </dev/null
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Inline::ASM.3
.include <bsd.port.mk>
diff --git a/devel/p5-Inline-ASM/pkg-plist b/devel/p5-Inline-ASM/pkg-plist
index 68296a5679c9..324673a9938f 100644
--- a/devel/p5-Inline-ASM/pkg-plist
+++ b/devel/p5-Inline-ASM/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline/ASM/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Inline/ASM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/ASM.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline/ASM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Inline 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/ASM/.packlist
+%%SITE_PERL%%/Inline/ASM.pm
+%%SITE_PERL%%/Inline/ASM.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/ASM
+@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
diff --git a/devel/p5-Inline-Filters/Makefile b/devel/p5-Inline-Filters/Makefile
index d37559e4edf5..6e89748717c3 100644
--- a/devel/p5-Inline-Filters/Makefile
+++ b/devel/p5-Inline-Filters/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= Common source code filters for Inline Modules
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Inline.pm:${PORTSDIR}/devel/p5-Inline
+BUILD_DEPENDS= ${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Inline::Filters.3
.include <bsd.port.mk>
diff --git a/devel/p5-Inline-Filters/pkg-plist b/devel/p5-Inline-Filters/pkg-plist
index c1ba1b1b1e53..91460b47b50b 100644
--- a/devel/p5-Inline-Filters/pkg-plist
+++ b/devel/p5-Inline-Filters/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline/Filters/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Filters.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Filters.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline/Filters
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Inline 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Filters/.packlist
+%%SITE_PERL%%/Inline/Filters.pm
+%%SITE_PERL%%/Inline/Filters.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Filters
+@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index 11a0a1b7fc8f..afc2e56a0e28 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -16,13 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Write Perl subroutines and classes in Java
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Inline.pm:${PORTSDIR}/devel/p5-Inline
+BUILD_DEPENDS= ${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
CONFIGURE_ARGS= </dev/null
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Inline::Java.3
.include <bsd.port.mk>
diff --git a/devel/p5-Inline-Java/pkg-plist b/devel/p5-Inline-Java/pkg-plist
index cf591317c53e..5e983f199ccf 100644
--- a/devel/p5-Inline-Java/pkg-plist
+++ b/devel/p5-Inline-Java/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline/Java/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java.pod
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/Array.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/Callback.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/Class.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/Init.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/JNI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/JVM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/Portable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Inline/Java/Protocol.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Inline/Java
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline/Java
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Inline 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/.packlist
+%%SITE_PERL%%/Inline/Java.pm
+%%SITE_PERL%%/Inline/Java.pod
+%%SITE_PERL%%/Inline/Java/Array.pm
+%%SITE_PERL%%/Inline/Java/Callback.pm
+%%SITE_PERL%%/Inline/Java/Class.pm
+%%SITE_PERL%%/Inline/Java/Init.pm
+%%SITE_PERL%%/Inline/Java/JNI.pm
+%%SITE_PERL%%/Inline/Java/JVM.pm
+%%SITE_PERL%%/Inline/Java/Object.pm
+%%SITE_PERL%%/Inline/Java/Portable.pm
+%%SITE_PERL%%/Inline/Java/Protocol.pm
+@dirrm %%SITE_PERL%%/Inline/Java
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java
+@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index 0faacfb0c287..0153016e29ce 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -17,6 +17,5 @@ COMMENT= Perl module that provides a way to get the value of C ioctl constants
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Ioctl/pkg-plist b/devel/p5-Ioctl/pkg-plist
index 12cfc79c7e8f..8f5440fa59eb 100644
--- a/devel/p5-Ioctl/pkg-plist
+++ b/devel/p5-Ioctl/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ioctl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ioctl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ioctl/Ioctl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ioctl/Ioctl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ioctl/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ioctl
+%%SITE_PERL%%/%%PERL_ARCH%%/Ioctl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/Ioctl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/Ioctl.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl
diff --git a/devel/p5-Locale-PGetText/pkg-plist b/devel/p5-Locale-PGetText/pkg-plist
index a141eddf7349..04724c42f9c2 100644
--- a/devel/p5-Locale-PGetText/pkg-plist
+++ b/devel/p5-Locale-PGetText/pkg-plist
@@ -1,7 +1,7 @@
bin/XText
bin/MsgFormat
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Locale/PGetText.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/PGetText
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Locale 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist
+%%SITE_PERL%%/Locale/PGetText.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 61fa9fd36973..f1bd0221c5fb 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -22,6 +22,5 @@ PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
MAN3= Locale::gettext.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Locale-gettext/pkg-plist b/devel/p5-Locale-gettext/pkg-plist
index b4bbc2ad647f..bad07b4fc1b8 100644
--- a/devel/p5-Locale-gettext/pkg-plist
+++ b/devel/p5-Locale-gettext/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/gettext/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/gettext/gettext.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/gettext/gettext.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Locale/gettext.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/gettext
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext/gettext.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext/gettext.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/Locale/gettext.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Locale 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
diff --git a/devel/p5-LockFile-Simple/Makefile b/devel/p5-LockFile-Simple/Makefile
index bc421dcba3cf..2f595d21d943 100644
--- a/devel/p5-LockFile-Simple/Makefile
+++ b/devel/p5-LockFile-Simple/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module implementing simple file locking
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= LockFile::Simple.3
.include <bsd.port.mk>
diff --git a/devel/p5-LockFile-Simple/pkg-plist b/devel/p5-LockFile-Simple/pkg-plist
index 20c9ecb772bb..b94a9a45f627 100644
--- a/devel/p5-LockFile-Simple/pkg-plist
+++ b/devel/p5-LockFile-Simple/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/LockFile/Lock.pm
-lib/perl5/site_perl/%%PERL_VER%%/LockFile/Lock/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/LockFile/Manager.pm
-lib/perl5/site_perl/%%PERL_VER%%/LockFile/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LockFile/Simple/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LockFile/Simple
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LockFile
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LockFile/Lock
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LockFile
+%%SITE_PERL%%/LockFile/Lock.pm
+%%SITE_PERL%%/LockFile/Lock/Simple.pm
+%%SITE_PERL%%/LockFile/Manager.pm
+%%SITE_PERL%%/LockFile/Simple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LockFile/Simple/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LockFile/Simple
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LockFile
+@dirrm %%SITE_PERL%%/LockFile/Lock
+@dirrm %%SITE_PERL%%/LockFile
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index bc3ba2619a6a..0095026b27a7 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@freebsd.org
COMMENT= Log::Agent::Logger - a logging interface for perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Getargs/Long.pm:${PORTSDIR}/devel/p5-Getargs-Long
+BUILD_DEPENDS= ${SITE_PERL}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent \
+ ${SITE_PERL}/Getargs/Long.pm:${PORTSDIR}/devel/p5-Getargs-Long
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Log::Agent::Logger.3
.include <bsd.port.mk>
diff --git a/devel/p5-Log-Agent-Logger/pkg-plist b/devel/p5-Log-Agent-Logger/pkg-plist
index d709258840b5..c24d734b08e0 100644
--- a/devel/p5-Log-Agent-Logger/pkg-plist
+++ b/devel/p5-Log-Agent-Logger/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/Agent/Logger/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Log/Agent/Logger.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/Agent/Logger
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/Agent 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger/.packlist
+%%SITE_PERL%%/Log/Agent/Logger.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent 2>/dev/null || true
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index d728b3b66e2f..fa6f077543e2 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -24,13 +24,12 @@ PM_DEPENDS+= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
PM_DEPENDS+= ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
PM_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
#MAN3= Log::Dispatch::Config.3 \
# Log::Dispatch::Configurator.3 \
# Log::Dispatch::Configurator::AppConfig.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatch-Config/pkg-plist b/devel/p5-Log-Dispatch-Config/pkg-plist
index a7783ec86479..09c39a29a5cb 100644
--- a/devel/p5-Log-Dispatch-Config/pkg-plist
+++ b/devel/p5-Log-Dispatch-Config/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Configurator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Configurator/AppConfig.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Configurator 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Log 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config/.packlist
+%%SITE_PERL%%/Log/Dispatch/Configurator.pm
+%%SITE_PERL%%/Log/Dispatch/Config.pm
+%%SITE_PERL%%/Log/Dispatch/Configurator/AppConfig.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Log/Dispatch/Configurator 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Log/Dispatch 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
diff --git a/devel/p5-Log-Dispatch/pkg-plist b/devel/p5-Log-Dispatch/pkg-plist
index 48f6f2069963..d407bb7d9480 100644
--- a/devel/p5-Log-Dispatch/pkg-plist
+++ b/devel/p5-Log-Dispatch/pkg-plist
@@ -1,19 +1,19 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/Dispatch/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/ApacheLog.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Email.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Email/MIMELite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Email/MailSend.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Email/MailSender.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Email/MailSendmail.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Handle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Output.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Screen.pm
-lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Syslog.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch/Email
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Log 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/.packlist
+%%SITE_PERL%%/Log/Dispatch.pm
+%%SITE_PERL%%/Log/Dispatch/ApacheLog.pm
+%%SITE_PERL%%/Log/Dispatch/Base.pm
+%%SITE_PERL%%/Log/Dispatch/Email.pm
+%%SITE_PERL%%/Log/Dispatch/Email/MIMELite.pm
+%%SITE_PERL%%/Log/Dispatch/Email/MailSend.pm
+%%SITE_PERL%%/Log/Dispatch/Email/MailSender.pm
+%%SITE_PERL%%/Log/Dispatch/Email/MailSendmail.pm
+%%SITE_PERL%%/Log/Dispatch/File.pm
+%%SITE_PERL%%/Log/Dispatch/Handle.pm
+%%SITE_PERL%%/Log/Dispatch/Output.pm
+%%SITE_PERL%%/Log/Dispatch/Screen.pm
+%%SITE_PERL%%/Log/Dispatch/Syslog.pm
+@dirrm %%SITE_PERL%%/Log/Dispatch/Email
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Log/Dispatch 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
diff --git a/devel/p5-Log-TraceMessages/Makefile b/devel/p5-Log-TraceMessages/Makefile
index fde431fe5ddf..10a5d90cb84d 100644
--- a/devel/p5-Log-TraceMessages/Makefile
+++ b/devel/p5-Log-TraceMessages/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl extension for trace messages used in debugging
BUILD_DEPENDS= ${SITE_PERL}/HTML/FromText.pm:${PORTSDIR}/www/p5-HTML-FromText
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Log::TraceMessages.3
.include <bsd.port.mk>
diff --git a/devel/p5-Log-TraceMessages/pkg-plist b/devel/p5-Log-TraceMessages/pkg-plist
index f5a8a3c52997..bbb321fe0f34 100644
--- a/devel/p5-Log-TraceMessages/pkg-plist
+++ b/devel/p5-Log-TraceMessages/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Log/TraceMessages.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/TraceMessages/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Log/TraceMessages/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Log/TraceMessages
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Log 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log/TraceMessages
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Log 2>/dev/null || true
+%%SITE_PERL%%/Log/TraceMessages.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/TraceMessages/.packlist
+%%SITE_PERL%%/auto/Log/TraceMessages/autosplit.ix
+@dirrm %%SITE_PERL%%/auto/Log/TraceMessages
+@unexec rmdir %D/%%SITE_PERL%%/auto/Log 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/TraceMessages
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
diff --git a/devel/p5-Mac-FileSpec-Unixish/Makefile b/devel/p5-Mac-FileSpec-Unixish/Makefile
index 21681fe1927a..c3980a0412e1 100644
--- a/devel/p5-Mac-FileSpec-Unixish/Makefile
+++ b/devel/p5-Mac-FileSpec-Unixish/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module with functions to manipluate pathspecs in Unixish style
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mac::FileSpec::Unixish.3
.include <bsd.port.mk>
diff --git a/devel/p5-Mac-FileSpec-Unixish/pkg-plist b/devel/p5-Mac-FileSpec-Unixish/pkg-plist
index d1c5a7a351d0..c2b9c92d76ab 100644
--- a/devel/p5-Mac-FileSpec-Unixish/pkg-plist
+++ b/devel/p5-Mac-FileSpec-Unixish/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac/FileSpec/Unixish/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Mac/FileSpec/Unixish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mac/FileSpec/unixish_guts_test.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac/FileSpec/Unixish
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac/FileSpec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mac/FileSpec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mac 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/FileSpec/Unixish/.packlist
+%%SITE_PERL%%/Mac/FileSpec/Unixish.pm
+%%SITE_PERL%%/Mac/FileSpec/unixish_guts_test.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/FileSpec/Unixish
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/FileSpec 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mac/FileSpec 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mac 2>/dev/null || true
diff --git a/devel/p5-Make/pkg-plist b/devel/p5-Make/pkg-plist
index 3161647df7d5..c602c151eddb 100644
--- a/devel/p5-Make/pkg-plist
+++ b/devel/p5-Make/pkg-plist
@@ -1,4 +1,4 @@
bin/perlmake
-lib/perl5/site_perl/%%PERL_VER%%/Make.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Make/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Make
+%%SITE_PERL%%/Make.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Make/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Make
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index cfaa84bf7feb..80035fd00a92 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Transparently speed up perl functions by caching return values
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -29,7 +29,6 @@ MAN3= Memoize.3 \
Memoize::SDBM_File.3 \
Memoize::Saves.3 \
Memoize::Storable.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e '$$_=";" if /warnings::/' ${WRKSRC}/Memoize.pm
diff --git a/devel/p5-Memoize/pkg-plist b/devel/p5-Memoize/pkg-plist
index f00621a1b96f..e8e987000b7b 100644
--- a/devel/p5-Memoize/pkg-plist
+++ b/devel/p5-Memoize/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Memoize/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Memoize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Memoize/ExpireTest.pm
-lib/perl5/site_perl/%%PERL_VER%%/Memoize/Saves.pm
-lib/perl5/site_perl/%%PERL_VER%%/Memoize/Expire.pm
-lib/perl5/site_perl/%%PERL_VER%%/Memoize/AnyDBM_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Memoize/Storable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Memoize/SDBM_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Memoize/ExpireFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Memoize/NDBM_File.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Memoize 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize/.packlist
+%%SITE_PERL%%/Memoize.pm
+%%SITE_PERL%%/Memoize/ExpireTest.pm
+%%SITE_PERL%%/Memoize/Saves.pm
+%%SITE_PERL%%/Memoize/Expire.pm
+%%SITE_PERL%%/Memoize/AnyDBM_File.pm
+%%SITE_PERL%%/Memoize/Storable.pm
+%%SITE_PERL%%/Memoize/SDBM_File.pm
+%%SITE_PERL%%/Memoize/ExpireFile.pm
+%%SITE_PERL%%/Memoize/NDBM_File.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Memoize 2>/dev/null || true
diff --git a/devel/p5-OLE-Storage_Lite/Makefile b/devel/p5-OLE-Storage_Lite/Makefile
index 9e3f83449be3..55ac4e1ef6a2 100644
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Perl module for OLE document interface
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS= ${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= OLE::Storage_Lite.3
.include <bsd.port.mk>
diff --git a/devel/p5-OLE-Storage_Lite/pkg-plist b/devel/p5-OLE-Storage_Lite/pkg-plist
index d3e15fe2a80d..5c53d35ef9f7 100644
--- a/devel/p5-OLE-Storage_Lite/pkg-plist
+++ b/devel/p5-OLE-Storage_Lite/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/OLE/Storage_Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/OLE/Storage_Lite/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/OLE/Storage_Lite
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/OLE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/OLE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/OLE 2>/dev/null || true
+%%SITE_PERL%%/OLE/Storage_Lite.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE/Storage_Lite/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE/Storage_Lite
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/OLE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE 2>/dev/null || true
diff --git a/devel/p5-PCSC-Card/pkg-plist b/devel/p5-PCSC-Card/pkg-plist
index 01d18ab1d80f..49e6458171c8 100644
--- a/devel/p5-PCSC-Card/pkg-plist
+++ b/devel/p5-PCSC-Card/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/PCSC.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/PCSC.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Chipcard/PCSC.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Chipcard/PCSC.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chipcard/PCSC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chipcard 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Chipcard/PCSC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Chipcard 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/PCSC.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/PCSC.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard 2>/dev/null || true
diff --git a/devel/p5-POE-Component-Client-POP3/Makefile b/devel/p5-POE-Component-Client-POP3/Makefile
index 30c1e7e23624..674ac5fce79a 100644
--- a/devel/p5-POE-Component-Client-POP3/Makefile
+++ b/devel/p5-POE-Component-Client-POP3/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Impliment a POP3 client POE component
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= POE::Component::Client::POP3.3
post-install:
diff --git a/devel/p5-POE-Component-Client-POP3/pkg-plist b/devel/p5-POE-Component-Client-POP3/pkg-plist
index eed6aad99217..5dd93f06af76 100644
--- a/devel/p5-POE-Component-Client-POP3/pkg-plist
+++ b/devel/p5-POE-Component-Client-POP3/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client/POP3.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3/.packlist
+%%SITE_PERL%%/POE/Component/Client/POP3.pm
%%PORTDOCS%%%%EXAMPLESDIR%%/test.perl
%%PORTDOCS%%%%EXAMPLESDIR%%/term.perl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index 3b20cfe882ea..a07f742cc8b9 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= POE directory watcher
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/devel/p5-POE-Component-DirWatch/pkg-plist b/devel/p5-POE-Component-DirWatch/pkg-plist
index 2ddceccbcd5e..22104bb9c279 100644
--- a/devel/p5-POE-Component-DirWatch/pkg-plist
+++ b/devel/p5-POE-Component-DirWatch/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/DirWatch.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch/.packlist
+%%SITE_PERL%%/POE/Component/DirWatch.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
%%PORTDOCS%%%%EXAMPLESDIR%%/dirwatch
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/p5-POE-Component-IKC-ReallySimple/Makefile b/devel/p5-POE-Component-IKC-ReallySimple/Makefile
index 88041b3c2a11..857008f1449f 100644
--- a/devel/p5-POE-Component-IKC-ReallySimple/Makefile
+++ b/devel/p5-POE-Component-IKC-ReallySimple/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= POE Component for simple inter-kernel communication
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE/Component/IKC/Responder.pm:${PORTSDIR}/devel/p5-POE-Component-IKC
+BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
+ ${SITE_PERL}/POE/Component/IKC/Responder.pm:${PORTSDIR}/devel/p5-POE-Component-IKC
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= POE::Component::IKC::ReallySimple.3
.include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-IKC-ReallySimple/pkg-plist b/devel/p5-POE-Component-IKC-ReallySimple/pkg-plist
index 712b5252351f..b0468bbfce42 100644
--- a/devel/p5-POE-Component-IKC-ReallySimple/pkg-plist
+++ b/devel/p5-POE-Component-IKC-ReallySimple/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/IKC/ReallySimple/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/IKC/ReallySimple.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/IKC/ReallySimple
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/IKC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/IKC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IKC/ReallySimple/.packlist
+%%SITE_PERL%%/POE/Component/IKC/ReallySimple.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IKC/ReallySimple
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component/IKC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IKC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index 0f12d637d747..e9fb1bddac60 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= A POE logging class
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/Parallel.pm:${PORTSDIR}/www/p5-ParallelUA
+BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
+ ${SITE_PERL}/LWP/Parallel.pm:${PORTSDIR}/www/p5-ParallelUA
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= POE::Component::Logger.3
.include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Logger/pkg-plist b/devel/p5-POE-Component-Logger/pkg-plist
index d0d93693169a..ef2acbbff5c9 100644
--- a/devel/p5-POE-Component-Logger/pkg-plist
+++ b/devel/p5-POE-Component-Logger/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Logger/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Logger.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Logger
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Logger 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger/.packlist
+%%SITE_PERL%%/POE/Component/Logger.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/devel/p5-POE-Session-Cascading/Makefile b/devel/p5-POE-Session-Cascading/Makefile
index 49641b3c079d..c95f6013443b 100644
--- a/devel/p5-POE-Session-Cascading/Makefile
+++ b/devel/p5-POE-Session-Cascading/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Stack-like POE Sessions
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= POE::Session::Cascading.3
post-patch:
diff --git a/devel/p5-POE-Session-Cascading/pkg-plist b/devel/p5-POE-Session-Cascading/pkg-plist
index 692f169e8880..73250d3b3bc5 100644
--- a/devel/p5-POE-Session-Cascading/pkg-plist
+++ b/devel/p5-POE-Session-Cascading/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Session/Cascading/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Session/Cascading.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Session/Cascading
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Session 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/Cascading/.packlist
+%%SITE_PERL%%/POE/Session/Cascading.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/Cascading
+@unexec rmdir %D/%%SITE_PERL%%/POE/Session 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/devel/p5-PPerl/pkg-plist b/devel/p5-PPerl/pkg-plist
index f35ec6dbe140..cbafc58ffbec 100644
--- a/devel/p5-PPerl/pkg-plist
+++ b/devel/p5-PPerl/pkg-plist
@@ -1,6 +1,6 @@
bin/pperl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PPerl/PPerl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PPerl/PPerl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PPerl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PPerl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PPerl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPerl/PPerl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPerl/PPerl.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPerl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/PPerl.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPerl
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 9f372ee89bb8..5837198f0931 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -16,7 +16,7 @@ DISTNAME= PerlVision-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl5 library for text-mode user interface widgets
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
USE_PERL5= YES
diff --git a/devel/p5-PV/pkg-plist b/devel/p5-PV/pkg-plist
index 3a472c641237..7f8211a4c0dc 100644
--- a/devel/p5-PV/pkg-plist
+++ b/devel/p5-PV/pkg-plist
@@ -1 +1 @@
-lib/perl5/site_perl/%%PERL_VER%%/PV.pm
+%%SITE_PERL%%/PV.pm
diff --git a/devel/p5-Parse-PerlConfig/pkg-plist b/devel/p5-Parse-PerlConfig/pkg-plist
index b1b95a262c56..9678b0f28ec9 100644
--- a/devel/p5-Parse-PerlConfig/pkg-plist
+++ b/devel/p5-Parse-PerlConfig/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Parse/PerlConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/PerlConfig/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/PerlConfig
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Parse 2>/dev/null || true
+%%SITE_PERL%%/Parse/PerlConfig.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/PerlConfig/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/PerlConfig
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
diff --git a/devel/p5-Parse-RecDescent/pkg-plist b/devel/p5-Parse-RecDescent/pkg-plist
index 74240678b3fb..aff17d14ca04 100644
--- a/devel/p5-Parse-RecDescent/pkg-plist
+++ b/devel/p5-Parse-RecDescent/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Parse/RecDescent.pm
%%SITE_PERL%%/Parse/RecDescent.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/RecDescent/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/RecDescent
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Parse 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/RecDescent
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
diff --git a/devel/p5-Penguin-Easy/Makefile b/devel/p5-Penguin-Easy/Makefile
index 0c5090d71a92..fad365b65cf7 100644
--- a/devel/p5-Penguin-Easy/Makefile
+++ b/devel/p5-Penguin-Easy/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A quick and easy implemention of the p5-Penguin module
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Penguin.pm:${PORTSDIR}/devel/p5-Penguin
+BUILD_DEPENDS= ${SITE_PERL}/Penguin.pm:${PORTSDIR}/devel/p5-Penguin
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Penguin::Easy.3
post-install:
diff --git a/devel/p5-Penguin-Easy/pkg-plist b/devel/p5-Penguin-Easy/pkg-plist
index 43d4a42a9647..8e0514be1274 100644
--- a/devel/p5-Penguin-Easy/pkg-plist
+++ b/devel/p5-Penguin-Easy/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Easy.pm
+%%SITE_PERL%%/Penguin/Easy.pm
lib/perl5/site_perl/Penguin/Easy/doc/Penguin-howto
lib/perl5/site_perl/Penguin/Easy/bin/ep
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Penguin/Easy/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Penguin/Easy
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin/Easy/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin/Easy
@dirrm lib/perl5/site_perl/Penguin/Easy/doc
@dirrm lib/perl5/site_perl/Penguin/Easy/bin
@dirrm lib/perl5/site_perl/Penguin/Easy
diff --git a/devel/p5-Penguin/pkg-plist b/devel/p5-Penguin/pkg-plist
index 6a3a15b50fc9..d12f4b68de92 100644
--- a/devel/p5-Penguin/pkg-plist
+++ b/devel/p5-Penguin/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/%%PERL_VER%%/Penguin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel/TCP/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel/TCP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Compartment.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Frame/Code.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Frame/Data.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/PGP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Rights.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Trivial/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Trivial/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Wrapper/PGP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Penguin/Wrapper/Transparent.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Penguin/.packlist
+%%SITE_PERL%%/Penguin.pm
+%%SITE_PERL%%/Penguin/Channel/TCP.pm
+%%SITE_PERL%%/Penguin/Channel/TCP/Client.pm
+%%SITE_PERL%%/Penguin/Channel/TCP/Server.pm
+%%SITE_PERL%%/Penguin/Compartment.pm
+%%SITE_PERL%%/Penguin/Frame/Code.pm
+%%SITE_PERL%%/Penguin/Frame/Data.pm
+%%SITE_PERL%%/Penguin/PGP.pm
+%%SITE_PERL%%/Penguin/Rights.pm
+%%SITE_PERL%%/Penguin/Trivial/Client.pm
+%%SITE_PERL%%/Penguin/Trivial/Server.pm
+%%SITE_PERL%%/Penguin/Wrapper/PGP.pm
+%%SITE_PERL%%/Penguin/Wrapper/Transparent.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin/.packlist
lib/perl5/site_perl/Penguin/bin/.pen
lib/perl5/site_perl/Penguin/bin/makeapplet
lib/perl5/site_perl/Penguin/bin/pclient
@@ -31,14 +31,14 @@ lib/perl5/site_perl/Penguin/doc/MODULE_NOTES
lib/perl5/site_perl/Penguin/doc/README
lib/perl5/site_perl/Penguin/doc/SECURITY
lib/perl5/site_perl/Penguin/doc/TODO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel/TCP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Frame
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Trivial
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Wrapper
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Penguin 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Penguin/Channel/TCP
+@dirrm %%SITE_PERL%%/Penguin/Channel
+@dirrm %%SITE_PERL%%/Penguin/Frame
+@dirrm %%SITE_PERL%%/Penguin/Trivial
+@dirrm %%SITE_PERL%%/Penguin/Wrapper
+@unexec rmdir %D/%%SITE_PERL%%/Penguin 2>/dev/null || true
@dirrm lib/perl5/site_perl/Penguin/bin
@dirrm lib/perl5/site_perl/Penguin/misc
@dirrm lib/perl5/site_perl/Penguin/doc
@unexec rmdir %D/lib/perl5/site_perl/Penguin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Penguin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin 2>/dev/null || true
diff --git a/devel/p5-PerlMenu/Makefile b/devel/p5-PerlMenu/Makefile
index a7a386df699d..b9f9b642b70a 100644
--- a/devel/p5-PerlMenu/Makefile
+++ b/devel/p5-PerlMenu/Makefile
@@ -16,12 +16,12 @@ DISTNAME= perlmenu.v4.0
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl5 module for displaying menus with Curses
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
USE_PERL5= yes
NO_BUILD= yes
do-install:
- ${INSTALL_DATA} ${WRKSRC}/perlmenu.pm ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+ ${INSTALL_DATA} ${WRKSRC}/perlmenu.pm ${SITE_PERL}
.include <bsd.port.mk>
diff --git a/devel/p5-PerlMenu/pkg-plist b/devel/p5-PerlMenu/pkg-plist
index cc47ab7e89a6..5b96346397c6 100644
--- a/devel/p5-PerlMenu/pkg-plist
+++ b/devel/p5-PerlMenu/pkg-plist
@@ -1 +1 @@
-lib/perl5/site_perl/%%PERL_VER%%/perlmenu.pm
+%%SITE_PERL%%/perlmenu.pm
diff --git a/devel/p5-Proc-Background/pkg-plist b/devel/p5-Proc-Background/pkg-plist
index a331011e6b31..d99f07fbc3ef 100644
--- a/devel/p5-Proc-Background/pkg-plist
+++ b/devel/p5-Proc-Background/pkg-plist
@@ -1,9 +1,9 @@
bin/timed-process
-lib/perl5/site_perl/%%PERL_VER%%/Proc/Background.pm
-lib/perl5/site_perl/%%PERL_VER%%/Proc/Background/Unix.pm
-lib/perl5/site_perl/%%PERL_VER%%/Proc/Background/Win32.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Background/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Background
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Proc/Background
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Proc 2>/dev/null || true
+%%SITE_PERL%%/Proc/Background.pm
+%%SITE_PERL%%/Proc/Background/Unix.pm
+%%SITE_PERL%%/Proc/Background/Win32.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Background/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Background
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Proc/Background
+@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index d45d5a7bc402..8aba5121b033 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module that provides a method to daemonify a Perl script
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Proc::Daemon.3
.include <bsd.port.mk>
diff --git a/devel/p5-Proc-Daemon/pkg-plist b/devel/p5-Proc-Daemon/pkg-plist
index 6ae30ec96c00..b3bdbb5c65de 100644
--- a/devel/p5-Proc-Daemon/pkg-plist
+++ b/devel/p5-Proc-Daemon/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Proc/Daemon.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Daemon/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Daemon
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Proc 2>/dev/null || true
+%%SITE_PERL%%/Proc/Daemon.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Daemon/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Daemon
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
diff --git a/devel/p5-Proc-Simple/Makefile b/devel/p5-Proc-Simple/Makefile
index 3051cdd8659f..c66652cef5b6 100644
--- a/devel/p5-Proc-Simple/Makefile
+++ b/devel/p5-Proc-Simple/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 module to launch and control background processes
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Proc::Simple.3
.include <bsd.port.mk>
diff --git a/devel/p5-Proc-Simple/pkg-plist b/devel/p5-Proc-Simple/pkg-plist
index 2bab69263344..e9cf0ffe17c9 100644
--- a/devel/p5-Proc-Simple/pkg-plist
+++ b/devel/p5-Proc-Simple/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Proc/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Proc/Simple/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Simple/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Proc/Simple
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Simple
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Proc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Proc
+%%SITE_PERL%%/Proc/Simple.pm
+%%SITE_PERL%%/auto/Proc/Simple/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Simple/.packlist
+@dirrm %%SITE_PERL%%/auto/Proc/Simple
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Simple
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrm %%SITE_PERL%%/auto/Proc
+@dirrm %%SITE_PERL%%/Proc
diff --git a/devel/p5-Rcs/Makefile b/devel/p5-Rcs/Makefile
index c6cbba17383e..25dd405590e1 100644
--- a/devel/p5-Rcs/Makefile
+++ b/devel/p5-Rcs/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl Object Class for Revision Control System (RCS)
PERL_CONFIGURE= yes
MAN3= Rcs.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
EXAMPLES= access.pl ci-tree.pl ci.pl co-tree.pl co.pl \
diff --git a/devel/p5-Rcs/pkg-plist b/devel/p5-Rcs/pkg-plist
index 7c63aec5bd90..ad624e112fb8 100644
--- a/devel/p5-Rcs/pkg-plist
+++ b/devel/p5-Rcs/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Rcs/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Rcs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs/.packlist
+%%SITE_PERL%%/Rcs.pm
share/examples/p5-Rcs/project/RCS/Rcs.pm,v
share/examples/p5-Rcs/project/RCS/testfile,v
share/examples/p5-Rcs/project/src/Rcs.pm
@@ -28,7 +28,7 @@ share/examples/p5-Rcs/test2.pl
share/examples/p5-Rcs/test3.pl
share/examples/p5-Rcs/type
share/examples/p5-Rcs/unlock.pl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Rcs 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs 2>/dev/null || true
@dirrm share/examples/p5-Rcs/project/RCS
@dirrm share/examples/p5-Rcs/project/src
@dirrm share/examples/p5-Rcs/project
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index 02713c681559..417d5ee60aa5 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to install die() and warn() handlers
PERL_CONFIGURE= YES
MAN3= Religion.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Religion/pkg-plist b/devel/p5-Religion/pkg-plist
index 863f429efc39..45662563e4e4 100644
--- a/devel/p5-Religion/pkg-plist
+++ b/devel/p5-Religion/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Religion.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Religion/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Religion
+%%SITE_PERL%%/Religion.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Religion/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Religion
diff --git a/devel/p5-ResourcePool/Makefile b/devel/p5-ResourcePool/Makefile
index d800875982f1..47d18cdc47de 100644
--- a/devel/p5-ResourcePool/Makefile
+++ b/devel/p5-ResourcePool/Makefile
@@ -38,8 +38,8 @@ post-install:
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-ResourcePool/pkg-plist b/devel/p5-ResourcePool/pkg-plist
index 94a51e3a199b..177f99faf5a8 100644
--- a/devel/p5-ResourcePool/pkg-plist
+++ b/devel/p5-ResourcePool/pkg-plist
@@ -1,31 +1,31 @@
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/BigPicture.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/Exception.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/Execute.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/Execute.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/NoFailoverException.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/NoFailoverException.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/ExtensionGuide.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer/FailOver.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer/FailBack.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer/FallBack.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer/LeastUsage.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer/RoundRobin.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Singleton.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Singleton.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/UML.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool
+%%SITE_PERL%%/ResourcePool.pm
+%%SITE_PERL%%/ResourcePool.pod
+%%SITE_PERL%%/ResourcePool/BigPicture.pod
+%%SITE_PERL%%/ResourcePool/Command.pm
+%%SITE_PERL%%/ResourcePool/Command.pod
+%%SITE_PERL%%/ResourcePool/Command/Exception.pm
+%%SITE_PERL%%/ResourcePool/Command/Exception.pod
+%%SITE_PERL%%/ResourcePool/Command/Execute.pm
+%%SITE_PERL%%/ResourcePool/Command/Execute.pod
+%%SITE_PERL%%/ResourcePool/Command/NoFailoverException.pm
+%%SITE_PERL%%/ResourcePool/Command/NoFailoverException.pod
+%%SITE_PERL%%/ResourcePool/ExtensionGuide.pod
+%%SITE_PERL%%/ResourcePool/Factory.pm
+%%SITE_PERL%%/ResourcePool/Factory.pod
+%%SITE_PERL%%/ResourcePool/LoadBalancer.pm
+%%SITE_PERL%%/ResourcePool/LoadBalancer.pod
+%%SITE_PERL%%/ResourcePool/LoadBalancer/FailOver.pm
+%%SITE_PERL%%/ResourcePool/LoadBalancer/FailBack.pm
+%%SITE_PERL%%/ResourcePool/LoadBalancer/FallBack.pm
+%%SITE_PERL%%/ResourcePool/LoadBalancer/LeastUsage.pm
+%%SITE_PERL%%/ResourcePool/LoadBalancer/RoundRobin.pm
+%%SITE_PERL%%/ResourcePool/Resource.pm
+%%SITE_PERL%%/ResourcePool/Resource.pod
+%%SITE_PERL%%/ResourcePool/Singleton.pm
+%%SITE_PERL%%/ResourcePool/Singleton.pod
+%%SITE_PERL%%/ResourcePool/UML.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool
+@dirrm %%SITE_PERL%%/ResourcePool/LoadBalancer
+@dirrm %%SITE_PERL%%/ResourcePool/Command
+@dirrm %%SITE_PERL%%/ResourcePool
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index 80362dd1fc42..aacdbd97d711 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module handling application defaults in Perl
PERL_CONFIGURE= YES
MAN3= Resources.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Resources/pkg-plist b/devel/p5-Resources/pkg-plist
index 950864f620b0..b24789f8f72b 100644
--- a/devel/p5-Resources/pkg-plist
+++ b/devel/p5-Resources/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Resources.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Resources/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Resources
+%%SITE_PERL%%/Resources.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Resources/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Resources
diff --git a/devel/p5-SDL/pkg-plist b/devel/p5-SDL/pkg-plist
index a3383e3fc28e..58ec1e174ca1 100644
--- a/devel/p5-SDL/pkg-plist
+++ b/devel/p5-SDL/pkg-plist
@@ -1,30 +1,30 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDL_perl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDL/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Cursor.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/TTFont.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Color.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Timer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/App.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Music.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Event.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/OpenGL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/OpenGL/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/OpenGL/Cube.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Mixer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Sound.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Surface.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Rect.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Palette.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Console.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Cdrom.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/FontTool.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Font.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/GraphicTool.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL_perl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDL_perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL/OpenGL
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SDL
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Cursor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/TTFont.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Color.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Timer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/App.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Music.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Event.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL/Model.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL/Cube.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Sound.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Surface.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Rect.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Palette.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Console.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Cdrom.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/FontTool.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Font.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GraphicTool.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL_perl.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SDL
diff --git a/devel/p5-Search-Binary/Makefile b/devel/p5-Search-Binary/Makefile
index 957ad1ee0808..0577e385e2bd 100644
--- a/devel/p5-Search-Binary/Makefile
+++ b/devel/p5-Search-Binary/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl module that implements a generic binary search algorithm
PERL_CONFIGURE= yes
MAN3= Search::Binary.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@${PERL} -pi -e 's|Seach|Search|' ${WRKSRC}/Binary.pm
diff --git a/devel/p5-Search-Binary/pkg-plist b/devel/p5-Search-Binary/pkg-plist
index 6eff989a0ab6..0b425962a3dc 100644
--- a/devel/p5-Search-Binary/pkg-plist
+++ b/devel/p5-Search-Binary/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Binary/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Search/Binary.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Binary
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Search 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Binary/.packlist
+%%SITE_PERL%%/Search/Binary.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Binary
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Search 2>/dev/null || true
diff --git a/devel/p5-Server-FastPL/Makefile b/devel/p5-Server-FastPL/Makefile
index 9c1911054582..6d37e93d9ab8 100644
--- a/devel/p5-Server-FastPL/Makefile
+++ b/devel/p5-Server-FastPL/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Server::FastPL.3 Server::FastPL::Client.3 \
Server::FastPL::Server.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Server-FastPL/pkg-plist b/devel/p5-Server-FastPL/pkg-plist
index 340e35b3d09b..eec4ff19cfb8 100644
--- a/devel/p5-Server-FastPL/pkg-plist
+++ b/devel/p5-Server-FastPL/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Server/FastPL/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Server/FastPL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Server/FastPL/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Server/FastPL/Server.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Server/FastPL
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Server/FastPL
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Server 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Server 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Server/FastPL/.packlist
+%%SITE_PERL%%/Server/FastPL.pm
+%%SITE_PERL%%/Server/FastPL/Client.pm
+%%SITE_PERL%%/Server/FastPL/Server.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Server/FastPL
+@dirrm %%SITE_PERL%%/Server/FastPL
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Server 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Server 2>/dev/null || true
diff --git a/devel/p5-Set-NestedGroups/Makefile b/devel/p5-Set-NestedGroups/Makefile
index 22e118c70dcb..9b82e467b10a 100644
--- a/devel/p5-Set-NestedGroups/Makefile
+++ b/devel/p5-Set-NestedGroups/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module for grouped data eg ACL's, city/state/country etc
PERL_CONFIGURE= yes
MAN3= Set::NestedGroups.3 Set::NestedGroups::Member.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Set-NestedGroups/pkg-plist b/devel/p5-Set-NestedGroups/pkg-plist
index c12df61ae564..23e5b215fd50 100644
--- a/devel/p5-Set-NestedGroups/pkg-plist
+++ b/devel/p5-Set-NestedGroups/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/NestedGroups/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Set/NestedGroups.pm
-lib/perl5/site_perl/%%PERL_VER%%/Set/NestedGroups/Member.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/NestedGroups
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Set/NestedGroups
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Set 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/NestedGroups/.packlist
+%%SITE_PERL%%/Set/NestedGroups.pm
+%%SITE_PERL%%/Set/NestedGroups/Member.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/NestedGroups
+@dirrm %%SITE_PERL%%/Set/NestedGroups
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
diff --git a/devel/p5-Set-Object/Makefile b/devel/p5-Set-Object/Makefile
index 250fe5fa0a5e..fcb7231533a4 100644
--- a/devel/p5-Set-Object/Makefile
+++ b/devel/p5-Set-Object/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to manage sets of objects
PERL_CONFIGURE= yes
MAN3= Set::Object.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Set-Object/pkg-plist b/devel/p5-Set-Object/pkg-plist
index 86fb329e56ea..129799ab3e0a 100644
--- a/devel/p5-Set-Object/pkg-plist
+++ b/devel/p5-Set-Object/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Object/Object.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Object/Object.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Object/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Object/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Set/Object.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Object
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Set 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/Object.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/Object.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Set/Object.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Set 2>/dev/null || true
diff --git a/devel/p5-Set-Scalar/Makefile b/devel/p5-Set-Scalar/Makefile
index a09fa069765f..a8631a7577e2 100644
--- a/devel/p5-Set-Scalar/Makefile
+++ b/devel/p5-Set-Scalar/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module containing a set of scalars, including references
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Set::Scalar.3 \
Set::Scalar::Base.3 \
Set::Scalar::Null.3 \
diff --git a/devel/p5-Set-Scalar/pkg-plist b/devel/p5-Set-Scalar/pkg-plist
index cb64949fa7a0..c26313ae6c7b 100644
--- a/devel/p5-Set-Scalar/pkg-plist
+++ b/devel/p5-Set-Scalar/pkg-plist
@@ -1,13 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar/Real.pm
-lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar/ValuedUniverse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar/Valued.pm
-lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar/Virtual.pm
-lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar/Universe.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Scalar/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Scalar
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Set/Scalar
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Set 2>/dev/null || true
+%%SITE_PERL%%/Set/Scalar.pm
+%%SITE_PERL%%/Set/Scalar/Base.pm
+%%SITE_PERL%%/Set/Scalar/Null.pm
+%%SITE_PERL%%/Set/Scalar/Real.pm
+%%SITE_PERL%%/Set/Scalar/ValuedUniverse.pm
+%%SITE_PERL%%/Set/Scalar/Valued.pm
+%%SITE_PERL%%/Set/Scalar/Virtual.pm
+%%SITE_PERL%%/Set/Scalar/Universe.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Scalar/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Scalar
+@dirrm %%SITE_PERL%%/Set/Scalar
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
diff --git a/devel/p5-Shape/pkg-plist b/devel/p5-Shape/pkg-plist
index 9f1f2dde67af..45647d3dfae5 100644
--- a/devel/p5-Shape/pkg-plist
+++ b/devel/p5-Shape/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Shape.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shape/Shape.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shape/Shape.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shape/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shape/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shape
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shape 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Shape.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/Shape.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/Shape.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape 2>/dev/null || true
diff --git a/devel/p5-Sort-ArrayOfArrays/Makefile b/devel/p5-Sort-ArrayOfArrays/Makefile
index 12eebbff18bf..b836e1acb3e1 100644
--- a/devel/p5-Sort-ArrayOfArrays/Makefile
+++ b/devel/p5-Sort-ArrayOfArrays/Makefile
@@ -18,6 +18,5 @@ COMMENT= Sort an arbitrary array of arrays
PERL_CONFIGURE= yes
MAN3= Sort::ArrayOfArrays.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Sort-ArrayOfArrays/pkg-plist b/devel/p5-Sort-ArrayOfArrays/pkg-plist
index bcaf2cb3ded3..e0f755cedfc2 100644
--- a/devel/p5-Sort-ArrayOfArrays/pkg-plist
+++ b/devel/p5-Sort-ArrayOfArrays/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sort/ArrayOfArrays.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sort 2>/dev/null || true
+%%SITE_PERL%%/Sort/ArrayOfArrays.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
diff --git a/devel/p5-Sort-Versions/Makefile b/devel/p5-Sort-Versions/Makefile
index cce7e9f8bde6..37ccba6f6d36 100644
--- a/devel/p5-Sort-Versions/Makefile
+++ b/devel/p5-Sort-Versions/Makefile
@@ -17,7 +17,6 @@ COMMENT= A perl 5 module for sorting of revision-like numbers
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Sort::Versions.3
.include <bsd.port.mk>
diff --git a/devel/p5-Sort-Versions/pkg-plist b/devel/p5-Sort-Versions/pkg-plist
index 96598304ce16..4f90aba0dc33 100644
--- a/devel/p5-Sort-Versions/pkg-plist
+++ b/devel/p5-Sort-Versions/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sort/Versions.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/Versions/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/Versions
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
+%%SITE_PERL%%/Sort/Versions.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Versions/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Versions
+@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
diff --git a/devel/p5-String-CRC32/Makefile b/devel/p5-String-CRC32/Makefile
index 0f572d817a7c..d362f32d981f 100644
--- a/devel/p5-String-CRC32/Makefile
+++ b/devel/p5-String-CRC32/Makefile
@@ -15,10 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ache@FreeBSD.org
COMMENT= Perl interface for cyclic redundency check generation
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= String::CRC32.3
.include <bsd.port.mk>
diff --git a/devel/p5-String-CRC32/pkg-plist b/devel/p5-String-CRC32/pkg-plist
index 561b1ba40a40..d4b9256b011c 100644
--- a/devel/p5-String-CRC32/pkg-plist
+++ b/devel/p5-String-CRC32/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String/CRC32.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String/CRC32.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/CRC32/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/CRC32
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String
+%%SITE_PERL%%/%%PERL_ARCH%%/String/CRC32.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/String/CRC32.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index aa7deaef2c0f..eed1462ab52c 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module implementing an extensible string validation interface
BUILD_DEPENDS= ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= String::Checker.3
.include <bsd.port.mk>
diff --git a/devel/p5-String-Checker/pkg-plist b/devel/p5-String-Checker/pkg-plist
index 9bec63a354d6..911be55bbfff 100644
--- a/devel/p5-String-Checker/pkg-plist
+++ b/devel/p5-String-Checker/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/String/Checker.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Checker/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Checker
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/String 2>/dev/null || true
+%%SITE_PERL%%/String/Checker.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
diff --git a/devel/p5-String-LRC/Makefile b/devel/p5-String-LRC/Makefile
index 1afe90a8216b..80d925fa3e38 100644
--- a/devel/p5-String-LRC/Makefile
+++ b/devel/p5-String-LRC/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A perl interface for longitudinal redundancy check generation
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= String::LRC.3
diff --git a/devel/p5-String-LRC/pkg-plist b/devel/p5-String-LRC/pkg-plist
index 6e3ec60f0f13..25464744f8c3 100644
--- a/devel/p5-String-LRC/pkg-plist
+++ b/devel/p5-String-LRC/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String/LRC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String/LRC.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String/bench.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/LRC/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/LRC/LRC.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/LRC/LRC.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/LRC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String
+%%SITE_PERL%%/%%PERL_ARCH%%/String/LRC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/String/LRC.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/String/bench.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC/LRC.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC/LRC.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/devel/p5-String-Parity/Makefile b/devel/p5-String-Parity/Makefile
index a04e715247d2..d08699b89260 100644
--- a/devel/p5-String-Parity/Makefile
+++ b/devel/p5-String-Parity/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A perl5 module to generate and test even, odd, mark and space parity
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= String::Parity.3
diff --git a/devel/p5-String-Parity/pkg-plist b/devel/p5-String-Parity/pkg-plist
index c0e10705a3c1..978bbbed4b78 100644
--- a/devel/p5-String-Parity/pkg-plist
+++ b/devel/p5-String-Parity/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/String/Parity.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Parity/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Parity
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/String
+%%SITE_PERL%%/String/Parity.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Parity/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Parity
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrm %%SITE_PERL%%/String
diff --git a/devel/p5-String-RexxParse/Makefile b/devel/p5-String-RexxParse/Makefile
index 373725f1b557..c81d21400ddf 100644
--- a/devel/p5-String-RexxParse/Makefile
+++ b/devel/p5-String-RexxParse/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module that provides an interface to REXX parsing routines
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= String::RexxParse.3
.include <bsd.port.mk>
diff --git a/devel/p5-String-RexxParse/pkg-plist b/devel/p5-String-RexxParse/pkg-plist
index 101d90ecb98a..31b9f77618d6 100644
--- a/devel/p5-String-RexxParse/pkg-plist
+++ b/devel/p5-String-RexxParse/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/String/RexxParse.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/RexxParse/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/RexxParse
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/String 2>/dev/null || true
+%%SITE_PERL%%/String/RexxParse.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
diff --git a/devel/p5-String-Similarity/Makefile b/devel/p5-String-Similarity/Makefile
index 36e99535d253..f9d504ebe584 100644
--- a/devel/p5-String-Similarity/Makefile
+++ b/devel/p5-String-Similarity/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module that calculates the similarity of two strings
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= String::Similarity.3
.include <bsd.port.mk>
diff --git a/devel/p5-String-Similarity/pkg-plist b/devel/p5-String-Similarity/pkg-plist
index a3a703465f44..e502fbff6a5a 100644
--- a/devel/p5-String-Similarity/pkg-plist
+++ b/devel/p5-String-Similarity/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String/Similarity.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Similarity/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Similarity/Similarity.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Similarity/Similarity.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Similarity
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/String/Similarity.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity/Similarity.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity/Similarity.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true
diff --git a/devel/p5-Sub-Uplevel/pkg-plist b/devel/p5-Sub-Uplevel/pkg-plist
index 0133b0cc9ae1..341fcf0a0cc8 100644
--- a/devel/p5-Sub-Uplevel/pkg-plist
+++ b/devel/p5-Sub-Uplevel/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Sub/Uplevel/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Sub/Uplevel.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Sub/Uplevel
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Sub 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/mach/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sub 2>/dev/null || true
+%%SITE_PERL%%/mach/auto/Sub/Uplevel/.packlist
+%%SITE_PERL%%/Sub/Uplevel.pm
+@dirrm %%SITE_PERL%%/mach/auto/Sub/Uplevel
+@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Sub 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/mach/auto 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sub 2>/dev/null || true
diff --git a/devel/p5-System2/Makefile b/devel/p5-System2/Makefile
index 5865eec15590..aa81d5c1850d 100644
--- a/devel/p5-System2/Makefile
+++ b/devel/p5-System2/Makefile
@@ -18,6 +18,5 @@ COMMENT= System2 - like system(), but with STDERR available as well
PERL_CONFIGURE= yes
MAN3= System2.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-System2/pkg-plist b/devel/p5-System2/pkg-plist
index 71cd4596d079..f8721e5bffd6 100644
--- a/devel/p5-System2/pkg-plist
+++ b/devel/p5-System2/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/auto/System2/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/System2/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/System2.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/System2
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/System2
+%%SITE_PERL%%/auto/System2/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/System2/.packlist
+%%SITE_PERL%%/System2.pm
+@dirrm %%SITE_PERL%%/auto/System2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/System2
diff --git a/devel/p5-Term-ProgressBar/Makefile b/devel/p5-Term-ProgressBar/Makefile
index 8ec4d785f495..63ed6168a9cb 100644
--- a/devel/p5-Term-ProgressBar/Makefile
+++ b/devel/p5-Term-ProgressBar/Makefile
@@ -19,12 +19,11 @@ BUILD_DEPENDS= ${SITE_PERL}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-Met
${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME}
PERL_CONFIGURE= yes
MAN3= Term::ProgressBar.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-fetch:
@${ECHO} ""
diff --git a/devel/p5-Term-ProgressBar/pkg-plist b/devel/p5-Term-ProgressBar/pkg-plist
index bf6013413ae3..a0cb0fc0a1a4 100644
--- a/devel/p5-Term-ProgressBar/pkg-plist
+++ b/devel/p5-Term-ProgressBar/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/Term/ProgressBar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term-ProgressBar/.packlist
+%%SITE_PERL%%/Term/ProgressBar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term-ProgressBar/.packlist
%%PORTDOCS%%share/examples/Term-ProgressBar/powers
%%PORTDOCS%%share/examples/Term-ProgressBar/powers2
%%PORTDOCS%%share/examples/Term-ProgressBar/powers3
%%PORTDOCS%%share/examples/Term-ProgressBar/powers4
%%PORTDOCS%%share/examples/Term-ProgressBar/powers5
%%PORTDOCS%%@dirrm share/examples/Term-ProgressBar
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term-ProgressBar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Term 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term-ProgressBar 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index 85d2782f2bda..65eefdf0f9e6 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl extension for prompting a user for information
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Term::Prompt.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Term-Prompt/pkg-plist b/devel/p5-Term-Prompt/pkg-plist
index f4d1e17b8db9..8d10b1e34b3f 100644
--- a/devel/p5-Term-Prompt/pkg-plist
+++ b/devel/p5-Term-Prompt/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Prompt/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Term/Prompt.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Prompt
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Term 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Prompt/.packlist
+%%SITE_PERL%%/Term/Prompt.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Prompt
+@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index be7bfbb1d115..a9a45ed964bb 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive question-response user interface module
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Array/PrintCols.pm:${PORTSDIR}/misc/p5-Array-PrintCols
+RUN_DEPENDS= ${SITE_PERL}/Array/PrintCols.pm:${PORTSDIR}/misc/p5-Array-PrintCols
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Term::Query.3
.include <bsd.port.mk>
diff --git a/devel/p5-Term-Query/pkg-plist b/devel/p5-Term-Query/pkg-plist
index 39dbf789468a..3776eb0e2d70 100644
--- a/devel/p5-Term-Query/pkg-plist
+++ b/devel/p5-Term-Query/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Term/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/Term/Tester.pm
-lib/perl5/site_perl/%%PERL_VER%%/Term/Query_Test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Query/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Query
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Term 2>/dev/null || true
+%%SITE_PERL%%/Term/Query.pm
+%%SITE_PERL%%/Term/Tester.pm
+%%SITE_PERL%%/Term/Query_Test.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Query/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Query
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index e2926c3d63be..08076dcafe9d 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl5 module for simple terminal control
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Term::ReadKey.3
.include <bsd.port.mk>
diff --git a/devel/p5-Term-ReadKey/pkg-plist b/devel/p5-Term-ReadKey/pkg-plist
index e2cf651a2b1c..01c07e2ec9bb 100644
--- a/devel/p5-Term-ReadKey/pkg-plist
+++ b/devel/p5-Term-ReadKey/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadKey.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Term 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
diff --git a/devel/p5-Term-Screen/pkg-plist b/devel/p5-Term-Screen/pkg-plist
index cbf8b180b079..dddf0570cc94 100644
--- a/devel/p5-Term-Screen/pkg-plist
+++ b/devel/p5-Term-Screen/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Term/Screen.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Screen/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Screen
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Term 2>/dev/null || true
+%%SITE_PERL%%/Term/Screen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Screen/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Screen
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
diff --git a/devel/p5-Term-Size/Makefile b/devel/p5-Term-Size/Makefile
index 2f647f9e15e4..e81aa2841ef9 100644
--- a/devel/p5-Term-Size/Makefile
+++ b/devel/p5-Term-Size/Makefile
@@ -17,7 +17,6 @@ COMMENT= A Perl5 module to handle window size changes.
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Term::Size.3
.include <bsd.port.mk>
diff --git a/devel/p5-Term-Size/pkg-plist b/devel/p5-Term-Size/pkg-plist
index 2e58b3fc30da..11973abe9de5 100644
--- a/devel/p5-Term-Size/pkg-plist
+++ b/devel/p5-Term-Size/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/Size.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Size/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Size/Size.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Size/Size.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Size/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Size
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Term 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Term/Size.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/Size.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/Size.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Term 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
diff --git a/devel/p5-Test-Class/Makefile b/devel/p5-Test-Class/Makefile
index fc2bf5fb1274..c42932ff0db6 100644
--- a/devel/p5-Test-Class/Makefile
+++ b/devel/p5-Test-Class/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Test::Class - Easily create test classes in an xUnit style
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/Builder/Tester.pm:${PORTSDIR}/devel/p5-Test-Builder-Tester \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/Differences.pm:${PORTSDIR}/devel/p5-Test-Differences
+BUILD_DEPENDS= ${SITE_PERL}/Test/Builder/Tester.pm:${PORTSDIR}/devel/p5-Test-Builder-Tester \
+ ${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
+ ${SITE_PERL}/Test/Differences.pm:${PORTSDIR}/devel/p5-Test-Differences
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -34,14 +34,14 @@ IGNORE= Port requires perl 5.6.x or later. Install lang/perl5 then try again
.endif
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Attribute/Handlers.pm:${PORTSDIR}/devel/p5-Attribute-Handlers
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Attribute/Handlers.pm:${PORTSDIR}/devel/p5-Attribute-Handlers
+BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
+ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+ ${SITE_PERL}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA \
+ ${SITE_PERL}/Attribute/Handlers.pm:${PORTSDIR}/devel/p5-Attribute-Handlers
+RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
+ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+ ${SITE_PERL}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA \
+ ${SITE_PERL}/Attribute/Handlers.pm:${PORTSDIR}/devel/p5-Attribute-Handlers
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Class/pkg-plist b/devel/p5-Test-Class/pkg-plist
index 4e8bc3955165..b3a3c65e7bc4 100644
--- a/devel/p5-Test-Class/pkg-plist
+++ b/devel/p5-Test-Class/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Test/Class/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Test/Class.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Test/Class
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Test 2>/dev/null || true
+%%SITE_PERL%%/mach/auto/Test/Class/.packlist
+%%SITE_PERL%%/Test/Class.pm
+@dirrm %%SITE_PERL%%/mach/auto/Test/Class
+@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
diff --git a/devel/p5-Test-Differences/Makefile b/devel/p5-Test-Differences/Makefile
index 108f37f78ca9..ab29f035e466 100644
--- a/devel/p5-Test-Differences/Makefile
+++ b/devel/p5-Test-Differences/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Test::Differences - Test strings and data structures for differences
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff
+BUILD_DEPENDS= ${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -25,8 +25,8 @@ MAN3= Test::Differences.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Differences/pkg-plist b/devel/p5-Test-Differences/pkg-plist
index aaa76fc4d837..3730d915ff98 100644
--- a/devel/p5-Test-Differences/pkg-plist
+++ b/devel/p5-Test-Differences/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test/Differences/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Test/Differences.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test/Differences
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Test 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Differences/.packlist
+%%SITE_PERL%%/Test/Differences.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Differences
+@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Test 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
diff --git a/devel/p5-Test-Exception/Makefile b/devel/p5-Test-Exception/Makefile
index 4c2148bd3419..99f7e95bc5a9 100644
--- a/devel/p5-Test-Exception/Makefile
+++ b/devel/p5-Test-Exception/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Test::Exception - test functions for exception based code
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/Builder/Tester.pm:${PORTSDIR}/devel/p5-Test-Builder-Tester \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Sub/Uplevel.pm:${PORTSDIR}/devel/p5-Sub-Uplevel
+BUILD_DEPENDS= ${SITE_PERL}/Test/Builder/Tester.pm:${PORTSDIR}/devel/p5-Test-Builder-Tester \
+ ${SITE_PERL}/Sub/Uplevel.pm:${PORTSDIR}/devel/p5-Sub-Uplevel
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -34,8 +34,8 @@ IGNORE= Port requires perl 5.6.x or later. Install lang/perl5 then try again
.endif
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Exception/pkg-plist b/devel/p5-Test-Exception/pkg-plist
index f00cb3fe1bd2..230e6b5cb2ad 100644
--- a/devel/p5-Test-Exception/pkg-plist
+++ b/devel/p5-Test-Exception/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Test/Exception/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Test/Exception.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Test/Exception
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Test 2>/dev/null || true
+%%SITE_PERL%%/mach/auto/Test/Exception/.packlist
+%%SITE_PERL%%/Test/Exception.pm
+@dirrm %%SITE_PERL%%/mach/auto/Test/Exception
+@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index cc2425fc00a1..85b37f914fda 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Test::Inline - Inlining your tests next to the code being tested
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness
+BUILD_DEPENDS= ${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -31,8 +31,8 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
.endif
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Inline/pkg-plist b/devel/p5-Test-Inline/pkg-plist
index 25e0eb2450a9..cfb0d027af88 100644
--- a/devel/p5-Test-Inline/pkg-plist
+++ b/devel/p5-Test-Inline/pkg-plist
@@ -1,12 +1,12 @@
bin/pod2test
-lib/perl5/site_perl/%%PERL_VER%%/Test/Inline/Tutorial.pod
-lib/perl5/site_perl/%%PERL_VER%%/Test/Inline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Tests.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Tests/Tutorial.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test/Inline/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test/Inline
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Test/Inline
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Test 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod/Tests
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pod 2>/dev/null || true
+%%SITE_PERL%%/Test/Inline/Tutorial.pod
+%%SITE_PERL%%/Test/Inline.pm
+%%SITE_PERL%%/Pod/Tests.pm
+%%SITE_PERL%%/Pod/Tests/Tutorial.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Inline/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Inline
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Test/Inline
+@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Pod/Tests
+@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
diff --git a/devel/p5-Test-Manifest/Makefile b/devel/p5-Test-Manifest/Makefile
index 6ef30c7b0813..79ac55aefd77 100644
--- a/devel/p5-Test-Manifest/Makefile
+++ b/devel/p5-Test-Manifest/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to interact with a t/test_manifest file
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Test::Manifest.3
.include <bsd.port.mk>
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index 4d222d2ae1a2..2866e87cef35 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3= Test::More.3 Test::Simple.3 Test::Tutorial.3 \
Test::Builder.3
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/p5-Test-Simple/pkg-plist b/devel/p5-Test-Simple/pkg-plist
index 94d8804afe20..410231cdce60 100644
--- a/devel/p5-Test-Simple/pkg-plist
+++ b/devel/p5-Test-Simple/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Test/Builder.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/More.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Tutorial.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test/Simple/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test/Simple
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Test 2>/dev/null || true
+%%SITE_PERL%%/Test/Builder.pm
+%%SITE_PERL%%/Test/More.pm
+%%SITE_PERL%%/Test/Simple.pm
+%%SITE_PERL%%/Test/Tutorial.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Simple/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Simple
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
diff --git a/devel/p5-Test-Unit/Makefile b/devel/p5-Test-Unit/Makefile
index 174275e62a1c..febfead3876b 100644
--- a/devel/p5-Test-Unit/Makefile
+++ b/devel/p5-Test-Unit/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= PerlUnit testing framework
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Error.pm:${PORTSDIR}/lang/p5-Error \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/Inner.pm:${PORTSDIR}/devel/p5-Class-Inner \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/base.pm:${PORTSDIR}/devel/p5-Class-Fields
+BUILD_DEPENDS= ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
+ ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
+ ${SITE_PERL}/Class/Inner.pm:${PORTSDIR}/devel/p5-Class-Inner \
+ ${SITE_PERL}/base.pm:${PORTSDIR}/devel/p5-Class-Fields
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/devel/p5-Test-Unit/pkg-plist b/devel/p5-Test-Unit/pkg-plist
index 69e3efe87582..e7e3508943c4 100644
--- a/devel/p5-Test-Unit/pkg-plist
+++ b/devel/p5-Test-Unit/pkg-plist
@@ -1,38 +1,38 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test/Unit/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Test/TestLister.pl
-lib/perl5/site_perl/%%PERL_VER%%/Test/TestRunner.pl
-lib/perl5/site_perl/%%PERL_VER%%/Test/TkTestRunner.pl
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Assert.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Assertion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Assertion/Boolean.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Assertion/CodeRef.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Assertion/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Assertion/Regexp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Decorator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Error.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Failure.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/HarnessUnit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Listener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Loader.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Procedural.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Result.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Runner.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Runner/Terminal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Setup.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/TestCase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/TestRunner.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/TestSuite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/TkTestRunner.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Tutorial.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/UnitHarness.pm
-lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Warning.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Assertion
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Test/Unit/Runner
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Test/Unit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test/Unit
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Unit/.packlist
+%%SITE_PERL%%/Test/TestLister.pl
+%%SITE_PERL%%/Test/TestRunner.pl
+%%SITE_PERL%%/Test/TkTestRunner.pl
+%%SITE_PERL%%/Test/Unit.pm
+%%SITE_PERL%%/Test/Unit/Assert.pm
+%%SITE_PERL%%/Test/Unit/Assertion.pm
+%%SITE_PERL%%/Test/Unit/Assertion/Boolean.pm
+%%SITE_PERL%%/Test/Unit/Assertion/CodeRef.pm
+%%SITE_PERL%%/Test/Unit/Assertion/Exception.pm
+%%SITE_PERL%%/Test/Unit/Assertion/Regexp.pm
+%%SITE_PERL%%/Test/Unit/Debug.pm
+%%SITE_PERL%%/Test/Unit/Decorator.pm
+%%SITE_PERL%%/Test/Unit/Error.pm
+%%SITE_PERL%%/Test/Unit/Exception.pm
+%%SITE_PERL%%/Test/Unit/Failure.pm
+%%SITE_PERL%%/Test/Unit/HarnessUnit.pm
+%%SITE_PERL%%/Test/Unit/Listener.pm
+%%SITE_PERL%%/Test/Unit/Loader.pm
+%%SITE_PERL%%/Test/Unit/Procedural.pm
+%%SITE_PERL%%/Test/Unit/Result.pm
+%%SITE_PERL%%/Test/Unit/Runner.pm
+%%SITE_PERL%%/Test/Unit/Runner/Terminal.pm
+%%SITE_PERL%%/Test/Unit/Setup.pm
+%%SITE_PERL%%/Test/Unit/Test.pm
+%%SITE_PERL%%/Test/Unit/TestCase.pm
+%%SITE_PERL%%/Test/Unit/TestRunner.pm
+%%SITE_PERL%%/Test/Unit/TestSuite.pm
+%%SITE_PERL%%/Test/Unit/TkTestRunner.pm
+%%SITE_PERL%%/Test/Unit/Tutorial.pm
+%%SITE_PERL%%/Test/Unit/UnitHarness.pm
+%%SITE_PERL%%/Test/Unit/Warning.pm
+@dirrm %%SITE_PERL%%/Test/Unit/Assertion
+@dirrm %%SITE_PERL%%/Test/Unit/Runner
+@dirrm %%SITE_PERL%%/Test/Unit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Unit
+@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
diff --git a/devel/p5-Tie-Cache/Makefile b/devel/p5-Tie-Cache/Makefile
index 4a834e50a1d2..0f7a219158ca 100644
--- a/devel/p5-Tie-Cache/Makefile
+++ b/devel/p5-Tie-Cache/Makefile
@@ -20,6 +20,5 @@ PERL_CONFIGURE= yes
INSTALL_TARGET= pure_install
MAN3= Tie::Cache.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Tie-Cache/pkg-plist b/devel/p5-Tie-Cache/pkg-plist
index 2da04c7c6d6c..f00171a6db76 100644
--- a/devel/p5-Tie-Cache/pkg-plist
+++ b/devel/p5-Tie-Cache/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tie/Cache.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tie/bench.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/Cache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/Cache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tie 2>/dev/null || true
+%%SITE_PERL%%/Tie/Cache.pm
+%%SITE_PERL%%/Tie/bench.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Cache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Cache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
diff --git a/devel/p5-Tie-DB_FileLock/Makefile b/devel/p5-Tie-DB_FileLock/Makefile
index 9fd3e8ad09a0..f309f6ac6dbc 100644
--- a/devel/p5-Tie-DB_FileLock/Makefile
+++ b/devel/p5-Tie-DB_FileLock/Makefile
@@ -18,6 +18,5 @@ COMMENT= Locking access to Berkeley DB v1.x
PERL_CONFIGURE= yes
MAN3= Tie::DB_FileLock.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Tie-DB_FileLock/pkg-plist b/devel/p5-Tie-DB_FileLock/pkg-plist
index 9c956c5be933..b2c0cfa143b1 100644
--- a/devel/p5-Tie-DB_FileLock/pkg-plist
+++ b/devel/p5-Tie-DB_FileLock/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tie/DB_FileLock.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/DB_FileLock/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Tie
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/DB_FileLock
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie
+%%SITE_PERL%%/Tie/DB_FileLock.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DB_FileLock/.packlist
+@dirrm %%SITE_PERL%%/Tie
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DB_FileLock
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
diff --git a/devel/p5-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index 7a07b6af854c..2385ea3f69a7 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module implementing ordered in-memory associative arrays
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tie::IxHash.3
.include <bsd.port.mk>
diff --git a/devel/p5-Tie-IxHash/pkg-plist b/devel/p5-Tie-IxHash/pkg-plist
index c1817a7074c1..ff6998167a43 100644
--- a/devel/p5-Tie-IxHash/pkg-plist
+++ b/devel/p5-Tie-IxHash/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tie/IxHash.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/IxHash/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/IxHash
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tie 2>/dev/null || true
+%%SITE_PERL%%/Tie/IxHash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/IxHash/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/IxHash
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
diff --git a/devel/p5-Time-Duration/pkg-plist b/devel/p5-Time-Duration/pkg-plist
index 56ff0aceb93b..7b25d146ff45 100644
--- a/devel/p5-Time-Duration/pkg-plist
+++ b/devel/p5-Time-Duration/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Duration/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Time/Duration.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Duration
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Duration/.packlist
+%%SITE_PERL%%/Time/Duration.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Duration
+@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
diff --git a/devel/p5-Time-Object/pkg-plist b/devel/p5-Time-Object/pkg-plist
index 5bc5a0bc0ca9..f09bd61bae95 100644
--- a/devel/p5-Time-Object/pkg-plist
+++ b/devel/p5-Time-Object/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Object/Object.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Object/Object.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Object/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Time/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Time/Seconds.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Object
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Object/Object.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Object/Object.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Object/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Time/Object.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Time/Seconds.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Object
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Time 2>/dev/null || true
diff --git a/devel/p5-Time-Period/Makefile b/devel/p5-Time-Period/Makefile
index 9d0cf1070362..f2e3276004d6 100644
--- a/devel/p5-Time-Period/Makefile
+++ b/devel/p5-Time-Period/Makefile
@@ -19,6 +19,5 @@ COMMENT= A perl module that contains code to deal with time periods
PERL_CONFIGURE= YES
MAN3= Time::Period.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Time-Period/pkg-plist b/devel/p5-Time-Period/pkg-plist
index 5b5ba7910812..946fc11ac4a1 100644
--- a/devel/p5-Time-Period/pkg-plist
+++ b/devel/p5-Time-Period/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Time/Period.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Period/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Period
+%%SITE_PERL%%/Time/Period.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Period/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Period
diff --git a/devel/p5-Time-Piece/Makefile b/devel/p5-Time-Piece/Makefile
index 939fc1ed0901..3300e8695b45 100644
--- a/devel/p5-Time-Piece/Makefile
+++ b/devel/p5-Time-Piece/Makefile
@@ -18,6 +18,5 @@ COMMENT= Time::Piece - Object Oriented time objects
PERL_CONFIGURE= yes
MAN3= Time::Piece.3 Time::Seconds.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Time-Piece/pkg-plist b/devel/p5-Time-Piece/pkg-plist
index 859f7a3f49e1..c87e64e31c44 100644
--- a/devel/p5-Time-Piece/pkg-plist
+++ b/devel/p5-Time-Piece/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Piece/Piece.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Piece/Piece.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Piece/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Time/Piece.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Time/Seconds.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/Piece
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/Piece.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/Piece.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Time/Piece.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Time/Seconds.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Time 2>/dev/null || true
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 0bc64fe4d2b1..bb09c17cb2e7 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -21,6 +21,5 @@ PERL_CONFIGURE= YES
MAN3= Date::Format.3 \
Date::Parse.3 \
Time::Zone.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-TimeDate/pkg-plist b/devel/p5-TimeDate/pkg-plist
index e331917bef54..dab6aeb3610f 100644
--- a/devel/p5-TimeDate/pkg-plist
+++ b/devel/p5-TimeDate/pkg-plist
@@ -1,32 +1,32 @@
-lib/perl5/site_perl/%%PERL_VER%%/Date/Format.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Afar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Amharic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Austrian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Brazilian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Chinese_GB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Czech.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Danish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Dutch.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/English.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Finnish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/French.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Gedeo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/German.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Greek.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Italian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Norwegian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Oromo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Sidama.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Somali.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Swedish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/Tigrinya.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/TigrinyaEritrean.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Language/TigrinyaEthiopian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Parse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Time/Zone.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TimeDate/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Date/Language
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TimeDate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
+%%SITE_PERL%%/Date/Format.pm
+%%SITE_PERL%%/Date/Language.pm
+%%SITE_PERL%%/Date/Language/Afar.pm
+%%SITE_PERL%%/Date/Language/Amharic.pm
+%%SITE_PERL%%/Date/Language/Austrian.pm
+%%SITE_PERL%%/Date/Language/Brazilian.pm
+%%SITE_PERL%%/Date/Language/Chinese_GB.pm
+%%SITE_PERL%%/Date/Language/Czech.pm
+%%SITE_PERL%%/Date/Language/Danish.pm
+%%SITE_PERL%%/Date/Language/Dutch.pm
+%%SITE_PERL%%/Date/Language/English.pm
+%%SITE_PERL%%/Date/Language/Finnish.pm
+%%SITE_PERL%%/Date/Language/French.pm
+%%SITE_PERL%%/Date/Language/Gedeo.pm
+%%SITE_PERL%%/Date/Language/German.pm
+%%SITE_PERL%%/Date/Language/Greek.pm
+%%SITE_PERL%%/Date/Language/Italian.pm
+%%SITE_PERL%%/Date/Language/Norwegian.pm
+%%SITE_PERL%%/Date/Language/Oromo.pm
+%%SITE_PERL%%/Date/Language/Sidama.pm
+%%SITE_PERL%%/Date/Language/Somali.pm
+%%SITE_PERL%%/Date/Language/Swedish.pm
+%%SITE_PERL%%/Date/Language/Tigrinya.pm
+%%SITE_PERL%%/Date/Language/TigrinyaEritrean.pm
+%%SITE_PERL%%/Date/Language/TigrinyaEthiopian.pm
+%%SITE_PERL%%/Date/Parse.pm
+%%SITE_PERL%%/Time/Zone.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/TimeDate/.packlist
+@dirrm %%SITE_PERL%%/Date/Language
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/TimeDate
+@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index 1198900ee01e..19a74ff4ac6a 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl5 module to trace function calls as they happen
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Devel::TraceFuncs.3
.include <bsd.port.mk>
diff --git a/devel/p5-TraceFuncs/pkg-plist b/devel/p5-TraceFuncs/pkg-plist
index 699f7ad17213..aa157782d0d1 100644
--- a/devel/p5-TraceFuncs/pkg-plist
+++ b/devel/p5-TraceFuncs/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Devel/TraceFuncs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+%%SITE_PERL%%/Devel/TraceFuncs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
diff --git a/devel/p5-Tree-DAG_Node/Makefile b/devel/p5-Tree-DAG_Node/Makefile
index c96ae0e4d740..ad477adf7075 100644
--- a/devel/p5-Tree-DAG_Node/Makefile
+++ b/devel/p5-Tree-DAG_Node/Makefile
@@ -18,6 +18,5 @@ COMMENT= Super class for representing nodes in a tree
PERL_CONFIGURE= yes
MAN3= Tree::DAG_Node.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/devel/p5-Tree-DAG_Node/pkg-plist b/devel/p5-Tree-DAG_Node/pkg-plist
index 933070c3993e..292d9d8a0624 100644
--- a/devel/p5-Tree-DAG_Node/pkg-plist
+++ b/devel/p5-Tree-DAG_Node/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tree/DAG_Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tree/DAG_Node/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tree/DAG_Node
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tree 2>/dev/null || true
+%%SITE_PERL%%/Tree/DAG_Node.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/DAG_Node/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/DAG_Node
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
diff --git a/devel/p5-UNIVERSAL-exports/Makefile b/devel/p5-UNIVERSAL-exports/Makefile
index 0b52e7f92548..8e4d952b7810 100644
--- a/devel/p5-UNIVERSAL-exports/Makefile
+++ b/devel/p5-UNIVERSAL-exports/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
COMMENT= Lightweight, universal exporting of variables
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Exporter/Lite.pm:${PORTSDIR}/devel/p5-Exporter-Lite
+BUILD_DEPENDS= ${SITE_PERL}/Exporter/Lite.pm:${PORTSDIR}/devel/p5-Exporter-Lite
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= UNIVERSAL::exports.3 UNIVERSAL::require.3
.include <bsd.port.mk>
diff --git a/devel/p5-UNIVERSAL-exports/pkg-plist b/devel/p5-UNIVERSAL-exports/pkg-plist
index 65f0839aa3d0..58ba070f0a7f 100644
--- a/devel/p5-UNIVERSAL-exports/pkg-plist
+++ b/devel/p5-UNIVERSAL-exports/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/UNIVERSAL/exports.pm
-lib/perl5/site_perl/%%PERL_VER%%/UNIVERSAL/require.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/UNIVERSAL/exports/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/UNIVERSAL/exports
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/UNIVERSAL
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/UNIVERSAL 2>/dev/null || true
+%%SITE_PERL%%/UNIVERSAL/exports.pm
+%%SITE_PERL%%/UNIVERSAL/require.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/exports/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/exports
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL
+@unexec rmdir %D/%%SITE_PERL%%/UNIVERSAL 2>/dev/null || true
diff --git a/devel/p5-VCS-CVS/Makefile b/devel/p5-VCS-CVS/Makefile
index eae9c4a4a766..2d09ee9fb423 100644
--- a/devel/p5-VCS-CVS/Makefile
+++ b/devel/p5-VCS-CVS/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= tolid@plab.ku.dk
COMMENT= Perl module that provides a simple interface to CVS
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= VCS::CVS.3
.include <bsd.port.mk>
diff --git a/devel/p5-VCS-CVS/pkg-plist b/devel/p5-VCS-CVS/pkg-plist
index b45c78b5be0a..2dd7a97a04a0 100644
--- a/devel/p5-VCS-CVS/pkg-plist
+++ b/devel/p5-VCS-CVS/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/VCS/CVS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/VCS/CVS/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/VCS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/VCS/CVS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/VCS
+%%SITE_PERL%%/VCS/CVS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCS/CVS/.packlist
+@dirrm %%SITE_PERL%%/VCS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCS/CVS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCS