aboutsummaryrefslogtreecommitdiff
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
parent386f40a6b587557ff9ef6bed9fccca2490a5d78d (diff)
downloadports-c634b4bb839753aec2ae1040e2c80a5282402cb8.tar.gz
ports-c634b4bb839753aec2ae1040e2c80a5282402cb8.zip
Notes
-rw-r--r--archivers/p5-Archive-Zip/Makefile3
-rw-r--r--archivers/p5-Archive-Zip/pkg-plist24
-rw-r--r--archivers/p5-IO-Zlib/Makefile5
-rw-r--r--archivers/p5-IO-Zlib/pkg-plist10
-rw-r--r--archivers/p5-Mac-Macbinary/Makefile1
-rw-r--r--archivers/p5-Mac-Macbinary/pkg-plist10
-rw-r--r--astro/p5-Astro-MoonPhase/Makefile1
-rw-r--r--astro/p5-Astro-MoonPhase/pkg-plist10
-rw-r--r--astro/p5-Astro-SunTime/pkg-plist10
-rw-r--r--astro/p5-Astro-Sunrise/pkg-plist10
-rw-r--r--astro/p5-GPS/Makefile1
-rw-r--r--astro/p5-GPS/pkg-plist32
-rw-r--r--astro/p5-Geo-METAR/Makefile1
-rw-r--r--astro/p5-Geo-METAR/pkg-plist10
-rw-r--r--astro/p5-SETI-Stats/Makefile1
-rw-r--r--astro/p5-SETI-Stats/pkg-plist8
-rw-r--r--audio/gnump3d/pkg-plist52
-rw-r--r--audio/gnupod/Makefile10
-rw-r--r--audio/gnupod/pkg-plist2
-rw-r--r--audio/mp32ogg/Makefile4
-rw-r--r--audio/mp3mover/Makefile2
-rw-r--r--audio/p5-Audio-CD/Makefile1
-rw-r--r--audio/p5-Audio-CD/pkg-plist14
-rw-r--r--audio/p5-Audio-Wav/pkg-plist22
-rw-r--r--audio/p5-CDDB-File/Makefile2
-rw-r--r--audio/p5-CDDB-File/pkg-plist10
-rw-r--r--audio/p5-MP3-ID3v1Tag/Makefile1
-rw-r--r--audio/p5-MP3-ID3v1Tag/pkg-plist10
-rw-r--r--audio/p5-MP3-Info/Makefile1
-rw-r--r--audio/p5-MP3-Info/pkg-plist14
-rw-r--r--audio/p5-MusicBrainz-Client/Makefile1
-rw-r--r--audio/p5-MusicBrainz-Queries/Makefile1
-rw-r--r--audio/p5-MusicBrainz-TRM/Makefile1
-rw-r--r--audio/p5-Shout/Makefile1
-rw-r--r--audio/p5-Shout/pkg-plist14
-rw-r--r--audio/p5-Xmms/Makefile3
-rw-r--r--audio/p5-Xmms/pkg-plist40
-rw-r--r--audio/p5-libvorbis/pkg-plist16
-rw-r--r--audio/p5-tagged/Makefile3
-rw-r--r--audio/p5-tagged/pkg-plist18
-rw-r--r--audio/ripit/Makefile2
-rw-r--r--biology/p5-AcePerl/Makefile3
-rw-r--r--biology/p5-AcePerl/pkg-plist240
-rw-r--r--biology/p5-bioperl/Makefile29
-rw-r--r--biology/p5-bioperl/pkg-plist500
-rw-r--r--comms/p5-Device-Modem/Makefile1
-rw-r--r--comms/p5-Device-SerialPort/Makefile1
-rw-r--r--comms/p5-Device-SerialPort/pkg-plist12
-rw-r--r--converters/p5-Boulder/Makefile2
-rw-r--r--converters/p5-Boulder/pkg-plist46
-rw-r--r--converters/p5-Convert-ASCII-Armour/Makefile7
-rw-r--r--converters/p5-Convert-ASCII-Armour/pkg-plist16
-rw-r--r--converters/p5-Convert-Morse/Makefile3
-rw-r--r--converters/p5-Convert-Morse/pkg-plist10
-rw-r--r--converters/p5-Convert-PEM/Makefile2
-rw-r--r--converters/p5-Convert-PEM/pkg-plist12
-rw-r--r--converters/p5-Convert-Recode/pkg-plist10
-rw-r--r--converters/p5-Convert-TNEF/Makefile4
-rw-r--r--converters/p5-Convert-TNEF/pkg-plist12
-rw-r--r--converters/p5-Convert-UU/pkg-plist10
-rw-r--r--converters/p5-Text-Iconv/pkg-plist16
-rw-r--r--converters/p5-Unicode-IMAPUtf7/Makefile3
-rw-r--r--converters/p5-Unicode-IMAPUtf7/pkg-plist16
-rw-r--r--converters/p5-Unicode-Map/pkg-plist224
-rw-r--r--converters/p5-Unicode-MapUTF8/Makefile8
-rw-r--r--converters/p5-Unicode-MapUTF8/pkg-plist10
-rw-r--r--databases/WWWdb/pkg-plist72
-rw-r--r--databases/mysql2pgsql/Makefile2
-rw-r--r--databases/mysql323-server/Makefile2
-rw-r--r--databases/mysql40-server/Makefile2
-rw-r--r--databases/mysql41-server/Makefile2
-rw-r--r--databases/mysql50-server/Makefile2
-rw-r--r--databases/mysql51-server/Makefile2
-rw-r--r--databases/mysql54-server/Makefile2
-rw-r--r--databases/mysql55-server/Makefile2
-rw-r--r--databases/mysql60-server/Makefile2
-rw-r--r--databases/namazu2/Makefile2
-rw-r--r--databases/p5-ApacheDBILogger/Makefile2
-rw-r--r--databases/p5-ApacheDBILogger/pkg-plist8
-rw-r--r--databases/p5-AsciiDB-TagFile/Makefile1
-rw-r--r--databases/p5-AsciiDB-TagFile/pkg-plist12
-rw-r--r--databases/p5-CDB_File-Generator/Makefile3
-rw-r--r--databases/p5-CDB_File-Generator/pkg-plist10
-rw-r--r--databases/p5-DBD-CSV/Makefile5
-rw-r--r--databases/p5-DBD-CSV/pkg-plist18
-rw-r--r--databases/p5-DBD-Excel/Makefile3
-rw-r--r--databases/p5-DBD-Excel/pkg-plist10
-rw-r--r--databases/p5-DBD-LDAP/Makefile3
-rw-r--r--databases/p5-DBD-LDAP/pkg-plist18
-rw-r--r--databases/p5-DBD-SQLite/Makefile1
-rw-r--r--databases/p5-DBD-SQLite/pkg-plist16
-rw-r--r--databases/p5-DBD-SQLite2/Makefile1
-rw-r--r--databases/p5-DBD-SQLite2/pkg-plist16
-rw-r--r--databases/p5-DBIWrapper/Makefile3
-rw-r--r--databases/p5-DBIWrapper/pkg-plist24
-rw-r--r--databases/p5-DBIx-AnyDBD/Makefile3
-rw-r--r--databases/p5-DBIx-AnyDBD/pkg-plist10
-rw-r--r--databases/p5-DBIx-Browse/Makefile1
-rw-r--r--databases/p5-DBIx-Browse/pkg-plist14
-rw-r--r--databases/p5-DBIx-DBSchema/Makefile3
-rw-r--r--databases/p5-DBIx-DBSchema/pkg-plist34
-rw-r--r--databases/p5-DBIx-DataSource/Makefile1
-rw-r--r--databases/p5-DBIx-DataSource/pkg-plist18
-rw-r--r--databases/p5-DBIx-Password/Makefile1
-rw-r--r--databases/p5-DBIx-Password/pkg-plist4
-rw-r--r--databases/p5-DBIx-Recordset/Makefile1
-rw-r--r--databases/p5-DBIx-Recordset/pkg-plist22
-rw-r--r--databases/p5-DBIx-SQLEngine/Makefile3
-rw-r--r--databases/p5-DBIx-Table/Makefile1
-rw-r--r--databases/p5-DBIx-Table/pkg-plist10
-rw-r--r--databases/p5-DBIx-XML_RDB/Makefile3
-rw-r--r--databases/p5-DBIx-XML_RDB/pkg-plist14
-rw-r--r--databases/p5-DBZ_File/Makefile1
-rw-r--r--databases/p5-GDBM/Makefile1
-rw-r--r--databases/p5-GDBM/pkg-plist12
-rw-r--r--databases/p5-MLDBM-Sync/Makefile7
-rw-r--r--databases/p5-MLDBM-Sync/pkg-plist14
-rw-r--r--databases/p5-MLDBM/Makefile7
-rw-r--r--databases/p5-MLDBM/pkg-plist18
-rw-r--r--databases/p5-Metadata/Makefile3
-rw-r--r--databases/p5-Metadata/pkg-plist14
-rw-r--r--databases/p5-Mysql/Makefile2
-rw-r--r--databases/p5-Mysql/pkg-plist26
-rw-r--r--databases/p5-POE-Component-RRDTool/Makefile2
-rw-r--r--databases/p5-POE-Component-RRDTool/pkg-plist14
-rw-r--r--databases/p5-Pg/Makefile1
-rw-r--r--databases/p5-Pg/pkg-plist12
-rw-r--r--databases/p5-ResourcePool-Resource-DBI/Makefile3
-rw-r--r--databases/p5-ResourcePool-Resource-DBI/pkg-plist34
-rw-r--r--databases/p5-SQL-Abstract/Makefile1
-rw-r--r--databases/p5-SQL-Abstract/pkg-plist10
-rw-r--r--databases/p5-SQL-Statement/Makefile1
-rw-r--r--databases/p5-SQL-Statement/pkg-plist28
-rw-r--r--databases/p5-Search-Namazu/Makefile1
-rw-r--r--databases/p5-Search-Namazu/pkg-plist14
-rw-r--r--databases/p5-Tangram/Makefile3
-rw-r--r--databases/p5-Tangram/pkg-plist130
-rw-r--r--databases/p5-Text-Query-SQL/Makefile3
-rw-r--r--databases/p5-Text-Query-SQL/pkg-plist26
-rw-r--r--databases/p5-Tie-DBI/Makefile1
-rw-r--r--databases/p5-Time-Piece-MySQL/Makefile1
-rw-r--r--databases/p5-hp200lx-db/Makefile1
-rw-r--r--databases/p5-hp200lx-db/pkg-plist32
-rw-r--r--databases/p5-sqlrelay/pkg-plist34
-rw-r--r--databases/percona55-server/Makefile2
-rw-r--r--databases/postgresql_autodoc/Makefile4
-rw-r--r--databases/rrdtool/pkg-plist18
-rw-r--r--databases/rrdtool10/pkg-plist18
-rw-r--r--deskutils/dailystrips/Makefile4
-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
-rw-r--r--dns/dnssecwalker/Makefile2
-rw-r--r--dns/dnswalk/Makefile2
-rw-r--r--dns/p5-BIND-Conf_Parser/Makefile1
-rw-r--r--dns/p5-BIND-Conf_Parser/pkg-plist8
-rw-r--r--dns/p5-Net-DNS-ZoneFile/Makefile3
-rw-r--r--dns/p5-Net-DNS-ZoneFile/pkg-plist8
-rw-r--r--dns/p5-Net-DNS/Makefile1
-rw-r--r--dns/p5-Tie-DNS/Makefile3
-rw-r--r--dns/p5-Tie-DNS/pkg-plist10
-rw-r--r--dns/sleuth/Makefile2
-rw-r--r--finance/p5-Business-CreditCard/Makefile1
-rw-r--r--finance/p5-Business-CreditCard/pkg-plist10
-rw-r--r--finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist10
-rw-r--r--finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-Beanstream/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-Cardstream/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-Jettis/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist10
-rw-r--r--finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-PayConnect/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-SurePay/pkg-plist6
-rw-r--r--finance/p5-Business-OnlinePayment-TCLink/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment-eSec/pkg-plist12
-rw-r--r--finance/p5-Business-OnlinePayment/pkg-plist18
-rw-r--r--finance/p5-Business-WorldPay-Junior/Makefile2
-rw-r--r--finance/p5-Finance-Currency-Convert/Makefile1
-rw-r--r--finance/p5-Finance-Currency-Convert/pkg-plist22
-rw-r--r--finance/p5-Finance-Quote/Makefile5
-rw-r--r--finance/p5-Finance-Quote/pkg-plist48
-rw-r--r--finance/p5-Finance-QuoteHist/Makefile3
-rw-r--r--finance/p5-Finance-QuoteHist/pkg-plist18
-rw-r--r--finance/p5-Math-Financial/Makefile1
-rw-r--r--finance/p5-Math-Financial/pkg-plist10
-rw-r--r--french/facturier/Makefile2
-rw-r--r--french/plgrenouille/Makefile2
-rw-r--r--ftp/ftpmirror/Makefile2
-rw-r--r--ftp/ftpmirror/pkg-plist554
-rw-r--r--ftp/jmirror/Makefile2
-rw-r--r--ftp/p5-Net-FTPServer/Makefile3
-rw-r--r--ftp/p5-Net-FTPServer/pkg-plist56
-rw-r--r--ftp/paraget/Makefile8
-rw-r--r--ftp/paraget/pkg-plist40
-rw-r--r--ftp/profxp/Makefile2
-rw-r--r--ftp/profxp/pkg-plist10
-rw-r--r--ftp/vcheck/Makefile2
-rw-r--r--ftp/vcheck/pkg-plist4
-rw-r--r--games/frozenbubble/Makefile4
-rw-r--r--games/frozenbubble/pkg-plist16
-rw-r--r--games/lm-solve/pkg-plist34
-rw-r--r--german/BBBike/Makefile2
-rw-r--r--graphics/GIFgraph/Makefile3
-rw-r--r--graphics/GIFgraph/pkg-plist28
-rw-r--r--graphics/IPA/Makefile2
-rw-r--r--graphics/IPA/pkg-plist66
-rw-r--r--graphics/ImageMagick/pkg-plist16
-rw-r--r--graphics/cadubi/Makefile2
-rw-r--r--graphics/cthumb/Makefile4
-rw-r--r--graphics/eps2png/pkg-plist4
-rw-r--r--graphics/imc/Makefile4
-rw-r--r--graphics/p5-Chart-PNGgraph/Makefile5
-rw-r--r--graphics/p5-Chart-PNGgraph/pkg-plist30
-rw-r--r--graphics/p5-GD-Barcode/Makefile2
-rw-r--r--graphics/p5-GD-Graph3d/Makefile3
-rw-r--r--graphics/p5-GD-Graph3d/pkg-plist22
-rw-r--r--graphics/p5-GD-TextUtil/Makefile3
-rw-r--r--graphics/p5-GD1/Makefile1
-rw-r--r--graphics/p5-GD1/pkg-plist16
-rw-r--r--graphics/p5-GraphViz-Data-Structure/Makefile3
-rw-r--r--graphics/p5-GraphViz-Data-Structure/pkg-plist10
-rw-r--r--graphics/p5-GraphViz/Makefile6
-rw-r--r--graphics/p5-GraphViz/pkg-plist32
-rw-r--r--graphics/p5-Graphics-ColorNames/Makefile1
-rw-r--r--graphics/p5-Graphics-ColorNames/pkg-plist20
-rw-r--r--graphics/p5-Image-Grab/Makefile3
-rw-r--r--graphics/p5-Image-Grab/pkg-plist16
-rw-r--r--graphics/p5-Imager/Makefile1
-rw-r--r--graphics/p5-Imager/pkg-plist62
-rw-r--r--graphics/p5-Imlib2/pkg-plist18
-rw-r--r--graphics/p5-PGPLOT/pkg-plist12
-rw-r--r--graphics/p5-VCG/Makefile1
-rw-r--r--graphics/p5-ming/Makefile1
-rw-r--r--graphics/p5-ming/pkg-plist40
-rw-r--r--graphics/pgperl/pkg-plist12
-rw-r--r--graphics/springgraph/Makefile2
-rw-r--r--irc/irssi-devel/pkg-plist42
-rw-r--r--irc/irssi/pkg-plist42
-rw-r--r--irc/nethirc/Makefile2
-rw-r--r--irc/p5-POE-Component-IRC-Object/Makefile5
-rw-r--r--irc/p5-POE-Component-IRC-Object/pkg-plist14
-rw-r--r--japanese/another-htmllint/Makefile2
-rw-r--r--japanese/eijiro-fpw/Makefile2
-rw-r--r--japanese/freepwing/pkg-plist66
-rw-r--r--japanese/mypaedia-fpw/Makefile2
-rw-r--r--japanese/namazu2/Makefile2
-rw-r--r--japanese/otojiro-fpw/Makefile2
-rw-r--r--japanese/p5-Jcode/Makefile5
-rw-r--r--japanese/p5-Jcode/pkg-plist34
-rw-r--r--japanese/p5-PDFJ/pkg-plist20
-rw-r--r--japanese/p5-Text-ChaSen/Makefile1
-rw-r--r--japanese/p5-Text-ChaSen/pkg-plist16
-rw-r--r--japanese/p5-Text-Kakasi/Makefile1
-rw-r--r--japanese/p5-Text-Kakasi/pkg-plist16
-rw-r--r--japanese/p5-nkf/Makefile1
-rw-r--r--japanese/p5-nkf/pkg-plist10
-rw-r--r--japanese/srd-fpw/Makefile2
-rw-r--r--japanese/waeijiro-fpw/Makefile2
-rw-r--r--japanese/weblint97/Makefile2
-rw-r--r--lang/p5-Error/Makefile1
-rw-r--r--lang/p5-Error/pkg-plist6
-rw-r--r--lang/p5-Expect/Makefile5
-rw-r--r--lang/p5-Expect/pkg-plist8
-rw-r--r--lang/p5-Scalar-List-Utils/pkg-plist18
-rw-r--r--lang/p5-Switch/Makefile5
-rw-r--r--lang/p5-Switch/pkg-plist6
-rw-r--r--lang/p5-Tcl/Makefile1
-rw-r--r--lang/p5-Tcl/pkg-plist10
-rw-r--r--lang/p5-ePerl/Makefile1
-rw-r--r--lang/p5-ePerl/pkg-plist20
-rw-r--r--lang/perl5.10/pkg-plist12
-rw-r--r--lang/perl5.12/pkg-plist12
-rw-r--r--lang/perl5.14/pkg-plist12
-rw-r--r--lang/perl5.16/pkg-plist12
-rw-r--r--lang/perl5.6/pkg-plist10
-rw-r--r--lang/perl5.8/pkg-plist12
-rw-r--r--lang/perl5/pkg-plist10
-rw-r--r--lang/ruby-perl/pkg-plist10
-rw-r--r--mail/bayespam/Makefile2
-rw-r--r--mail/bayespam/pkg-plist4
-rw-r--r--mail/cmail/pkg-plist28
-rw-r--r--mail/cyrus-imapd/pkg-plist46
-rw-r--r--mail/cyrus-imapd2/Makefile6
-rw-r--r--mail/cyrus-imapd2/pkg-plist36
-rw-r--r--mail/cyrus-imapd22/Makefile6
-rw-r--r--mail/cyrus-imapd22/pkg-plist36
-rw-r--r--mail/cyrus-imapd23/Makefile6
-rw-r--r--mail/cyrus-imapd23/pkg-plist36
-rw-r--r--mail/cyrus-imapd24/Makefile6
-rw-r--r--mail/cyrus-imapd24/pkg-plist36
-rw-r--r--mail/demime/Makefile10
-rw-r--r--mail/gotmail/Makefile4
-rw-r--r--mail/grepmail/Makefile4
-rw-r--r--mail/grepmail/pkg-plist4
-rw-r--r--mail/mail2procmailrc/Makefile6
-rw-r--r--mail/majordomo/Makefile4
-rw-r--r--mail/mbx2mbox/Makefile2
-rw-r--r--mail/mbx2mbox/pkg-plist4
-rw-r--r--mail/mimedefang/Makefile2
-rw-r--r--mail/p5-Email-Find/Makefile2
-rw-r--r--mail/p5-Email-Find/pkg-plist10
-rw-r--r--mail/p5-Email-Valid-Loose/Makefile1
-rw-r--r--mail/p5-Email-Valid/Makefile1
-rw-r--r--mail/p5-IMAP-Admin/Makefile1
-rw-r--r--mail/p5-IMAP-Admin/pkg-plist10
-rw-r--r--mail/p5-MIME-Tools/Makefile7
-rw-r--r--mail/p5-MIME-Tools/pkg-plist54
-rw-r--r--mail/p5-Mail-Audit/Makefile3
-rw-r--r--mail/p5-Mail-Audit/pkg-plist26
-rw-r--r--mail/p5-Mail-Box1/Makefile3
-rw-r--r--mail/p5-Mail-Box1/pkg-plist52
-rw-r--r--mail/p5-Mail-Ezmlm/Makefile1
-rw-r--r--mail/p5-Mail-Ezmlm/pkg-plist6
-rw-r--r--mail/p5-Mail-FilterXML/Makefile3
-rw-r--r--mail/p5-Mail-FilterXML/pkg-plist8
-rw-r--r--mail/p5-Mail-Folder/Makefile15
-rw-r--r--mail/p5-Mail-Folder/pkg-plist14
-rw-r--r--mail/p5-Mail-Freshmeat/Makefile3
-rw-r--r--mail/p5-Mail-Freshmeat/pkg-plist14
-rw-r--r--mail/p5-Mail-MailStats/Makefile3
-rw-r--r--mail/p5-Mail-MailStats/pkg-plist18
-rw-r--r--mail/p5-Mail-QuoteWrap/Makefile3
-rw-r--r--mail/p5-Mail-QuoteWrap/pkg-plist10
-rw-r--r--mail/p5-Mail-RBL/Makefile1
-rw-r--r--mail/p5-Mail-RBL/pkg-plist10
-rw-r--r--mail/p5-Mail-RFC822-Address/Makefile1
-rw-r--r--mail/p5-Mail-RFC822-Address/pkg-plist10
-rw-r--r--mail/p5-Mail-Spool/Makefile2
-rw-r--r--mail/p5-Mail-Spool/pkg-plist12
-rw-r--r--mail/p5-Mail-Tools/pkg-plist78
-rw-r--r--mail/p5-Mail-Verify/Makefile3
-rw-r--r--mail/p5-Mail-Verify/pkg-plist10
-rw-r--r--mail/p5-Net-SMTP-Server/Makefile6
-rw-r--r--mail/p5-Net-SMTP-Server/pkg-plist36
-rw-r--r--mail/p5-POE-Component-Client-POP3/Makefile3
-rw-r--r--mail/p5-POE-Component-Client-POP3/pkg-plist18
-rw-r--r--mail/p5-Sendmail-Milter/pkg-plist18
-rw-r--r--mail/p5-vpopmail/Makefile1
-rw-r--r--mail/p5-vpopmail/pkg-plist10
-rw-r--r--mail/pflogsumm/Makefile2
-rw-r--r--mail/pronto/Makefile24
-rw-r--r--mail/ricochet/Makefile10
-rw-r--r--mail/rmoldmail/Makefile2
-rw-r--r--mail/tlb/Makefile6
-rw-r--r--math/p5-AI-NeuralNet-BackProp/Makefile1
-rw-r--r--math/p5-AI-NeuralNet-BackProp/pkg-plist14
-rw-r--r--math/p5-AI-NeuralNet-Mesh/Makefile1
-rw-r--r--math/p5-AI-NeuralNet-Mesh/pkg-plist14
-rw-r--r--math/p5-AI-Perceptron/Makefile1
-rw-r--r--math/p5-AI-Perceptron/pkg-plist10
-rw-r--r--math/p5-Bit-ShiftReg/Makefile1
-rw-r--r--math/p5-Bit-ShiftReg/pkg-plist14
-rw-r--r--math/p5-Bit-Vector/Makefile1
-rw-r--r--math/p5-Bit-Vector/pkg-plist28
-rw-r--r--math/p5-Graph/Makefile3
-rw-r--r--math/p5-Graph/pkg-plist22
-rw-r--r--math/p5-Math-BaseCalc/Makefile1
-rw-r--r--math/p5-Math-BaseCalc/pkg-plist10
-rw-r--r--math/p5-Math-Bezier/Makefile1
-rw-r--r--math/p5-Math-Bezier/pkg-plist10
-rw-r--r--math/p5-Math-BigIntFast/Makefile3
-rw-r--r--math/p5-Math-BigIntFast/pkg-plist10
-rw-r--r--math/p5-Math-Calc-Units/Makefile1
-rw-r--r--math/p5-Math-Calc-Units/pkg-plist46
-rw-r--r--math/p5-Math-Currency/Makefile1
-rw-r--r--math/p5-Math-Expr/Makefile1
-rw-r--r--math/p5-Math-Expr/pkg-plist32
-rw-r--r--math/p5-Math-FFT/Makefile1
-rw-r--r--math/p5-Math-FFT/pkg-plist14
-rw-r--r--math/p5-Math-FixedPrecision/pkg-plist10
-rw-r--r--math/p5-Math-Interpolate/Makefile1
-rw-r--r--math/p5-Math-Interpolate/pkg-plist12
-rw-r--r--math/p5-Math-LinearCombination/Makefile5
-rw-r--r--math/p5-Math-LinearCombination/pkg-plist10
-rw-r--r--math/p5-Math-Logic/Makefile1
-rw-r--r--math/p5-Math-Logic/pkg-plist10
-rw-r--r--math/p5-Math-Random-MT/Makefile1
-rw-r--r--math/p5-Math-Random-MT/pkg-plist18
-rw-r--r--math/p5-Math-SimpleVariable/Makefile3
-rw-r--r--math/p5-Math-SimpleVariable/pkg-plist10
-rw-r--r--math/p5-Math-TrulyRandom/Makefile1
-rw-r--r--math/p5-Math-TrulyRandom/pkg-plist16
-rw-r--r--math/p5-Roman/Makefile2
-rw-r--r--math/p5-Roman/pkg-plist2
-rw-r--r--math/p5-Set-IntSpan/Makefile1
-rw-r--r--math/p5-Set-IntSpan/pkg-plist10
-rw-r--r--math/p5-Set-Window/Makefile1
-rw-r--r--math/p5-Set-Window/pkg-plist10
-rw-r--r--math/p5-Statistics-ChiSquare/Makefile1
-rw-r--r--math/p5-Statistics-ChiSquare/pkg-plist16
-rw-r--r--math/p5-Statistics-Descriptive/Makefile1
-rw-r--r--math/p5-Statistics-Descriptive/pkg-plist10
-rw-r--r--math/p5-Statistics-LTU/Makefile1
-rw-r--r--math/p5-Statistics-LTU/pkg-plist14
-rw-r--r--math/p5-Statistics-OLS/Makefile1
-rw-r--r--math/p5-Statistics-OLS/pkg-plist10
-rw-r--r--math/p5-Statistics-Table-F/Makefile1
-rw-r--r--math/p5-Statistics-Table-F/pkg-plist22
-rw-r--r--misc/chord2html/Makefile2
-rw-r--r--misc/p5-Array-Compare/Makefile1
-rw-r--r--misc/p5-Array-Compare/pkg-plist16
-rw-r--r--misc/p5-Array-IntSpan/Makefile1
-rw-r--r--misc/p5-Array-IntSpan/pkg-plist14
-rw-r--r--misc/p5-Array-PrintCols/Makefile1
-rw-r--r--misc/p5-Array-PrintCols/pkg-plist10
-rw-r--r--misc/p5-Array-RefElem/Makefile1
-rw-r--r--misc/p5-Array-RefElem/pkg-plist14
-rw-r--r--misc/p5-Business-ISBN/Makefile1
-rw-r--r--misc/p5-Business-ISBN/pkg-plist14
-rw-r--r--misc/p5-Business-ISIN/Makefile3
-rw-r--r--misc/p5-Business-ISIN/pkg-plist10
-rw-r--r--misc/p5-Business-ISSN/Makefile1
-rw-r--r--misc/p5-Business-ISSN/pkg-plist10
-rw-r--r--misc/p5-Business-UPS/Makefile3
-rw-r--r--misc/p5-Business-UPS/pkg-plist16
-rw-r--r--misc/p5-Chatbot-Eliza/Makefile1
-rw-r--r--misc/p5-Chatbot-Eliza/pkg-plist8
-rw-r--r--misc/p5-Data-Buffer/Makefile1
-rw-r--r--misc/p5-Data-Buffer/pkg-plist10
-rw-r--r--misc/p5-File-Sort/Makefile1
-rw-r--r--misc/p5-File-Sort/pkg-plist10
-rw-r--r--misc/p5-Finance-Currency-Convert/Makefile1
-rw-r--r--misc/p5-Finance-Currency-Convert/pkg-plist22
-rw-r--r--misc/p5-Finance-Quote/Makefile5
-rw-r--r--misc/p5-Finance-Quote/pkg-plist48
-rw-r--r--misc/p5-Finance-QuoteHist/Makefile3
-rw-r--r--misc/p5-Finance-QuoteHist/pkg-plist18
-rw-r--r--misc/p5-Geo-Weather/Makefile3
-rw-r--r--misc/p5-Geo-Weather/pkg-plist10
-rw-r--r--misc/p5-LEGO-RCX/Makefile1
-rw-r--r--misc/p5-LEGO-RCX/pkg-plist10
-rw-r--r--misc/p5-Locale-Codes/Makefile1
-rw-r--r--misc/p5-Locale-Codes/pkg-plist26
-rw-r--r--misc/p5-Locale-Msgcat/Makefile1
-rw-r--r--misc/p5-Locale-SubCountry/Makefile1
-rw-r--r--misc/p5-Locale-SubCountry/pkg-plist10
-rw-r--r--misc/p5-Text-FIGlet/Makefile1
-rw-r--r--misc/p5-Text-FIGlet/pkg-plist18
-rw-r--r--misc/p5-Tie-DxHash/Makefile1
-rw-r--r--misc/p5-Tie-DxHash/pkg-plist10
-rw-r--r--misc/telbook/Makefile2
-rw-r--r--misc/translate/Makefile2
-rw-r--r--multimedia/dvdrip/Makefile8
-rw-r--r--multimedia/dvdrip/pkg-plist210
-rw-r--r--net-im/jarl/Makefile2
-rw-r--r--net-im/p5-Jabber-Connection/Makefile1
-rw-r--r--net-im/p5-Net-AIM/pkg-plist16
-rw-r--r--net-im/p5-Net-AOLIM/Makefile1
-rw-r--r--net-im/p5-Net-AOLIM/pkg-plist12
-rw-r--r--net-im/p5-Net-ICQ2000/Makefile1
-rw-r--r--net-im/p5-Net-ICQ2000/pkg-plist10
-rw-r--r--net-im/p5-Net-Jabber/Makefile9
-rw-r--r--net-im/p5-Net-Jabber/pkg-plist52
-rw-r--r--net-im/vicq/Makefile3
-rw-r--r--net-im/vicq/pkg-plist10
-rw-r--r--net-mgmt/aspathtree/Makefile2
-rw-r--r--net-mgmt/cricket/Makefile4
-rw-r--r--net-mgmt/flowscan/Makefile10
-rw-r--r--net-mgmt/junipoll/Makefile2
-rw-r--r--net-mgmt/junipoll/pkg-plist4
-rw-r--r--net-mgmt/mrtg/pkg-plist16
-rw-r--r--net-mgmt/net-snmp-tkmib/Makefile2
-rw-r--r--net-mgmt/nrpep/Makefile2
-rw-r--r--net-mgmt/nsc/Makefile2
-rw-r--r--net-mgmt/p5-Altoids/Makefile2
-rw-r--r--net-mgmt/p5-Altoids/pkg-plist4
-rw-r--r--net-mgmt/p5-Cflow/pkg-plist12
-rw-r--r--net-mgmt/p5-JUNOScript/Makefile3
-rw-r--r--net-mgmt/p5-JUNOScript/pkg-plist42
-rw-r--r--net-mgmt/p5-Mon/Makefile1
-rw-r--r--net-mgmt/p5-Mon/pkg-plist12
-rw-r--r--net-mgmt/p5-Net-CIDR/Makefile1
-rw-r--r--net-mgmt/p5-Net-CIDR/pkg-plist10
-rw-r--r--net-mgmt/p5-Net-IPv4Addr/pkg-plist16
-rw-r--r--net-mgmt/p5-Net-IPv6Addr/Makefile4
-rw-r--r--net-mgmt/p5-Net-IPv6Addr/pkg-plist10
-rw-r--r--net-mgmt/p5-Net-Netmask/Makefile1
-rw-r--r--net-mgmt/p5-Net-Netmask/pkg-plist12
-rw-r--r--net-mgmt/p5-NetAddr-IP/Makefile2
-rw-r--r--net-mgmt/p5-NetAddr-IP/pkg-plist10
-rw-r--r--net-mgmt/p5-SNMP-MIB-Compiler/Makefile2
-rw-r--r--net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist22
-rw-r--r--net-mgmt/p5-SNMP-Util/Makefile3
-rw-r--r--net-mgmt/p5-SNMP-Util/pkg-plist10
-rw-r--r--net-mgmt/p5-SNMP/pkg-plist12
-rw-r--r--net-mgmt/p5-SNMP_Session/pkg-plist10
-rw-r--r--net-mgmt/p5-Telnet-Cisco/Makefile7
-rw-r--r--net-mgmt/p5-Telnet-Cisco/pkg-plist22
-rw-r--r--net-mgmt/rancid-devel/Makefile3
-rw-r--r--net-mgmt/rancid/Makefile3
-rw-r--r--net-mgmt/remarp/pkg-plist6
-rw-r--r--net-p2p/edonkey-gui-gtk-urlslave/Makefile2
-rw-r--r--net-p2p/mldonkey-perlreactor/Makefile2
-rw-r--r--net-p2p/mldonkey-serverspy/Makefile8
-rw-r--r--net-p2p/mldonkey-urlslave/Makefile2
-rw-r--r--net/aspathtree/Makefile2
-rw-r--r--net/cricket/Makefile4
-rw-r--r--net/ctrace/Makefile6
-rw-r--r--net/edonkey-gui-gtk-urlslave/Makefile2
-rw-r--r--net/flowscan/Makefile10
-rw-r--r--net/hawk/Makefile2
-rw-r--r--net/jarl/Makefile2
-rw-r--r--net/junipoll/Makefile2
-rw-r--r--net/junipoll/pkg-plist4
-rw-r--r--net/lla/Makefile4
-rw-r--r--net/mldonkey-perlreactor/Makefile2
-rw-r--r--net/mldonkey-serverspy/Makefile8
-rw-r--r--net/mldonkey-urlslave/Makefile2
-rw-r--r--net/mrtg/pkg-plist16
-rw-r--r--net/net-snmp-tkmib/Makefile2
-rw-r--r--net/nrpep/Makefile2
-rw-r--r--net/nsc/Makefile2
-rw-r--r--net/openreg/Makefile2
-rw-r--r--net/openreg/pkg-plist74
-rw-r--r--net/p5-Altoids/Makefile2
-rw-r--r--net/p5-Altoids/pkg-plist4
-rw-r--r--net/p5-Archie/pkg-plist2
-rw-r--r--net/p5-Cflow/pkg-plist12
-rw-r--r--net/p5-Frontier-RPC/Makefile4
-rw-r--r--net/p5-Frontier-RPC/pkg-plist14
-rw-r--r--net/p5-IO-INET6/Makefile3
-rw-r--r--net/p5-IO-INET6/pkg-plist4
-rw-r--r--net/p5-IO-Interface/Makefile1
-rw-r--r--net/p5-IO-Interface/pkg-plist16
-rw-r--r--net/p5-IO-Socket-INET6/Makefile3
-rw-r--r--net/p5-IO-Socket-INET6/pkg-plist4
-rw-r--r--net/p5-IO-Socket-Multicast/Makefile3
-rw-r--r--net/p5-IO-Socket-Multicast/pkg-plist18
-rw-r--r--net/p5-JUNOScript/Makefile3
-rw-r--r--net/p5-JUNOScript/pkg-plist42
-rw-r--r--net/p5-Jabber-Connection/Makefile1
-rw-r--r--net/p5-Mon/Makefile1
-rw-r--r--net/p5-Mon/pkg-plist12
-rw-r--r--net/p5-Net-AIM/pkg-plist16
-rw-r--r--net/p5-Net-AOLIM/Makefile1
-rw-r--r--net/p5-Net-AOLIM/pkg-plist12
-rw-r--r--net/p5-Net-CIDR/Makefile1
-rw-r--r--net/p5-Net-CIDR/pkg-plist10
-rw-r--r--net/p5-Net-DLookup/Makefile1
-rw-r--r--net/p5-Net-DLookup/pkg-plist10
-rw-r--r--net/p5-Net-Daemon/Makefile1
-rw-r--r--net/p5-Net-Divert/Makefile1
-rw-r--r--net/p5-Net-Divert/pkg-plist12
-rw-r--r--net/p5-Net-ICQ2000/Makefile1
-rw-r--r--net/p5-Net-ICQ2000/pkg-plist10
-rw-r--r--net/p5-Net-IPv4Addr/pkg-plist16
-rw-r--r--net/p5-Net-IPv6Addr/Makefile4
-rw-r--r--net/p5-Net-IPv6Addr/pkg-plist10
-rw-r--r--net/p5-Net-Jabber/Makefile9
-rw-r--r--net/p5-Net-Jabber/pkg-plist52
-rw-r--r--net/p5-Net-Netmask/Makefile1
-rw-r--r--net/p5-Net-Netmask/pkg-plist12
-rw-r--r--net/p5-Net-ParseWhois/Makefile1
-rw-r--r--net/p5-Net-ParseWhois/pkg-plist44
-rw-r--r--net/p5-Net-Patricia/pkg-plist14
-rw-r--r--net/p5-Net-Pcap/Makefile1
-rw-r--r--net/p5-Net-Pcap/pkg-plist14
-rw-r--r--net/p5-Net-Radius/Makefile3
-rw-r--r--net/p5-Net-Radius/pkg-plist14
-rw-r--r--net/p5-Net-RawIP/Makefile1
-rw-r--r--net/p5-Net-RawIP/pkg-plist20
-rw-r--r--net/p5-Net-RawSock/Makefile1
-rw-r--r--net/p5-Net-RawSock/pkg-plist10
-rw-r--r--net/p5-Net-SCP/Makefile5
-rw-r--r--net/p5-Net-SCP/pkg-plist10
-rw-r--r--net/p5-Net-SMPP/Makefile1
-rw-r--r--net/p5-Net-SMPP/pkg-plist22
-rw-r--r--net/p5-Net-SNPP/Makefile2
-rw-r--r--net/p5-Net-SNPP/pkg-plist16
-rw-r--r--net/p5-Net-SSH-Perl/Makefile3
-rw-r--r--net/p5-Net-SSH-Perl/pkg-plist110
-rw-r--r--net/p5-Net-SSH/Makefile1
-rw-r--r--net/p5-Net-SSH/pkg-plist10
-rw-r--r--net/p5-Net-Server/Makefile1
-rw-r--r--net/p5-Net-Server/pkg-plist42
-rw-r--r--net/p5-Net-Services/Makefile1
-rw-r--r--net/p5-Net-Services/pkg-plist10
-rw-r--r--net/p5-Net-Telnet/Makefile1
-rw-r--r--net/p5-Net-Telnet/pkg-plist10
-rw-r--r--net/p5-Net-Traceroute/Makefile1
-rw-r--r--net/p5-Net-Traceroute/pkg-plist10
-rw-r--r--net/p5-Net-Traceroute6/Makefile1
-rw-r--r--net/p5-Net-Traceroute6/pkg-plist10
-rw-r--r--net/p5-Net-Wake/Makefile1
-rw-r--r--net/p5-Net-Wake/pkg-plist10
-rw-r--r--net/p5-Net-Whois-RIPE/Makefile3
-rw-r--r--net/p5-Net-Whois-RIPE/pkg-plist30
-rw-r--r--net/p5-Net-Whois-Raw/pkg-plist14
-rw-r--r--net/p5-Net-Whois/Makefile3
-rw-r--r--net/p5-Net-Whois/pkg-plist10
-rw-r--r--net/p5-Net-XWhois/Makefile1
-rw-r--r--net/p5-Net-Z3950-SimpleServer/Makefile1
-rw-r--r--net/p5-Net-Z3950-SimpleServer/pkg-plist24
-rw-r--r--net/p5-Net-Z3950/Makefile7
-rw-r--r--net/p5-Net-Z3950/pkg-plist30
-rw-r--r--net/p5-Net-ext/Makefile1
-rw-r--r--net/p5-Net-ext/pkg-plist146
-rw-r--r--net/p5-NetAddr-IP-Count/Makefile3
-rw-r--r--net/p5-NetAddr-IP-Count/pkg-plist10
-rw-r--r--net/p5-NetAddr-IP/Makefile2
-rw-r--r--net/p5-NetAddr-IP/pkg-plist10
-rw-r--r--net/p5-NetPacket/Makefile1
-rw-r--r--net/p5-POE-Component-RRDTool/Makefile2
-rw-r--r--net/p5-POE-Component-RRDTool/pkg-plist14
-rw-r--r--net/p5-PlRPC/Makefile4
-rw-r--r--net/p5-PlRPC/pkg-plist22
-rw-r--r--net/p5-ResourcePool-Resource-Net-LDAP/Makefile5
-rw-r--r--net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist24
-rw-r--r--net/p5-ResourcePool-Resource-SOAP-Lite/Makefile5
-rw-r--r--net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist30
-rw-r--r--net/p5-SNMP-MIB-Compiler/Makefile2
-rw-r--r--net/p5-SNMP-MIB-Compiler/pkg-plist22
-rw-r--r--net/p5-SNMP-Util/Makefile3
-rw-r--r--net/p5-SNMP-Util/pkg-plist10
-rw-r--r--net/p5-SNMP/pkg-plist12
-rw-r--r--net/p5-SNMP_Session/pkg-plist10
-rw-r--r--net/p5-SOAP-Lite/Makefile12
-rw-r--r--net/p5-SOAP-Lite/pkg-plist70
-rw-r--r--net/p5-SOAP/Makefile3
-rw-r--r--net/p5-SOAP/pkg-plist54
-rw-r--r--net/p5-Socket6/pkg-plist10
-rw-r--r--net/p5-Socks/Makefile1
-rw-r--r--net/p5-Socks/pkg-plist50
-rw-r--r--net/p5-Spread-Session/Makefile3
-rw-r--r--net/p5-Spread-Session/pkg-plist10
-rw-r--r--net/p5-Telnet-Cisco/Makefile7
-rw-r--r--net/p5-Telnet-Cisco/pkg-plist22
-rw-r--r--net/p5-URI/Makefile1
-rw-r--r--net/p5-XPC/Makefile7
-rw-r--r--net/p5-XPC/pkg-plist14
-rw-r--r--net/perldap/Makefile1
-rw-r--r--net/perldap/pkg-plist28
-rw-r--r--net/radiator/pkg-plist262
-rw-r--r--net/rancid/Makefile3
-rw-r--r--net/remarp/pkg-plist6
-rw-r--r--net/rrdtool/pkg-plist18
-rw-r--r--net/rrdtool10/pkg-plist18
-rw-r--r--net/spread/pkg-plist12
-rw-r--r--net/spread4/pkg-plist12
-rw-r--r--net/v6eval/pkg-plist6
-rw-r--r--net/vicq/Makefile3
-rw-r--r--net/vicq/pkg-plist10
-rw-r--r--net/wakeonlan/pkg-plist4
-rw-r--r--net/wping/Makefile4
-rw-r--r--net/xmlrpc-c-devel/Makefile2
-rw-r--r--net/xmlrpc-c/Makefile2
-rw-r--r--news/ija/Makefile4
-rw-r--r--news/newsgrab/Makefile8
-rw-r--r--news/p5-Gateway/Makefile5
-rw-r--r--news/p5-Gateway/pkg-plist46
-rw-r--r--news/p5-NNTPClient/pkg-plist10
-rw-r--r--news/p5-News-Article/Makefile5
-rw-r--r--news/p5-News-Article/pkg-plist16
-rw-r--r--news/p5-News-Newsrc/Makefile3
-rw-r--r--news/p5-News-Newsrc/pkg-plist10
-rw-r--r--news/ubh/Makefile14
-rw-r--r--palm/p5-Palm/pkg-plist22
-rw-r--r--palm/sitescooper/Makefile2
-rw-r--r--palm/sitescooper/pkg-plist66
-rw-r--r--ports-mgmt/p5-FreeBSD-Ports/pkg-plist14
-rw-r--r--print/axpoint/Makefile2
-rw-r--r--print/axpoint/pkg-plist14
-rw-r--r--print/guitartex/Makefile2
-rw-r--r--print/p5-GnomePrint/Makefile6
-rw-r--r--print/p5-GnomePrint/pkg-plist32
-rw-r--r--print/p5-PDFLib/Makefile2
-rw-r--r--print/p5-PDFLib/pkg-plist6
-rw-r--r--print/p5-PostScript-Simple/pkg-plist10
-rw-r--r--print/pdflib/pkg-plist8
-rw-r--r--print/pdflib4/pkg-plist8
-rw-r--r--print/perlftlib/pkg-plist14
-rw-r--r--russian/p5-Lingua-RU-Charset/Makefile1
-rw-r--r--russian/p5-Lingua-RU-Charset/pkg-plist14
-rw-r--r--russian/p5-XML-Parser-encodings/Makefile4
-rw-r--r--russian/p5-XML-Parser-encodings/pkg-plist16
-rw-r--r--russian/p5-cyrillic/Makefile1
-rw-r--r--russian/p5-cyrillic/pkg-plist6
-rw-r--r--science/p5-Chemistry-Elements/Makefile1
-rw-r--r--science/p5-Chemistry-Elements/pkg-plist10
-rw-r--r--security/amavis-perl/Makefile20
-rw-r--r--security/cp2fwb/Makefile4
-rw-r--r--security/p5-Authen-Krb5/pkg-plist12
-rw-r--r--security/p5-Authen-PAM/pkg-plist16
-rw-r--r--security/p5-Authen-Smb/pkg-plist16
-rw-r--r--security/p5-Authen-TacacsPlus/Makefile1
-rw-r--r--security/p5-Authen-TacacsPlus/pkg-plist14
-rw-r--r--security/p5-Authen-Ticket/Makefile1
-rw-r--r--security/p5-Authen-Ticket/pkg-plist18
-rw-r--r--security/p5-Crypt-Blowfish/Makefile1
-rw-r--r--security/p5-Crypt-Blowfish/pkg-plist14
-rw-r--r--security/p5-Crypt-Blowfish_PP/Makefile1
-rw-r--r--security/p5-Crypt-Blowfish_PP/pkg-plist12
-rw-r--r--security/p5-Crypt-CBC/Makefile2
-rw-r--r--security/p5-Crypt-CBC/pkg-plist10
-rw-r--r--security/p5-Crypt-CipherSaber/Makefile1
-rw-r--r--security/p5-Crypt-CipherSaber/pkg-plist10
-rw-r--r--security/p5-Crypt-Cracklib/Makefile3
-rw-r--r--security/p5-Crypt-Cracklib/pkg-plist14
-rw-r--r--security/p5-Crypt-Cryptix/Makefile1
-rw-r--r--security/p5-Crypt-Cryptix/pkg-plist176
-rw-r--r--security/p5-Crypt-DES/Makefile1
-rw-r--r--security/p5-Crypt-DES/pkg-plist14
-rw-r--r--security/p5-Crypt-DES_EDE3/Makefile3
-rw-r--r--security/p5-Crypt-DES_EDE3/pkg-plist2
-rw-r--r--security/p5-Crypt-DH/Makefile5
-rw-r--r--security/p5-Crypt-DH/pkg-plist2
-rw-r--r--security/p5-Crypt-DSA/Makefile3
-rw-r--r--security/p5-Crypt-DSA/pkg-plist22
-rw-r--r--security/p5-Crypt-ECB/Makefile1
-rw-r--r--security/p5-Crypt-ECB/pkg-plist10
-rw-r--r--security/p5-Crypt-HCE_SHA/Makefile6
-rw-r--r--security/p5-Crypt-HCE_SHA/pkg-plist18
-rw-r--r--security/p5-Crypt-IDEA/Makefile1
-rw-r--r--security/p5-Crypt-IDEA/pkg-plist16
-rw-r--r--security/p5-Crypt-OTP/Makefile1
-rw-r--r--security/p5-Crypt-OTP/pkg-plist10
-rw-r--r--security/p5-Crypt-OpenSSL-DSA/Makefile1
-rw-r--r--security/p5-Crypt-OpenSSL-DSA/pkg-plist22
-rw-r--r--security/p5-Crypt-OpenSSL-RSA/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-RSA/pkg-plist54
-rw-r--r--security/p5-Crypt-OpenSSL-Random/Makefile1
-rw-r--r--security/p5-Crypt-OpenSSL-Random/pkg-plist20
-rw-r--r--security/p5-Crypt-PGPSimple/Makefile1
-rw-r--r--security/p5-Crypt-PGPSimple/pkg-plist10
-rw-r--r--security/p5-Crypt-PassGen/Makefile3
-rw-r--r--security/p5-Crypt-PassGen/pkg-plist12
-rw-r--r--security/p5-Crypt-PasswdMD5/pkg-plist8
-rw-r--r--security/p5-Crypt-Primes/Makefile3
-rw-r--r--security/p5-Crypt-RC4/Makefile1
-rw-r--r--security/p5-Crypt-RC4/pkg-plist10
-rw-r--r--security/p5-Crypt-RC5/Makefile1
-rw-r--r--security/p5-Crypt-RC5/pkg-plist10
-rw-r--r--security/p5-Crypt-RC6/Makefile1
-rw-r--r--security/p5-Crypt-RC6/pkg-plist14
-rw-r--r--security/p5-Crypt-RIPEMD160/Makefile1
-rw-r--r--security/p5-Crypt-RIPEMD160/pkg-plist20
-rw-r--r--security/p5-Crypt-RSA/Makefile3
-rw-r--r--security/p5-Crypt-RSA/pkg-plist44
-rw-r--r--security/p5-Crypt-RandPasswd/Makefile2
-rw-r--r--security/p5-Crypt-RandPasswd/pkg-plist10
-rw-r--r--security/p5-Crypt-Random/Makefile3
-rw-r--r--security/p5-Crypt-Random/pkg-plist26
-rw-r--r--security/p5-Crypt-Rijndael/pkg-plist14
-rw-r--r--security/p5-Crypt-SSLeay/Makefile7
-rw-r--r--security/p5-Crypt-SSLeay/pkg-plist30
-rw-r--r--security/p5-Crypt-Serpent/Makefile1
-rw-r--r--security/p5-Crypt-Serpent/pkg-plist14
-rw-r--r--security/p5-Crypt-Solitaire/Makefile1
-rw-r--r--security/p5-Crypt-Solitaire/pkg-plist16
-rw-r--r--security/p5-Crypt-TripleDES/Makefile1
-rw-r--r--security/p5-Crypt-TripleDES/pkg-plist12
-rw-r--r--security/p5-Crypt-Twofish/pkg-plist14
-rw-r--r--security/p5-Crypt-Twofish2/Makefile1
-rw-r--r--security/p5-Crypt-Twofish2/pkg-plist14
-rw-r--r--security/p5-Crypt-UnixCrypt/Makefile3
-rw-r--r--security/p5-Crypt-UnixCrypt/pkg-plist10
-rw-r--r--security/p5-Digest-BubbleBabble/Makefile1
-rw-r--r--security/p5-Digest-BubbleBabble/pkg-plist2
-rw-r--r--security/p5-Digest-HMAC/Makefile5
-rw-r--r--security/p5-Digest-HMAC/pkg-plist14
-rw-r--r--security/p5-Digest-MD2/Makefile1
-rw-r--r--security/p5-Digest-MD2/pkg-plist14
-rw-r--r--security/p5-Digest-MD4/Makefile1
-rw-r--r--security/p5-Digest-Nilsimsa/Makefile1
-rw-r--r--security/p5-File-Scan/Makefile1
-rw-r--r--security/p5-File-Scan/pkg-plist10
-rw-r--r--security/p5-Filter-CBC/Makefile6
-rw-r--r--security/p5-Filter-CBC/pkg-plist12
-rw-r--r--security/p5-GnuPG-Interface/Makefile3
-rw-r--r--security/p5-IO-Socket-SSL/Makefile3
-rw-r--r--security/p5-IO-Socket-SSL/pkg-plist14
-rw-r--r--security/p5-MD5/Makefile3
-rw-r--r--security/p5-MD5/pkg-plist6
-rw-r--r--security/p5-Net-SSLeay/Makefile1
-rw-r--r--security/p5-Net-SSLeay/pkg-plist98
-rw-r--r--security/p5-PGP-Sign/Makefile1
-rw-r--r--security/p5-PGP-Sign/pkg-plist10
-rw-r--r--security/p5-PGP/Makefile1
-rw-r--r--security/p5-PGP/pkg-plist10
-rw-r--r--security/p5-SHA/Makefile1
-rw-r--r--security/p5-SHA/pkg-plist16
-rw-r--r--security/p5-Safe-Hole/Makefile1
-rw-r--r--security/p5-Safe-Hole/pkg-plist12
-rw-r--r--security/p5-Tie-EncryptedHash/Makefile3
-rw-r--r--security/saferpay/pkg-plist.p540
-rw-r--r--security/smtpscan/Makefile6
-rw-r--r--security/snortsnarf/Makefile2
-rw-r--r--security/swatch/Makefile2
-rw-r--r--security/swatch/pkg-plist4
-rw-r--r--security/tinyca/Makefile2
-rw-r--r--shells/perlsh/pkg-plist120
-rw-r--r--shells/psh/pkg-plist120
-rw-r--r--shells/vshnu/Makefile4
-rw-r--r--sysutils/colorize/Makefile2
-rw-r--r--sysutils/cvsweb-converters/Makefile8
-rw-r--r--sysutils/fastest_cvsup/Makefile2
-rw-r--r--sysutils/p5-File-Which/pkg-plist10
-rw-r--r--sysutils/p5-Filesys-DiskSpace/Makefile1
-rw-r--r--sysutils/p5-Filesys-DiskSpace/pkg-plist10
-rw-r--r--sysutils/p5-LJ-Cache/Makefile1
-rw-r--r--sysutils/p5-LJ-Cache/pkg-plist16
-rw-r--r--sysutils/p5-LJ-TextMessage/Makefile1
-rw-r--r--sysutils/p5-LJ-TextMessage/pkg-plist10
-rw-r--r--sysutils/p5-Schedule-At/Makefile1
-rw-r--r--sysutils/p5-Schedule-At/pkg-plist10
-rw-r--r--sysutils/p5-Schedule-Cron/Makefile3
-rw-r--r--sysutils/p5-Schedule-Cron/pkg-plist10
-rw-r--r--sysutils/p5-Schedule-Match/Makefile1
-rw-r--r--sysutils/p5-Schedule-Match/pkg-plist10
-rw-r--r--sysutils/p5-Stat-lsMode/Makefile1
-rw-r--r--sysutils/p5-Stat-lsMode/pkg-plist10
-rw-r--r--sysutils/p5-Sys-CpuLoad/Makefile1
-rw-r--r--sysutils/p5-Sys-CpuLoad/pkg-plist16
-rw-r--r--sysutils/p5-SyslogScan/Makefile1
-rw-r--r--sysutils/p5-SyslogScan/pkg-plist46
-rw-r--r--sysutils/p5-Tie-Syslog/Makefile1
-rw-r--r--sysutils/p5-Tie-Syslog/pkg-plist10
-rw-r--r--sysutils/p5-UPS-Nut/Makefile1
-rw-r--r--sysutils/p5-UPS-Nut/pkg-plist10
-rw-r--r--sysutils/p5-Unix-ConfigFile/Makefile1
-rw-r--r--sysutils/p5-Unix-ConfigFile/pkg-plist18
-rw-r--r--sysutils/p5-Unix-Syslog/Makefile1
-rw-r--r--sysutils/p5-Unix-Syslog/pkg-plist16
-rw-r--r--sysutils/p5-User/Makefile1
-rw-r--r--sysutils/p5-User/pkg-plist6
-rw-r--r--sysutils/usermin/Makefile4
-rw-r--r--sysutils/webmin/Makefile4
-rw-r--r--sysutils/whatpix/Makefile4
-rw-r--r--sysutils/wots/Makefile4
-rw-r--r--textproc/ascii2pdf/Makefile2
-rw-r--r--textproc/gutenbook/Makefile2
-rw-r--r--textproc/gutenbook/pkg-plist14
-rw-r--r--textproc/makepatch/pkg-plist4
-rw-r--r--textproc/p5-Apache-ParseLog/Makefile1
-rw-r--r--textproc/p5-Apache-ParseLog/pkg-plist10
-rw-r--r--textproc/p5-CSS-SAC/Makefile4
-rw-r--r--textproc/p5-CSS-SAC/pkg-plist60
-rw-r--r--textproc/p5-Data-FormValidator/Makefile1
-rw-r--r--textproc/p5-Data-FormValidator/pkg-plist10
-rw-r--r--textproc/p5-DelimMatch/Makefile1
-rw-r--r--textproc/p5-DelimMatch/pkg-plist16
-rw-r--r--textproc/p5-FreeBSD-Ports/pkg-plist14
-rw-r--r--textproc/p5-HTML-Format/Makefile5
-rw-r--r--textproc/p5-HTML-Format/pkg-plist14
-rw-r--r--textproc/p5-LJ-SpellCheck/Makefile1
-rw-r--r--textproc/p5-LJ-SpellCheck/pkg-plist10
-rw-r--r--textproc/p5-Lingua-Conjunction/Makefile1
-rw-r--r--textproc/p5-Lingua-Conjunction/pkg-plist10
-rw-r--r--textproc/p5-Lingua-EN-AddressParse/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-AddressParse/pkg-plist16
-rw-r--r--textproc/p5-Lingua-EN-Gender/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Gender/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-Inflect/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Inflect/pkg-plist24
-rw-r--r--textproc/p5-Lingua-EN-MatchNames/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-MatchNames/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-NameCase/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-NameCase/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-NameParse/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-NameParse/pkg-plist16
-rw-r--r--textproc/p5-Lingua-EN-Nickname/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Nickname/pkg-plist16
-rw-r--r--textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist18
-rw-r--r--textproc/p5-Lingua-EN-Numbers/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Numbers/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-Sentence/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Sentence/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-Squeeze/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Squeeze/pkg-plist14
-rw-r--r--textproc/p5-Lingua-EN-Summarize/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Summarize/pkg-plist18
-rw-r--r--textproc/p5-Lingua-EN-Syllable/Makefile1
-rw-r--r--textproc/p5-Lingua-EN-Syllable/pkg-plist14
-rw-r--r--textproc/p5-Lingua-Ident/pkg-plist10
-rw-r--r--textproc/p5-Lingua-Ispell/pkg-plist8
-rw-r--r--textproc/p5-Lingua-Preferred/Makefile3
-rw-r--r--textproc/p5-Lingua-Preferred/pkg-plist16
-rw-r--r--textproc/p5-MARC/Makefile1
-rw-r--r--textproc/p5-MARC/pkg-plist6
-rw-r--r--textproc/p5-NetAddr-IP-Find/Makefile2
-rw-r--r--textproc/p5-NetAddr-IP-Find/pkg-plist14
-rw-r--r--textproc/p5-Number-Format/Makefile1
-rw-r--r--textproc/p5-Number-Format/pkg-plist10
-rw-r--r--textproc/p5-Orchard-Perl/Makefile2
-rw-r--r--textproc/p5-Orchard-Perl/pkg-plist20
-rw-r--r--textproc/p5-PDF-API2/Makefile2
-rw-r--r--textproc/p5-PDF-API3/Makefile2
-rw-r--r--textproc/p5-PDF-Create/Makefile1
-rw-r--r--textproc/p5-PDF-Create/pkg-plist18
-rw-r--r--textproc/p5-Parse-Syslog/Makefile1
-rw-r--r--textproc/p5-Parse-Syslog/pkg-plist10
-rw-r--r--textproc/p5-Pod-Constants/Makefile2
-rw-r--r--textproc/p5-Pod-Constants/pkg-plist10
-rw-r--r--textproc/p5-Pod-POM/pkg-plist30
-rw-r--r--textproc/p5-RADIUS-UserFile/Makefile3
-rw-r--r--textproc/p5-RADIUS-UserFile/pkg-plist10
-rw-r--r--textproc/p5-RDF-Core/Makefile4
-rw-r--r--textproc/p5-RDF-Core/pkg-plist66
-rw-r--r--textproc/p5-RDFStore/Makefile8
-rw-r--r--textproc/p5-RDFStore/pkg-plist90
-rw-r--r--textproc/p5-Search-Saryer/Makefile1
-rw-r--r--textproc/p5-Search-Saryer/pkg-plist14
-rw-r--r--textproc/p5-Sort-ArbBiLex/Makefile1
-rw-r--r--textproc/p5-Sort-ArbBiLex/pkg-plist10
-rw-r--r--textproc/p5-Sort-Fields/Makefile1
-rw-r--r--textproc/p5-Sort-Fields/pkg-plist10
-rw-r--r--textproc/p5-Sort-PolySort/Makefile1
-rw-r--r--textproc/p5-Sort-PolySort/pkg-plist10
-rw-r--r--textproc/p5-Spreadsheet-ParseExcel/Makefile1
-rw-r--r--textproc/p5-String-Scanf/Makefile1
-rw-r--r--textproc/p5-String-Scanf/pkg-plist10
-rw-r--r--textproc/p5-String-ShellQuote/Makefile1
-rw-r--r--textproc/p5-String-ShellQuote/pkg-plist10
-rw-r--r--textproc/p5-String-Strip/Makefile1
-rw-r--r--textproc/p5-String-Strip/pkg-plist16
-rw-r--r--textproc/p5-TeX-Hyphen/Makefile1
-rw-r--r--textproc/p5-TeX-Hyphen/pkg-plist16
-rw-r--r--textproc/p5-Text-Bind/Makefile1
-rw-r--r--textproc/p5-Text-Bind/pkg-plist10
-rw-r--r--textproc/p5-Text-CSV/Makefile1
-rw-r--r--textproc/p5-Text-CSV/pkg-plist24
-rw-r--r--textproc/p5-Text-CSV_XS/Makefile1
-rw-r--r--textproc/p5-Text-CSV_XS/pkg-plist14
-rw-r--r--textproc/p5-Text-Diff/Makefile3
-rw-r--r--textproc/p5-Text-Diff/pkg-plist14
-rw-r--r--textproc/p5-Text-DoubleMetaphone/Makefile1
-rw-r--r--textproc/p5-Text-DoubleMetaphone/pkg-plist16
-rw-r--r--textproc/p5-Text-EtText/pkg-plist22
-rw-r--r--textproc/p5-Text-FillIn/Makefile1
-rw-r--r--textproc/p5-Text-FillIn/pkg-plist10
-rw-r--r--textproc/p5-Text-Filter-Chain/Makefile3
-rw-r--r--textproc/p5-Text-Filter-Chain/pkg-plist8
-rw-r--r--textproc/p5-Text-Filter/Makefile1
-rw-r--r--textproc/p5-Text-Filter/pkg-plist10
-rw-r--r--textproc/p5-Text-FixedLength-Extra/Makefile3
-rw-r--r--textproc/p5-Text-FixedLength-Extra/pkg-plist8
-rw-r--r--textproc/p5-Text-FixedLength/Makefile1
-rw-r--r--textproc/p5-Text-FixedLength/pkg-plist10
-rw-r--r--textproc/p5-Text-Flowchart/Makefile1
-rw-r--r--textproc/p5-Text-Flowchart/pkg-plist10
-rw-r--r--textproc/p5-Text-Format/Makefile1
-rw-r--r--textproc/p5-Text-Format/pkg-plist10
-rw-r--r--textproc/p5-Text-FormatTable/Makefile1
-rw-r--r--textproc/p5-Text-FormatTable/pkg-plist12
-rw-r--r--textproc/p5-Text-Graphics/Makefile3
-rw-r--r--textproc/p5-Text-Graphics/pkg-plist8
-rw-r--r--textproc/p5-Text-Metaphone/Makefile1
-rw-r--r--textproc/p5-Text-Metaphone/pkg-plist14
-rw-r--r--textproc/p5-Text-Query/Makefile1
-rw-r--r--textproc/p5-Text-Query/pkg-plist36
-rw-r--r--textproc/p5-Text-Repository/Makefile1
-rw-r--r--textproc/p5-Text-Repository/pkg-plist10
-rw-r--r--textproc/p5-Text-Shellwords/Makefile1
-rw-r--r--textproc/p5-Text-Shellwords/pkg-plist6
-rw-r--r--textproc/p5-Text-SimpleTemplate/Makefile1
-rw-r--r--textproc/p5-Text-SimpleTemplate/pkg-plist10
-rw-r--r--textproc/p5-Text-Tabs+Wrap/Makefile1
-rw-r--r--textproc/p5-Text-Tabs+Wrap/pkg-plist10
-rw-r--r--textproc/p5-Text-Template/Makefile1
-rw-r--r--textproc/p5-Text-Template/pkg-plist14
-rw-r--r--textproc/p5-Text-Tmpl/Makefile1
-rw-r--r--textproc/p5-Text-Tmpl/pkg-plist22
-rw-r--r--textproc/p5-Text-Wrapper/Makefile1
-rw-r--r--textproc/p5-Text-Wrapper/pkg-plist10
-rw-r--r--textproc/p5-Tk-XMLViewer/Makefile4
-rw-r--r--textproc/p5-Tree-Nary/Makefile1
-rw-r--r--textproc/p5-Tree-Nary/pkg-plist10
-rw-r--r--textproc/p5-URI-Find/Makefile2
-rw-r--r--textproc/p5-URI-Find/pkg-plist14
-rw-r--r--textproc/p5-WDDX/Makefile5
-rw-r--r--textproc/p5-WDDX/pkg-plist28
-rw-r--r--textproc/p5-XML-Catalog/Makefile1
-rw-r--r--textproc/p5-XML-Catalog/pkg-plist10
-rw-r--r--textproc/p5-XML-DOM/Makefile3
-rw-r--r--textproc/p5-XML-DOM/pkg-plist62
-rw-r--r--textproc/p5-XML-DT/Makefile3
-rw-r--r--textproc/p5-XML-DT/pkg-plist100
-rw-r--r--textproc/p5-XML-Directory/Makefile3
-rw-r--r--textproc/p5-XML-Directory/pkg-plist22
-rw-r--r--textproc/p5-XML-Dumper/Makefile3
-rw-r--r--textproc/p5-XML-Dumper/pkg-plist8
-rw-r--r--textproc/p5-XML-Encoding/Makefile3
-rw-r--r--textproc/p5-XML-Encoding/pkg-plist10
-rw-r--r--textproc/p5-XML-Filter-Base/Makefile1
-rw-r--r--textproc/p5-XML-Filter-Base/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-DetectWS/Makefile3
-rw-r--r--textproc/p5-XML-Filter-DetectWS/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-GenericChunk/Makefile1
-rw-r--r--textproc/p5-XML-Filter-Reindent/Makefile3
-rw-r--r--textproc/p5-XML-Filter-Reindent/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-SAXT/Makefile1
-rw-r--r--textproc/p5-XML-Filter-SAXT/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-XInclude/Makefile3
-rw-r--r--textproc/p5-XML-Filter-XInclude/pkg-plist14
-rw-r--r--textproc/p5-XML-Filter-XSLT/Makefile7
-rw-r--r--textproc/p5-XML-Filter-XSLT/pkg-plist18
-rw-r--r--textproc/p5-XML-GDOME/Makefile1
-rw-r--r--textproc/p5-XML-Generator-PerlData/Makefile1
-rw-r--r--textproc/p5-XML-Grove/Makefile3
-rw-r--r--textproc/p5-XML-Grove/pkg-plist34
-rw-r--r--textproc/p5-XML-Handler-YAWriter/Makefile2
-rw-r--r--textproc/p5-XML-Handler-YAWriter/pkg-plist14
-rw-r--r--textproc/p5-XML-LibRSVG/Makefile1
-rw-r--r--textproc/p5-XML-LibRSVG/pkg-plist14
-rw-r--r--textproc/p5-XML-LibXML-Common/pkg-plist18
-rw-r--r--textproc/p5-XML-LibXSLT/Makefile3
-rw-r--r--textproc/p5-XML-LibXSLT/pkg-plist16
-rw-r--r--textproc/p5-XML-Node/Makefile3
-rw-r--r--textproc/p5-XML-Node/pkg-plist14
-rw-r--r--textproc/p5-XML-RSS/Makefile1
-rw-r--r--textproc/p5-XML-RegExp/Makefile1
-rw-r--r--textproc/p5-XML-RegExp/pkg-plist10
-rw-r--r--textproc/p5-XML-SAX-Base/Makefile1
-rw-r--r--textproc/p5-XML-SAX-Base/pkg-plist16
-rw-r--r--textproc/p5-XML-SAXDriver-Sablotron/Makefile4
-rw-r--r--textproc/p5-XML-SAXDriver-Sablotron/pkg-plist14
-rw-r--r--textproc/p5-XML-Schematron/Makefile3
-rw-r--r--textproc/p5-XML-Schematron/pkg-plist18
-rw-r--r--textproc/p5-XML-Simple/Makefile3
-rw-r--r--textproc/p5-XML-Stream/Makefile5
-rw-r--r--textproc/p5-XML-Stream/pkg-plist24
-rw-r--r--textproc/p5-XML-TreeBuilder/Makefile5
-rw-r--r--textproc/p5-XML-TreeBuilder/pkg-plist10
-rw-r--r--textproc/p5-XML-Twig/Makefile5
-rw-r--r--textproc/p5-XML-Twig/pkg-plist8
-rw-r--r--textproc/p5-XML-XPath/Makefile3
-rw-r--r--textproc/p5-XML-XPath/pkg-plist54
-rw-r--r--textproc/p5-XML-XQL/Makefile3
-rw-r--r--textproc/p5-XML-XQL/pkg-plist26
-rw-r--r--textproc/p5-XML-XUpdate-LibXML/Makefile2
-rw-r--r--textproc/p5-XML-XUpdate-LibXML/pkg-plist18
-rw-r--r--textproc/p5-dTemplate/Makefile1
-rw-r--r--textproc/p5-dTemplate/pkg-plist6
-rw-r--r--textproc/p5-libxml/Makefile3
-rw-r--r--textproc/p5-libxml/pkg-plist42
-rw-r--r--textproc/p5-xmltv/pkg-plist44
-rw-r--r--textproc/ruby-xmlparser/Makefile2
-rw-r--r--textproc/sarep/Makefile2
-rw-r--r--textproc/sdf/pkg-plist378
-rw-r--r--textproc/texi2db/Makefile2
-rw-r--r--textproc/xslint/Makefile2
-rw-r--r--www/bins/Makefile2
-rw-r--r--www/cgi-lib.pl/pkg-plist2
-rw-r--r--www/cybercalendar/Makefile8
-rw-r--r--www/html2wml/Makefile2
-rw-r--r--www/htmlobject/Makefile1
-rw-r--r--www/htmlobject/pkg-plist38
-rw-r--r--www/htmlpp/pkg-plist12
-rw-r--r--www/interchange/Makefile2
-rw-r--r--www/jdresolve/Makefile2
-rw-r--r--www/ljdeps/Makefile2
-rw-r--r--www/mod_perl/Makefile3
-rw-r--r--www/mod_perl/pkg-plist140
-rw-r--r--www/mod_perl2/Makefile1
-rw-r--r--www/p5-Apache-ASP/Makefile32
-rw-r--r--www/p5-Apache-AddHostPath/Makefile1
-rw-r--r--www/p5-Apache-AddHostPath/pkg-plist10
-rw-r--r--www/p5-Apache-Admin-Config/Makefile1
-rw-r--r--www/p5-Apache-Admin-Config/pkg-plist14
-rw-r--r--www/p5-Apache-AntiSpam/Makefile6
-rw-r--r--www/p5-Apache-AntiSpam/pkg-plist18
-rw-r--r--www/p5-Apache-Archive/Makefile3
-rw-r--r--www/p5-Apache-Archive/pkg-plist16
-rw-r--r--www/p5-Apache-AuthCookie/Makefile3
-rw-r--r--www/p5-Apache-AuthCookie/pkg-plist12
-rw-r--r--www/p5-Apache-AuthTicket/Makefile6
-rw-r--r--www/p5-Apache-AuthTicket/pkg-plist10
-rw-r--r--www/p5-Apache-AuthenCache/Makefile3
-rw-r--r--www/p5-Apache-AuthenCache/pkg-plist10
-rw-r--r--www/p5-Apache-AuthenURL/Makefile3
-rw-r--r--www/p5-Apache-AuthenURL/pkg-plist6
-rw-r--r--www/p5-Apache-AutoIndex/Makefile9
-rw-r--r--www/p5-Apache-AutoIndex/pkg-plist12
-rw-r--r--www/p5-Apache-Clean/Makefile1
-rw-r--r--www/p5-Apache-Clean2/Makefile1
-rw-r--r--www/p5-Apache-Compress/Makefile1
-rw-r--r--www/p5-Apache-ConfigFile/pkg-plist10
-rw-r--r--www/p5-Apache-DumpHeaders/Makefile3
-rw-r--r--www/p5-Apache-DumpHeaders/pkg-plist12
-rw-r--r--www/p5-Apache-Icon/Makefile3
-rw-r--r--www/p5-Apache-Icon/pkg-plist10
-rw-r--r--www/p5-Apache-Language/Makefile5
-rw-r--r--www/p5-Apache-Language/pkg-plist20
-rw-r--r--www/p5-Apache-MP3/Makefile3
-rw-r--r--www/p5-Apache-MP3/pkg-plist100
-rw-r--r--www/p5-Apache-NNTPGateway/Makefile7
-rw-r--r--www/p5-Apache-NNTPGateway/pkg-plist10
-rw-r--r--www/p5-Apache-PageKit/Makefile3
-rw-r--r--www/p5-Apache-PageKit/pkg-plist32
-rw-r--r--www/p5-Apache-Peek/Makefile5
-rw-r--r--www/p5-Apache-Peek/pkg-plist10
-rw-r--r--www/p5-Apache-Radius/Makefile4
-rw-r--r--www/p5-Apache-Radius/pkg-plist4
-rw-r--r--www/p5-Apache-Reload/Makefile1
-rw-r--r--www/p5-Apache-Reload/pkg-plist10
-rw-r--r--www/p5-Apache-SSI/Makefile2
-rw-r--r--www/p5-Apache-Session-PHP/Makefile7
-rw-r--r--www/p5-Apache-Session-PHP/pkg-plist10
-rw-r--r--www/p5-Apache-Session/Makefile2
-rw-r--r--www/p5-Apache-Session/pkg-plist70
-rw-r--r--www/p5-Apache-SubProcess/Makefile2
-rw-r--r--www/p5-Apache-SubProcess/pkg-plist14
-rw-r--r--www/p5-ApacheBench/pkg-plist24
-rw-r--r--www/p5-AxKit-XSP-Cookie/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Cookie/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-ESQL/Makefile2
-rw-r--r--www/p5-AxKit-XSP-ESQL/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-Exception/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Exception/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-IfParam/Makefile2
-rw-r--r--www/p5-AxKit-XSP-IfParam/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-Param/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Param/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-PerForm/Makefile2
-rw-r--r--www/p5-AxKit-XSP-PerForm/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-Sendmail/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Sendmail/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-Util/Makefile2
-rw-r--r--www/p5-AxKit-XSP-Util/pkg-plist12
-rw-r--r--www/p5-AxKit-XSP-WebUtils/Makefile2
-rw-r--r--www/p5-AxKit-XSP-WebUtils/pkg-plist12
-rw-r--r--www/p5-AxKit/Makefile2
-rw-r--r--www/p5-AxKit/pkg-plist102
-rw-r--r--www/p5-Bundle-Slash/Makefile3
-rw-r--r--www/p5-Bundle-Slash/pkg-plist10
-rw-r--r--www/p5-Bundle-Sledge/Makefile3
-rw-r--r--www/p5-Bundle-Sledge/pkg-plist10
-rw-r--r--www/p5-CGI-Application/Makefile3
-rw-r--r--www/p5-CGI-Application/pkg-plist14
-rw-r--r--www/p5-CGI-ArgChecker/Makefile3
-rw-r--r--www/p5-CGI-ArgChecker/pkg-plist10
-rw-r--r--www/p5-CGI-Cache/Makefile3
-rw-r--r--www/p5-CGI-Cache/pkg-plist10
-rw-r--r--www/p5-CGI-FastTemplate/Makefile1
-rw-r--r--www/p5-CGI-FastTemplate/pkg-plist10
-rw-r--r--www/p5-CGI-Minimal/pkg-plist12
-rw-r--r--www/p5-CGI-Session/Makefile2
-rw-r--r--www/p5-CGI-Session/pkg-plist94
-rw-r--r--www/p5-CGI-SpeedyCGI/pkg-plist10
-rw-r--r--www/p5-CGI-Upload/Makefile5
-rw-r--r--www/p5-CGI-Upload/pkg-plist10
-rw-r--r--www/p5-CGI-modules/Makefile3
-rw-r--r--www/p5-CGI-modules/pkg-plist20
-rw-r--r--www/p5-CGI.pm/Makefile4
-rw-r--r--www/p5-FastCGI/Makefile1
-rw-r--r--www/p5-FastCGI/pkg-plist10
-rw-r--r--www/p5-GtkHTML/Makefile4
-rw-r--r--www/p5-GtkHTML/pkg-plist32
-rw-r--r--www/p5-HTML-CalendarMonthSimple/Makefile2
-rw-r--r--www/p5-HTML-CalendarMonthSimple/pkg-plist12
-rw-r--r--www/p5-HTML-Clean/pkg-plist16
-rw-r--r--www/p5-HTML-Element-Extended/Makefile2
-rw-r--r--www/p5-HTML-Element-Extended/pkg-plist14
-rw-r--r--www/p5-HTML-Embperl/Makefile6
-rw-r--r--www/p5-HTML-Embperl/pkg-plist46
-rw-r--r--www/p5-HTML-FromText/Makefile1
-rw-r--r--www/p5-HTML-FromText/pkg-plist10
-rw-r--r--www/p5-HTML-Navigation/Makefile3
-rw-r--r--www/p5-HTML-Navigation/pkg-plist10
-rw-r--r--www/p5-HTML-Pager/Makefile3
-rw-r--r--www/p5-HTML-Pager/pkg-plist6
-rw-r--r--www/p5-HTML-QuickCheck/Makefile1
-rw-r--r--www/p5-HTML-QuickCheck/pkg-plist10
-rw-r--r--www/p5-HTML-SimpleParse/Makefile1
-rw-r--r--www/p5-HTML-Stream/Makefile1
-rw-r--r--www/p5-HTML-Stream/pkg-plist10
-rw-r--r--www/p5-HTML-Summary/Makefile2
-rw-r--r--www/p5-HTML-Summary/pkg-plist22
-rw-r--r--www/p5-HTML-Table/pkg-plist10
-rw-r--r--www/p5-HTML-TableExtract/Makefile3
-rw-r--r--www/p5-HTML-TableExtract/pkg-plist6
-rw-r--r--www/p5-HTML-TableLayout/pkg-plist20
-rw-r--r--www/p5-HTML-Tagset/pkg-plist10
-rw-r--r--www/p5-HTML-Template-Associate/Makefile1
-rw-r--r--www/p5-HTML-Template-Expr/Makefile8
-rw-r--r--www/p5-HTML-Template-Expr/pkg-plist14
-rw-r--r--www/p5-HTML-Template/pkg-plist10
-rw-r--r--www/p5-HTML-Tree/Makefile2
-rw-r--r--www/p5-HTML-Tree/pkg-plist28
-rw-r--r--www/p5-HTML-Webmake/Makefile8
-rw-r--r--www/p5-HTML-Webmake/pkg-plist128
-rw-r--r--www/p5-HTML-Widgets-SelectLayers/Makefile1
-rw-r--r--www/p5-HTML-Widgets-SelectLayers/pkg-plist16
-rw-r--r--www/p5-HTML/pkg-plist6
-rw-r--r--www/p5-HTTP-BrowserDetect/pkg-plist10
-rw-r--r--www/p5-HTTP-DAV/Makefile4
-rw-r--r--www/p5-HTTP-DAV/pkg-plist24
-rw-r--r--www/p5-HTTP-GHTTP/Makefile1
-rw-r--r--www/p5-HTTP-GHTTP/pkg-plist14
-rw-r--r--www/p5-HTTP-MobileAgent/Makefile2
-rw-r--r--www/p5-HTTP-MobileAgent/pkg-plist24
-rw-r--r--www/p5-HTTPD-Log-Filter/Makefile4
-rw-r--r--www/p5-HTTPD-Log-Filter/pkg-plist14
-rw-r--r--www/p5-HTTPD-Tools/Makefile1
-rw-r--r--www/p5-HTTPD-Tools/pkg-plist40
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile1
-rw-r--r--www/p5-HTTPD-User-Manage/pkg-plist40
-rw-r--r--www/p5-MasonX-Request-WithApacheSession/pkg-plist2
-rw-r--r--www/p5-ParallelUA/Makefile6
-rw-r--r--www/p5-ParallelUA/pkg-plist36
-rw-r--r--www/p5-Sledge-Plugin-CacheContent/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-CacheContent/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-Download/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-Download/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-Dumper/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-Dumper/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-HTML2HDML/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-HTML2HDML/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-Log/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-Log/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-NoCache/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-NoCache/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-SaveUpload/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-SaveUpload/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-ScratchPad/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-ScratchPad/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist10
-rw-r--r--www/p5-Sledge-Plugin-XSLT/Makefile2
-rw-r--r--www/p5-Sledge-Plugin-XSLT/pkg-plist10
-rw-r--r--www/p5-Sledge-SessionManager-CookieStore/Makefile2
-rw-r--r--www/p5-Sledge-SessionManager-CookieStore/pkg-plist10
-rw-r--r--www/p5-Sledge-Template-Expr/Makefile2
-rw-r--r--www/p5-Sledge-Template-Expr/pkg-plist10
-rw-r--r--www/p5-Sledge/Makefile2
-rw-r--r--www/p5-Sledge/pkg-plist98
-rw-r--r--www/p5-Template-Plugin-Comma/Makefile1
-rw-r--r--www/p5-Template-Toolkit/Makefile2
-rw-r--r--www/p5-Template-Toolkit/pkg-plist204
-rw-r--r--www/p5-URI-Sequin/Makefile1
-rw-r--r--www/p5-URI-Sequin/pkg-plist20
-rw-r--r--www/p5-WWW-Automate/Makefile2
-rw-r--r--www/p5-WWW-Automate/pkg-plist10
-rw-r--r--www/p5-WWW-IMDb/Makefile3
-rw-r--r--www/p5-WWW-IMDb/pkg-plist14
-rw-r--r--www/p5-WWW-Robot/Makefile3
-rw-r--r--www/p5-WWW-Robot/pkg-plist10
-rw-r--r--www/p5-WWW-Search-Google/Makefile6
-rw-r--r--www/p5-WWW-Search-Google/pkg-plist14
-rw-r--r--www/p5-libservlet/Makefile3
-rw-r--r--www/p5-libservlet/pkg-plist88
-rw-r--r--www/reportmagic/Makefile8
-rw-r--r--www/rt2/Makefile2
-rw-r--r--www/rt3/Makefile2
-rw-r--r--www/rt32/Makefile2
-rw-r--r--www/rt34/Makefile2
-rw-r--r--www/rt36/Makefile2
-rw-r--r--www/smb2www/Makefile2
-rw-r--r--www/swish++/pkg-plist2
-rw-r--r--www/w3mir/Makefile2
-rw-r--r--www/w3mir/pkg-plist10
-rw-r--r--www/wwwstat/pkg-plist6
-rw-r--r--x11-fm/cfm/Makefile2
-rw-r--r--x11-fonts/p5-Font-AFM/Makefile1
-rw-r--r--x11-fonts/p5-Font-AFM/pkg-plist36
-rw-r--r--x11-fonts/p5-Font-TTF/pkg-plist136
-rw-r--r--x11-toolkits/p5-GdkImlib/Makefile2
-rw-r--r--x11-toolkits/p5-GdkImlib/pkg-plist28
-rw-r--r--x11-toolkits/p5-GdkPixbuf/Makefile2
-rw-r--r--x11-toolkits/p5-GdkPixbuf/pkg-plist34
-rw-r--r--x11-toolkits/p5-Glade/Makefile2
-rw-r--r--x11-toolkits/p5-Glade/pkg-plist32
-rw-r--r--x11-toolkits/p5-Glade2/Makefile2
-rw-r--r--x11-toolkits/p5-Glade2/pkg-plist32
-rw-r--r--x11-toolkits/p5-Gnome/Makefile4
-rw-r--r--x11-toolkits/p5-Gnome/pkg-plist30
-rw-r--r--x11-toolkits/p5-Gtk/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk/pkg-plist94
-rw-r--r--x11-toolkits/p5-GtkXmHTML/Makefile2
-rw-r--r--x11-toolkits/p5-GtkXmHTML/pkg-plist32
-rw-r--r--x11-toolkits/p5-Prima/pkg-plist438
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile3
-rw-r--r--x11-toolkits/p5-Tcl-Tk/pkg-plist12
-rw-r--r--x11-toolkits/p5-TclTk/Makefile3
-rw-r--r--x11-toolkits/p5-TclTk/pkg-plist12
-rw-r--r--x11-toolkits/p5-Tk-Autoscroll/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Autoscroll/pkg-plist10
-rw-r--r--x11-toolkits/p5-Tk-ColourChooser/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-ColourChooser/pkg-plist10
-rw-r--r--x11-toolkits/p5-Tk-Date/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Date/pkg-plist16
-rw-r--r--x11-toolkits/p5-Tk-Enscript/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Enscript/pkg-plist12
-rw-r--r--x11-toolkits/p5-Tk-FileDialog/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-FileDialog/pkg-plist10
-rw-r--r--x11-toolkits/p5-Tk-GBARR/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-GBARR/pkg-plist32
-rw-r--r--x11-toolkits/p5-Tk-Getopt/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Getopt/pkg-plist10
-rw-r--r--x11-toolkits/p5-Tk-HistEntry/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-HistEntry/pkg-plist10
-rw-r--r--x11-toolkits/p5-Tk-TableMatrix/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-TableMatrix/pkg-plist26
-rw-r--r--x11/xkbset/Makefile2
1605 files changed, 9714 insertions, 10255 deletions
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index 752589bf6cee..bd088603b9a9 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Perl module to create, manipulate, read, and write Zip archive files
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Archive::Zip.3 Archive::Zip::Tree.3 Archive::Zip::FAQ.3 Archive::Zip::MemberRead.3
.include <bsd.port.mk>
diff --git a/archivers/p5-Archive-Zip/pkg-plist b/archivers/p5-Archive-Zip/pkg-plist
index d192b3d98baf..1080d230ca4b 100644
--- a/archivers/p5-Archive-Zip/pkg-plist
+++ b/archivers/p5-Archive-Zip/pkg-plist
@@ -1,13 +1,13 @@
bin/crc32
-lib/perl5/site_perl/%%PERL_VER%%/Archive/Zip.pm
-lib/perl5/site_perl/%%PERL_VER%%/Archive/Zip.pod
-lib/perl5/site_perl/%%PERL_VER%%/Archive/Zip/FAQ.pod
-lib/perl5/site_perl/%%PERL_VER%%/Archive/Zip/BufferedFileHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Archive/Zip/MemberRead.pm
-lib/perl5/site_perl/%%PERL_VER%%/Archive/Zip/MockFileHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Archive/Zip/Tree.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Archive/Zip/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Archive/Zip
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Archive 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Archive/Zip
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Archive 2>/dev/null || true
+%%SITE_PERL%%/Archive/Zip.pm
+%%SITE_PERL%%/Archive/Zip.pod
+%%SITE_PERL%%/Archive/Zip/FAQ.pod
+%%SITE_PERL%%/Archive/Zip/BufferedFileHandle.pm
+%%SITE_PERL%%/Archive/Zip/MemberRead.pm
+%%SITE_PERL%%/Archive/Zip/MockFileHandle.pm
+%%SITE_PERL%%/Archive/Zip/Tree.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Zip/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Zip
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Archive/Zip
+@unexec rmdir %D/%%SITE_PERL%%/Archive 2>/dev/null || true
diff --git a/archivers/p5-IO-Zlib/Makefile b/archivers/p5-IO-Zlib/Makefile
index 970a217b8487..8f9bf2eb2ed3 100644
--- a/archivers/p5-IO-Zlib/Makefile
+++ b/archivers/p5-IO-Zlib/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= IO:: style interface to Compress::Zlib
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
PERL_CONFIGURE= yes
MAN3= IO::Zlib.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/archivers/p5-IO-Zlib/pkg-plist b/archivers/p5-IO-Zlib/pkg-plist
index 5e57765c44d8..303474019a5c 100644
--- a/archivers/p5-IO-Zlib/pkg-plist
+++ b/archivers/p5-IO-Zlib/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/IO/Zlib.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Zlib/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Zlib
-@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%%/IO 2>/dev/null || true
+%%SITE_PERL%%/IO/Zlib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Zlib/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Zlib
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
diff --git a/archivers/p5-Mac-Macbinary/Makefile b/archivers/p5-Mac-Macbinary/Makefile
index abd52284841d..8c4b6e6ba09f 100644
--- a/archivers/p5-Mac-Macbinary/Makefile
+++ b/archivers/p5-Mac-Macbinary/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module that can extract info from Macbinary files
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mac::Macbinary.3
.include <bsd.port.mk>
diff --git a/archivers/p5-Mac-Macbinary/pkg-plist b/archivers/p5-Mac-Macbinary/pkg-plist
index 004d937699bf..45add263b9de 100644
--- a/archivers/p5-Mac-Macbinary/pkg-plist
+++ b/archivers/p5-Mac-Macbinary/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mac/Macbinary.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac/Macbinary/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac/Macbinary
-@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 2>/dev/null || true
+%%SITE_PERL%%/Mac/Macbinary.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/Macbinary/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/Macbinary
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mac 2>/dev/null || true
diff --git a/astro/p5-Astro-MoonPhase/Makefile b/astro/p5-Astro-MoonPhase/Makefile
index fa818ed9d992..9581faaec46b 100644
--- a/astro/p5-Astro-MoonPhase/Makefile
+++ b/astro/p5-Astro-MoonPhase/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl interface to calculate information about the phase of the moon
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Astro::MoonPhase.3
.include <bsd.port.mk>
diff --git a/astro/p5-Astro-MoonPhase/pkg-plist b/astro/p5-Astro-MoonPhase/pkg-plist
index 2a8617dd12c2..29b4210e6bd1 100644
--- a/astro/p5-Astro-MoonPhase/pkg-plist
+++ b/astro/p5-Astro-MoonPhase/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Astro/MoonPhase.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/MoonPhase/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/MoonPhase
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Astro 2>/dev/null || true
+%%SITE_PERL%%/Astro/MoonPhase.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/MoonPhase/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/MoonPhase
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
diff --git a/astro/p5-Astro-SunTime/pkg-plist b/astro/p5-Astro-SunTime/pkg-plist
index a39f9c59c315..39cbd9c6aa2b 100644
--- a/astro/p5-Astro-SunTime/pkg-plist
+++ b/astro/p5-Astro-SunTime/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Astro/SunTime.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/SunTime/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/SunTime
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Astro 2>/dev/null || true
+%%SITE_PERL%%/Astro/SunTime.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
diff --git a/astro/p5-Astro-Sunrise/pkg-plist b/astro/p5-Astro-Sunrise/pkg-plist
index 0244a34da07a..86532a053696 100644
--- a/astro/p5-Astro-Sunrise/pkg-plist
+++ b/astro/p5-Astro-Sunrise/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/Sunrise/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Astro/Sunrise.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/Sunrise
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Astro 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Sunrise/.packlist
+%%SITE_PERL%%/Astro/Sunrise.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Sunrise
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
diff --git a/astro/p5-GPS/Makefile b/astro/p5-GPS/Makefile
index 50c28501d320..36a37eef8731 100644
--- a/astro/p5-GPS/Makefile
+++ b/astro/p5-GPS/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl interface to GPS receivers
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GPS::Garmin.3 \
GPS::Serial.3 \
GPS::Garmin::Handler.3
diff --git a/astro/p5-GPS/pkg-plist b/astro/p5-GPS/pkg-plist
index be5c71bd0a13..515cdec0f0cd 100644
--- a/astro/p5-GPS/pkg-plist
+++ b/astro/p5-GPS/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GPS/Garmin/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/GPS/Garmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/GPS/Garmin/Constant.pm
-lib/perl5/site_perl/%%PERL_VER%%/GPS/Garmin/Handler.pm
-lib/perl5/site_perl/%%PERL_VER%%/GPS/Serial.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Garmin/Handler/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Garmin/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Serial/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/GPS/Garmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Garmin/Handler
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Garmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Serial
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GPS/Garmin
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GPS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/GPS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/GPS 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/Garmin/.packlist
+%%SITE_PERL%%/GPS/Garmin.pm
+%%SITE_PERL%%/GPS/Garmin/Constant.pm
+%%SITE_PERL%%/GPS/Garmin/Handler.pm
+%%SITE_PERL%%/GPS/Serial.pm
+%%SITE_PERL%%/auto/GPS/Garmin/Handler/autosplit.ix
+%%SITE_PERL%%/auto/GPS/Garmin/autosplit.ix
+%%SITE_PERL%%/auto/GPS/Serial/autosplit.ix
+@dirrm %%SITE_PERL%%/GPS/Garmin
+@dirrm %%SITE_PERL%%/auto/GPS/Garmin/Handler
+@dirrm %%SITE_PERL%%/auto/GPS/Garmin
+@dirrm %%SITE_PERL%%/auto/GPS/Serial
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/Garmin
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/GPS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/GPS 2>/dev/null || true
diff --git a/astro/p5-Geo-METAR/Makefile b/astro/p5-Geo-METAR/Makefile
index 16f85b041f5d..9510cbc4fdab 100644
--- a/astro/p5-Geo-METAR/Makefile
+++ b/astro/p5-Geo-METAR/Makefile
@@ -17,7 +17,6 @@ COMMENT= A perl module that processes METAR information from NOAA sources
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Geo::METAR.3
.include <bsd.port.mk>
diff --git a/astro/p5-Geo-METAR/pkg-plist b/astro/p5-Geo-METAR/pkg-plist
index 7a78be3aa439..711bdd4759e8 100644
--- a/astro/p5-Geo-METAR/pkg-plist
+++ b/astro/p5-Geo-METAR/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Geo/METAR.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/METAR/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/METAR
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Geo 2>/dev/null || true
+%%SITE_PERL%%/Geo/METAR.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Geo 2>/dev/null || true
diff --git a/astro/p5-SETI-Stats/Makefile b/astro/p5-SETI-Stats/Makefile
index 5e71b1018c56..cf18e6160d15 100644
--- a/astro/p5-SETI-Stats/Makefile
+++ b/astro/p5-SETI-Stats/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module for local/remote access to SETI@home stats
PERL_CONFIGURE= yes
MAN3= SETI::Stats.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/astro/p5-SETI-Stats/pkg-plist b/astro/p5-SETI-Stats/pkg-plist
index c8187318ebe9..0758e730e3ec 100644
--- a/astro/p5-SETI-Stats/pkg-plist
+++ b/astro/p5-SETI-Stats/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/SETI/Stats.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SETI-Stats/.packlist
+%%SITE_PERL%%/SETI/Stats.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SETI-Stats/.packlist
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SETI-Stats
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SETI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SETI-Stats
+@dirrm %%SITE_PERL%%/SETI
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist
index 206ae8b6c5db..9a2036e2e9fe 100644
--- a/audio/gnump3d/pkg-plist
+++ b/audio/gnump3d/pkg-plist
@@ -7,29 +7,29 @@ bin/gnump3d2
etc/gnump3d/gnump3d.conf-default
@exec [ -f %B/gnump3d.conf ] || cp %B/%f %B/gnump3d.conf
etc/gnump3d/mime.types
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/IP.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/base64.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/config.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/files.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/mp3info.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/ogginfo.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/oggtagreader.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/lang/en.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/lang/lookup.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/playlist.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/COPYING.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/bug.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/info.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/now.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/playlist.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/prefs.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/random.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/recent.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/search.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/size.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/stats.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/tagcache.pm
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/url.pm
+%%SITE_PERL%%/gnump3d/IP.pm
+%%SITE_PERL%%/gnump3d/base64.pm
+%%SITE_PERL%%/gnump3d/config.pm
+%%SITE_PERL%%/gnump3d/files.pm
+%%SITE_PERL%%/gnump3d/mp3info.pm
+%%SITE_PERL%%/gnump3d/ogginfo.pm
+%%SITE_PERL%%/gnump3d/oggtagreader.pm
+%%SITE_PERL%%/gnump3d/lang/en.pm
+%%SITE_PERL%%/gnump3d/lang/lookup.pm
+%%SITE_PERL%%/gnump3d/playlist.pm
+%%SITE_PERL%%/gnump3d/plugins/COPYING.pm
+%%SITE_PERL%%/gnump3d/plugins/bug.pm
+%%SITE_PERL%%/gnump3d/plugins/info.pm
+%%SITE_PERL%%/gnump3d/plugins/now.pm
+%%SITE_PERL%%/gnump3d/plugins/playlist.pm
+%%SITE_PERL%%/gnump3d/plugins/prefs.pm
+%%SITE_PERL%%/gnump3d/plugins/random.pm
+%%SITE_PERL%%/gnump3d/plugins/recent.pm
+%%SITE_PERL%%/gnump3d/plugins/search.pm
+%%SITE_PERL%%/gnump3d/plugins/size.pm
+%%SITE_PERL%%/gnump3d/plugins/stats.pm
+%%SITE_PERL%%/gnump3d/tagcache.pm
+%%SITE_PERL%%/gnump3d/url.pm
%%DATADIR%%/Clean/AUTHOR
%%DATADIR%%/Clean/COPYING.html
%%DATADIR%%/Clean/bug.html
@@ -224,9 +224,9 @@ lib/perl5/site_perl/%%PERL_VER%%/gnump3d/url.pm
@dirrm %%DATADIR%%/LaFrere
@dirrm %%DATADIR%%/Clean
@dirrm %%DATADIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/gnump3d/lang
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/gnump3d
+@dirrm %%SITE_PERL%%/gnump3d/plugins
+@dirrm %%SITE_PERL%%/gnump3d/lang
+@dirrm %%SITE_PERL%%/gnump3d
@unexec rmdir %D/etc/gnump3d 2>/dev/null || true
@unexec rmdir /var/log/gnump3d 2>/dev/null || true
@exec mkdir -p /var/log/gnump3d
diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index 9fb256e0aab4..e9e2a74a3883 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= gnupod
MAINTAINER= david@dyn-ns.net
COMMENT= A set of Perl scripts for using an Apple iPod
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Getopt/Mixed.pm:${PORTSDIR}/devel/p5-Getopt-Mixed \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS= ${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
+ ${SITE_PERL}/Getopt/Mixed.pm:${PORTSDIR}/devel/p5-Getopt-Mixed \
+ ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
INFO= gnupod
diff --git a/audio/gnupod/pkg-plist b/audio/gnupod/pkg-plist
index 3dcfe0487582..b59340183837 100644
--- a/audio/gnupod/pkg-plist
+++ b/audio/gnupod/pkg-plist
@@ -8,7 +8,7 @@ bin/gnupod_renumber.pl
bin/gnupod_search.pl
bin/mktunes.pl
bin/tunes2pod.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/iPod.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/iPod.pm
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/gnutunesdb.example
%%PORTDOCS%%%%DOCSDIR%%/gnupod.html
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index 4505582e0437..d6cb1b9beb9e 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -17,8 +17,8 @@ COMMENT= Convert MP3 files to Ogg Vorbis files
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 \
oggenc:${PORTSDIR}/audio/vorbis-tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
+ ${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
+ ${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
USE_PERL5= yes
NO_WRKSUBDIR= yes
diff --git a/audio/mp3mover/Makefile b/audio/mp3mover/Makefile
index addd501abfe8..acd41d8ec68e 100644
--- a/audio/mp3mover/Makefile
+++ b/audio/mp3mover/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.doc.ic.ac.uk/~jsm00/scripts/
MAINTAINER= ports@FreeBSD.org
COMMENT= Rename mp3s and manipulate them
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MP3/Tag.pm:${PORTSDIR}/audio/p5-tagged
+RUN_DEPENDS= ${SITE_PERL}/MP3/Tag.pm:${PORTSDIR}/audio/p5-tagged
USE_PERL5= yes
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index e455186e1579..9792f0e8868d 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -23,6 +23,5 @@ CONFIGURE_ARGS= INC="-I${LOCALBASE}/include " \
LIBS="-L${LOCALBASE}/lib -lcdaudio"
MAN3= Audio::CD.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/audio/p5-Audio-CD/pkg-plist b/audio/p5-Audio-CD/pkg-plist
index c8f74cab5ebd..4a1f39b1c319 100644
--- a/audio/p5-Audio-CD/pkg-plist
+++ b/audio/p5-Audio-CD/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Audio/CD.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Audio/CD/CD.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Audio/CD/CD.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Audio/CD/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Audio/CD
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Audio 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Audio 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Audio/CD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/CD.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/CD.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Audio 2>/dev/null || true
diff --git a/audio/p5-Audio-Wav/pkg-plist b/audio/p5-Audio-Wav/pkg-plist
index 76c3489d6488..80e2d90c8f6c 100644
--- a/audio/p5-Audio-Wav/pkg-plist
+++ b/audio/p5-Audio-Wav/pkg-plist
@@ -1,12 +1,12 @@
@comment $FreeBSD$
-lib/perl5/site_perl/%%PERL_VER%%/Audio/Wav.pm
-lib/perl5/site_perl/%%PERL_VER%%/Audio/Wav/Write.pm
-lib/perl5/site_perl/%%PERL_VER%%/Audio/Wav/Write/Header.pm
-lib/perl5/site_perl/%%PERL_VER%%/Audio/Wav/Read.pm
-lib/perl5/site_perl/%%PERL_VER%%/Audio/Wav/Tools.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Audio/Wav/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Audio/Wav/Write
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Audio/Wav
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Audio/Wav
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Audio 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Audio 2>/dev/null || true
+%%SITE_PERL%%/Audio/Wav.pm
+%%SITE_PERL%%/Audio/Wav/Write.pm
+%%SITE_PERL%%/Audio/Wav/Write/Header.pm
+%%SITE_PERL%%/Audio/Wav/Read.pm
+%%SITE_PERL%%/Audio/Wav/Tools.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Wav/.packlist
+@dirrm %%SITE_PERL%%/Audio/Wav/Write
+@dirrm %%SITE_PERL%%/Audio/Wav
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Wav
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Audio 2>/dev/null || true
diff --git a/audio/p5-CDDB-File/Makefile b/audio/p5-CDDB-File/Makefile
index 4649eb0d7066..c3df21d45ece 100644
--- a/audio/p5-CDDB-File/Makefile
+++ b/audio/p5-CDDB-File/Makefile
@@ -23,7 +23,7 @@ MAN3= CDDB::File.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/audio/p5-CDDB-File/pkg-plist b/audio/p5-CDDB-File/pkg-plist
index 0dedb6e513af..8c18d0f774cb 100644
--- a/audio/p5-CDDB-File/pkg-plist
+++ b/audio/p5-CDDB-File/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/CDDB/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CDDB/File/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CDDB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CDDB/File
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CDDB 2>/dev/null || true
+%%SITE_PERL%%/CDDB/File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB/File/.packlist
+@dirrm %%SITE_PERL%%/CDDB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB/File
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB 2>/dev/null || true
diff --git a/audio/p5-MP3-ID3v1Tag/Makefile b/audio/p5-MP3-ID3v1Tag/Makefile
index 96e399bdbbfe..dc9a8e585301 100644
--- a/audio/p5-MP3-ID3v1Tag/Makefile
+++ b/audio/p5-MP3-ID3v1Tag/Makefile
@@ -18,6 +18,5 @@ COMMENT= Edit ID3v1 Tags from an Audio MPEG Layer 3
PERL_CONFIGURE= yes
MAN3= MP3::ID3v1Tag.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/audio/p5-MP3-ID3v1Tag/pkg-plist b/audio/p5-MP3-ID3v1Tag/pkg-plist
index 045d6c901ae4..a7049fcc1e08 100644
--- a/audio/p5-MP3-ID3v1Tag/pkg-plist
+++ b/audio/p5-MP3-ID3v1Tag/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/MP3/ID3v1Tag.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MP3 2>/dev/null || true
+%%SITE_PERL%%/MP3/ID3v1Tag.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true
diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile
index 53748f749567..c3b730b59fe9 100644
--- a/audio/p5-MP3-Info/Makefile
+++ b/audio/p5-MP3-Info/Makefile
@@ -21,6 +21,5 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= MP3::Info.3 MPEG::MP3Info.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/audio/p5-MP3-Info/pkg-plist b/audio/p5-MP3-Info/pkg-plist
index c329e2ab8858..63928eebea6d 100644
--- a/audio/p5-MP3-Info/pkg-plist
+++ b/audio/p5-MP3-Info/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/MP3/Info.pm
-lib/perl5/site_perl/%%PERL_VER%%/MPEG/MP3Info.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/Info/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/Info
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MPEG 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MP3 2>/dev/null || true
+%%SITE_PERL%%/MP3/Info.pm
+%%SITE_PERL%%/MPEG/MP3Info.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Info/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Info
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/MPEG 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true
diff --git a/audio/p5-MusicBrainz-Client/Makefile b/audio/p5-MusicBrainz-Client/Makefile
index 70b7141a4258..46ca3c86cc8b 100644
--- a/audio/p5-MusicBrainz-Client/Makefile
+++ b/audio/p5-MusicBrainz-Client/Makefile
@@ -23,7 +23,6 @@ LIBMUSICBRAINZ_PORTDIR= ${PORTSDIR}/audio/libmusicbrainz
PERL_CONFIGURE= yes
MAN3= MusicBrainz::Client.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/audio/p5-MusicBrainz-Queries/Makefile b/audio/p5-MusicBrainz-Queries/Makefile
index 3b3c86237cb3..e6d42f070a39 100644
--- a/audio/p5-MusicBrainz-Queries/Makefile
+++ b/audio/p5-MusicBrainz-Queries/Makefile
@@ -23,7 +23,6 @@ LIBMUSICBRAINZ_PORTDIR= ${PORTSDIR}/audio/libmusicbrainz
PERL_CONFIGURE= yes
MAN3= MusicBrainz::Queries.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/audio/p5-MusicBrainz-TRM/Makefile b/audio/p5-MusicBrainz-TRM/Makefile
index cc7fab9dcdf8..28387c47ec11 100644
--- a/audio/p5-MusicBrainz-TRM/Makefile
+++ b/audio/p5-MusicBrainz-TRM/Makefile
@@ -23,7 +23,6 @@ LIBMUSICBRAINZ_PORTDIR= ${PORTSDIR}/audio/libmusicbrainz
PERL_CONFIGURE= yes
MAN3= MusicBrainz::TRM.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/audio/p5-Shout/Makefile b/audio/p5-Shout/Makefile
index abdd7307d940..815e34626b32 100644
--- a/audio/p5-Shout/Makefile
+++ b/audio/p5-Shout/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= shout.2:${PORTSDIR}/audio/libshout
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Shout.3
pre-configure:
diff --git a/audio/p5-Shout/pkg-plist b/audio/p5-Shout/pkg-plist
index acbfaf590bc1..6cd363eec318 100644
--- a/audio/p5-Shout/pkg-plist
+++ b/audio/p5-Shout/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Shout.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shout/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shout/Shout.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shout/Shout.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shout/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/Shout.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout/Shout.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout/Shout.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout/autosplit.ix
%%PORTDOCS%%share/examples/p5-Shout/example.pl
%%PORTDOCS%%share/examples/p5-Shout/example2.pl
%%PORTDOCS%%@dirrm share/examples/p5-Shout
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shout
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PER_ARCH%%/auto/Shout 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout
+@unexec rmdir %D/%%SITE_PERL%%/%%PER_ARCH%%/auto/Shout 2>/dev/null || true
diff --git a/audio/p5-Xmms/Makefile b/audio/p5-Xmms/Makefile
index 955af1af9ec2..c82729c5e93b 100644
--- a/audio/p5-Xmms/Makefile
+++ b/audio/p5-Xmms/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms \
${site_perl}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor \
${site_perl}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-ReadLine-Perl
-site_perl= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+site_perl= ${SITE_PERL}
PERL_CONFIGURE= YES
@@ -28,6 +28,5 @@ MAN3= Xmms::Remote.3 \
Xmms::SongChange.3 \
Xmms.3 \
Bundle::Xmms.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/audio/p5-Xmms/pkg-plist b/audio/p5-Xmms/pkg-plist
index 7455bdeb5eee..5d7d23024fd9 100644
--- a/audio/p5-Xmms/pkg-plist
+++ b/audio/p5-Xmms/pkg-plist
@@ -1,20 +1,20 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Xmms.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms/ExtUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms/Remote.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms/SongChange.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms-Perl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Config/Config.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Config/Config.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Remote/Remote.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Remote/Remote.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/SongChange/SongChange.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/SongChange/SongChange.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Config
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Remote
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/SongChange
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms-Perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms
+%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Xmms.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms/Config.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms/ExtUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms/Remote.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms/SongChange.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms-Perl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Config/Config.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Config/Config.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Remote/Remote.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Remote/Remote.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/SongChange/SongChange.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/SongChange/SongChange.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Config
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Remote
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/SongChange
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms-Perl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xmms
diff --git a/audio/p5-libvorbis/pkg-plist b/audio/p5-libvorbis/pkg-plist
index edb91b517881..51698c0a07cd 100644
--- a/audio/p5-libvorbis/pkg-plist
+++ b/audio/p5-libvorbis/pkg-plist
@@ -1,9 +1,9 @@
@comment $FreeBSD$
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ogg/Vorbis.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Vorbis.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Vorbis.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ogg
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ogg/Vorbis
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ogg
+%%SITE_PERL%%/%%PERL_ARCH%%/Ogg/Vorbis.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Vorbis.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Vorbis.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Ogg
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg
diff --git a/audio/p5-tagged/Makefile b/audio/p5-tagged/Makefile
index e336b6298b92..8ca8de01bed3 100644
--- a/audio/p5-tagged/Makefile
+++ b/audio/p5-tagged/Makefile
@@ -17,12 +17,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Read, change and write different tags of MP3 audio files
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= MP3::Tag::ID3v2.3 MP3::Tag.3 MP3::Tag::File.3 \
MP3::Tag::ID3v2-Data.3 MP3::Tag::ID3v1.3
diff --git a/audio/p5-tagged/pkg-plist b/audio/p5-tagged/pkg-plist
index 540509ef84e5..54e17a922ec3 100644
--- a/audio/p5-tagged/pkg-plist
+++ b/audio/p5-tagged/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/MP3/Tag.pm
-lib/perl5/site_perl/%%PERL_VER%%/MP3/Tag/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/MP3/Tag/ID3v1.pm
-lib/perl5/site_perl/%%PERL_VER%%/MP3/Tag/ID3v2.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/Tag/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/Tag
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MP3/Tag 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MP3 2>/dev/null || true
+%%SITE_PERL%%/MP3/Tag.pm
+%%SITE_PERL%%/MP3/Tag/File.pm
+%%SITE_PERL%%/MP3/Tag/ID3v1.pm
+%%SITE_PERL%%/MP3/Tag/ID3v2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/MP3/Tag 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true
diff --git a/audio/ripit/Makefile b/audio/ripit/Makefile
index 10456be9756a..77d72824c67d 100644
--- a/audio/ripit/Makefile
+++ b/audio/ripit/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= oyvindmo@initio.no
COMMENT= A perl-script frontend for encoding audio CDs to MP3 files
# See pkg-message about other dependencies.
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/CDDB_get.pm:${PORTSDIR}/audio/p5-CDDB_get
+RUN_DEPENDS= ${SITE_PERL}/CDDB_get.pm:${PORTSDIR}/audio/p5-CDDB_get
RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame
RUN_DEPENDS+= dagrab:${PORTSDIR}/audio/dagrab
diff --git a/biology/p5-AcePerl/Makefile b/biology/p5-AcePerl/Makefile
index 9726a4b282f1..dd13799ea239 100644
--- a/biology/p5-AcePerl/Makefile
+++ b/biology/p5-AcePerl/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= philip@p6m7g8.com
COMMENT= Perl5 interface to the ACEDB genome database system
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -39,7 +39,6 @@ MAN3= Ace.3 Ace::Browser::AceSubs.3 Ace::Browser::SearchSubs.3 \
Ace::Sequence::GappedAlignment.3 Ace::Sequence::Gene.3 \
Ace::Sequence::Homol.3 Ace::Sequence::Multi.3 \
Ace::Sequence::Transcript.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
@ ${SED} -e 's|XX__CC__XX|${CC}|' < ${FILESDIR}/FREEBSD_DEF \
diff --git a/biology/p5-AcePerl/pkg-plist b/biology/p5-AcePerl/pkg-plist
index acf0566bc863..e37eb6b70a06 100644
--- a/biology/p5-AcePerl/pkg-plist
+++ b/biology/p5-AcePerl/pkg-plist
@@ -1,121 +1,121 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Browser/AceSubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Browser/GeneSubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Browser/SearchSubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Browser/SiteDefs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Browser/TreeSubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Freesubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Fk.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/anchored_arrow.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/arrow.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/box.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/crossbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/dot.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/ex.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/graded_segments.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/group.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/line.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/primers.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/segments.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/span.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/toomany.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/transcript.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/triangle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/GlyphFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Panel.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Track.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Iterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Local.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Object/Wormbase.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/RPC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence/Feature.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence/FeatureList.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence/GappedAlignment.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence/Gene.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence/Homol.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence/Multi.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence/Transcript.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/SocketServer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/AceSubs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/GeneSubs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/SearchSubs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/SiteDefs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/TreeSubs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Freesubs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Fk.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/anchored_arrow.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/arrow.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/box.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/crossbox.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/dot.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/ex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/graded_segments.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/group.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/line.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/primers.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/segments.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/span.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/toomany.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/transcript.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph/triangle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/GlyphFactory.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Panel.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Track.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Iterator.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Local.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Model.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Object.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Object/Wormbase.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/RPC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Feature.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/FeatureList.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/GappedAlignment.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Gene.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Homol.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Multi.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence/Transcript.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Ace/SocketServer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/GFF/Filehandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Freesubs/Freesubs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Freesubs/Freesubs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/_asAce.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/_asHTML.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/_asTable.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/_asXML.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/_default_makeHTML.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/_insert.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/_special_dump.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/_to_ace_date.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/add_row.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/add_tree.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/asAce.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/asDNA.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/asGif.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/asHTML.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/asPeptide.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/asString.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/asTable.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/asXML.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/comment.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/commit.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/date_style.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/debug.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/delete.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/escapeXML.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/isComment.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/kill.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/replace.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/rollback.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/tags.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object/timestamp.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/RPC/RPC.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/RPC/RPC.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Sequence/Feature/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Sequence/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/_register_iterator.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/_restore_iterator.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/_save_iterator.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/_unregister_iterator.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/auto_save.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/class_count.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/classes.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/count.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/date.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/date_style.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/datetime.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/fetch_many.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/find.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/freeprotect.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/grep.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/layout.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/parse.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/parse_file.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/parse_longtext.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/pick.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/ping.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/put.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/split.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/status.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/timestamps.al
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Sequence/Feature
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Sequence
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/RPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Object
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace/Freesubs
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ace
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GFF
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Sequence
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Object
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics/Glyph
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Graphics
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace/Browser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ace
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Freesubs/Freesubs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Freesubs/Freesubs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_asAce.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_asHTML.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_asTable.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_asXML.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_default_makeHTML.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_insert.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_special_dump.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_to_ace_date.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/add_row.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/add_tree.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asAce.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asDNA.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asGif.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asHTML.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asPeptide.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asString.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asTable.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asXML.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/comment.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/commit.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/date_style.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/debug.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/delete.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/escapeXML.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/isComment.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/kill.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/replace.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/rollback.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/tags.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/timestamp.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/RPC/RPC.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/RPC/RPC.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Sequence/Feature/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Sequence/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/_register_iterator.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/_restore_iterator.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/_save_iterator.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/_unregister_iterator.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/auto_save.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/class_count.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/classes.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/count.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/date.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/date_style.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/datetime.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/fetch_many.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/find.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/freeprotect.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/grep.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/layout.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/parse.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/parse_file.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/parse_longtext.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/pick.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/ping.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/put.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/split.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/status.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/timestamps.al
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Sequence/Feature
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Sequence
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/RPC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Freesubs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GFF
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Ace/Sequence
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Ace/Object
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics/Glyph
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Ace/Graphics
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Ace
diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile
index 28ae5758aaf0..af0afeccb335 100644
--- a/biology/p5-bioperl/Makefile
+++ b/biology/p5-bioperl/Makefile
@@ -20,16 +20,16 @@ COMMENT= A collection of Perl modules for bioinformatics
# These are all run-time dependencies, but listing them in ${BUILD_DEPENDS}
# prevents a flood of build-time warnings.
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Ace.pm:${PORTSDIR}/biology/p5-AcePerl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/Request/Common.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Node.pm:${PORTSDIR}/textproc/p5-XML-Node \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Ace.pm:${PORTSDIR}/biology/p5-AcePerl \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+ ${SITE_PERL}/HTTP/Request/Common.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
+ ${SITE_PERL}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \
+ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/XML/Node.pm:${PORTSDIR}/textproc/p5-XML-Node \
+ ${SITE_PERL}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml \
+ ${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
@@ -47,12 +47,12 @@ DISTFILES+= bioperl-ext-${EXT_VERSION}${EXTRACT_SUFX}
EXT_WRKSRC= ${WRKDIR}/bioperl-ext-06/Bio/Ext/Align
.if defined(WITH_CORBA_CLIENT)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/CORBA/ORBit.pm:${PORTSDIR}/devel/p5-ORBit
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/CORBA/ORBit.pm:${PORTSDIR}/devel/p5-ORBit
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/CORBA/ORBit.pm:${PORTSDIR}/devel/p5-ORBit
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/CORBA/ORBit.pm:${PORTSDIR}/devel/p5-ORBit
.endif
.if defined(WITH_CORBA_SERVER)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/CORBA/ORBit.pm:${PORTSDIR}/devel/p5-ORBit
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/CORBA/ORBit.pm:${PORTSDIR}/devel/p5-ORBit
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/CORBA/ORBit.pm:${PORTSDIR}/devel/p5-ORBit
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/CORBA/ORBit.pm:${PORTSDIR}/devel/p5-ORBit
.endif
.if defined(WITH_GUI)
RUN_DEPENDS+= ptksh:${PORTSDIR}/x11-toolkits/p5-Tk
@@ -171,7 +171,6 @@ MAN3+= Bio::CorbaServer::BioEnv.3 Bio::CorbaServer::AnonymousSeq.3 \
.if defined(WITH_GUI)
MAN3+= Bio::Tk::HitDisplay.3 Bio::Tk::SeqCanvas.3
.endif
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-fetch:
.if !defined(BATCH) && (!defined(WITH_CORBA_CLIENT) || \
diff --git a/biology/p5-bioperl/pkg-plist b/biology/p5-bioperl/pkg-plist
index ad038a26dacf..29c40be66b26 100644
--- a/biology/p5-bioperl/pkg-plist
+++ b/biology/p5-bioperl/pkg-plist
@@ -1,250 +1,250 @@
-%%PLIST_CORBA_CLIENT%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaClient/Base.pm
-%%PLIST_CORBA_CLIENT%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaClient/Client.pm
-%%PLIST_CORBA_CLIENT%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaClient/ORB.pm
-%%PLIST_CORBA_CLIENT%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaClient/PrimarySeq.pm
-%%PLIST_CORBA_CLIENT%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaClient/Seq.pm
-%%PLIST_CORBA_CLIENT%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaClient/SeqFeature.pm
-%%PLIST_CORBA_CLIENT%%lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/Biocorba.pm
-%%PLIST_CORBA_CLIENT%%lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/biocorba.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/AnonymousSeq.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/Base.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/BioEnv.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/PrimarySeq.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/PrimarySeqDB.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/PrimarySeqIterator.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/PrimarySeqVector.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/Seq.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/SeqDB.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/SeqFeature.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/SeqFeatureIterator.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/SeqFeatureVector.pm
-%%PLIST_CORBA_SERVER%%lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer/Server.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/AnnotMap.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/BioTkPerl8_1.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/GO_Browser.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/HitDisplay.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/README
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/SeqCanvas.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/Tkpsh.pl
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/bioTk_Map.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/bioTk_SeqSubs.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/bioTk_Sequence.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk/bioTk_Utilities.pm
-%%PLIST_GUI%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio/Tk/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bio/Ext/Align.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio/Ext/Align/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio/Ext/Align/Align.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio/Ext/Align/Align.so
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/bl2seq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/clustalw.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/fasta.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/mase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/msf.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/pfam.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/prodom.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/selex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO/stockholm.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Annotation.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Annotation/Comment.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Annotation/DBLink.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Annotation/Reference.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/Ace.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/GDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/GenBank.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/GenPept.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/NCBIHelper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/RandomAccessI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/SeqI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/SwissProt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/UpdateableSeqI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DB/WebDBSeqI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/DBLinkContainerI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Factory/DriverFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Factory/SeqAnalysisParserFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Factory/SeqAnalysisParserFactoryI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Index/Abstract.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Index/AbstractSeq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Index/EMBL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Index/Fasta.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Index/GenBank.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Index/SwissPfam.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Index/Swissprot.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/AARange.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Chain.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/ChainI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/DNA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Exon.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Gene.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/IO/BioPerl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/IO/Loader.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/IO/SRS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Intron.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Mutation.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Mutator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Prim_Transcript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Range.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Repeat_Region.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Repeat_Unit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/SeqI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Transcript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/Translation.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LocatableSeq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/AvWithinCoordPolicy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/CoordinatePolicyI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/Fuzzy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/FuzzyLocationI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/NarrowestCoordPolicy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/Split.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/SplitLocationI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Location/WidestCoordPolicy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/LocationI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/PrimarySeq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/PrimarySeqI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Range.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/RangeI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/Err.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/Global.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/IO.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/IOManager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/RootI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/Utilities.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/Vector.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Root/Xref.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SearchDist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Seq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Seq/LargePrimarySeq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Seq/LargeSeq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Seq/RichSeq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Seq/RichSeqI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqAnalysisParserI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/FeaturePair.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Gene/Exon.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Gene/ExonI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Gene/GeneStructure.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Gene/GeneStructureI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Gene/Transcript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Gene/TranscriptI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Similarity.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/SimilarityPair.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeatureI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/FTHelper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/MultiFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/ace.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/embl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/fasta.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/game.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/game/featureHandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/game/idHandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/game/seqHandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/gcg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/genbank.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/largefasta.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/raw.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/scf.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/swiss.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/SimpleAlign.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Species.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/AlignFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/AnalysisResult.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/BPbl2seq.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/BPlite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/BPlite/HSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/BPlite/Iteration.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/BPlite/Sbjct.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/BPpsilite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/CHANGES
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/HSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/README
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/Run/LocalBlast.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/Run/Makefile.PL
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/Run/Webblast.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/Run/postclient.pl
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/Sbjct.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/CodonTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/ESTScan.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Fasta.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/GFF.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Genscan.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/HMMER/Domain.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/HMMER/Results.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/HMMER/Set.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/IUPAC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/MZEF.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/OddCodes.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Prediction/Exon.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Prediction/Gene.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/RestrictionEnzyme.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Run/Alignment/Clustalw.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Run/Alignment/TCoffee.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Run/StandAloneBlast.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/SeqAnal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/SeqPattern.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/SeqStats.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/SeqWords.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Sigcleave.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Sim4/Exon.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Sim4/Results.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/WWW.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/pSW.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/UnivAln.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/AAChange.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/AAReverseMutate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/Allele.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/DNAMutation.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/IO.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/IO/flat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/IO/xml.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/README
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/RNAChange.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/SeqDiff.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/VariantI.pm
-lib/perl5/site_perl/%%PERL_VER%%/bioback.pod
-lib/perl5/site_perl/%%PERL_VER%%/biodesign.pod
-lib/perl5/site_perl/%%PERL_VER%%/bioperl.pod
-lib/perl5/site_perl/%%PERL_VER%%/biostart.pod
-lib/perl5/site_perl/%%PERL_VER%%/bptutorial.pl
-%%PLIST_GUI%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio/Tk
-%%PLIST_GUI%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tk
-%%PLIST_CORBA_SERVER%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaServer
-%%PLIST_CORBA_CLIENT%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/CorbaClient
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation/IO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Variation
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Sim4
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Run/Alignment
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Run
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Prediction
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/HMMER
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast/Run
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/Blast
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools/BPlite
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Tools
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO/game
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqIO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature/Gene
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/SeqFeature
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Seq
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Root
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Location
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq/IO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/LiveSeq
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Index
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Factory
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/DB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/Annotation
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio/AlignIO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bio
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio/Ext/Align
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio/Ext
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bio
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bio/Ext
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bio
+%%PLIST_CORBA_CLIENT%%%%SITE_PERL%%/Bio/CorbaClient/Base.pm
+%%PLIST_CORBA_CLIENT%%%%SITE_PERL%%/Bio/CorbaClient/Client.pm
+%%PLIST_CORBA_CLIENT%%%%SITE_PERL%%/Bio/CorbaClient/ORB.pm
+%%PLIST_CORBA_CLIENT%%%%SITE_PERL%%/Bio/CorbaClient/PrimarySeq.pm
+%%PLIST_CORBA_CLIENT%%%%SITE_PERL%%/Bio/CorbaClient/Seq.pm
+%%PLIST_CORBA_CLIENT%%%%SITE_PERL%%/Bio/CorbaClient/SeqFeature.pm
+%%PLIST_CORBA_CLIENT%%%%SITE_PERL%%/Bio/DB/Biocorba.pm
+%%PLIST_CORBA_CLIENT%%%%SITE_PERL%%/Bio/SeqIO/biocorba.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/AnonymousSeq.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/Base.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/BioEnv.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/PrimarySeq.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/PrimarySeqDB.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/PrimarySeqIterator.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/PrimarySeqVector.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/Seq.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/SeqDB.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/SeqFeature.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/SeqFeatureIterator.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/SeqFeatureVector.pm
+%%PLIST_CORBA_SERVER%%%%SITE_PERL%%/Bio/CorbaServer/Server.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/AnnotMap.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/BioTkPerl8_1.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/GO_Browser.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/HitDisplay.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/README
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/SeqCanvas.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/Tkpsh.pl
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/bioTk_Map.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/bioTk_SeqSubs.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/bioTk_Sequence.pm
+%%PLIST_GUI%%%%SITE_PERL%%/Bio/Tk/bioTk_Utilities.pm
+%%PLIST_GUI%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Tk/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Bio/Ext/Align.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Ext/Align/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Ext/Align/Align.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Ext/Align/Align.so
+%%SITE_PERL%%/Bio/AlignIO.pm
+%%SITE_PERL%%/Bio/AlignIO/bl2seq.pm
+%%SITE_PERL%%/Bio/AlignIO/clustalw.pm
+%%SITE_PERL%%/Bio/AlignIO/fasta.pm
+%%SITE_PERL%%/Bio/AlignIO/mase.pm
+%%SITE_PERL%%/Bio/AlignIO/msf.pm
+%%SITE_PERL%%/Bio/AlignIO/pfam.pm
+%%SITE_PERL%%/Bio/AlignIO/prodom.pm
+%%SITE_PERL%%/Bio/AlignIO/selex.pm
+%%SITE_PERL%%/Bio/AlignIO/stockholm.pm
+%%SITE_PERL%%/Bio/Annotation.pm
+%%SITE_PERL%%/Bio/Annotation/Comment.pm
+%%SITE_PERL%%/Bio/Annotation/DBLink.pm
+%%SITE_PERL%%/Bio/Annotation/Reference.pm
+%%SITE_PERL%%/Bio/DB/Ace.pm
+%%SITE_PERL%%/Bio/DB/GDB.pm
+%%SITE_PERL%%/Bio/DB/GenBank.pm
+%%SITE_PERL%%/Bio/DB/GenPept.pm
+%%SITE_PERL%%/Bio/DB/NCBIHelper.pm
+%%SITE_PERL%%/Bio/DB/RandomAccessI.pm
+%%SITE_PERL%%/Bio/DB/SeqI.pm
+%%SITE_PERL%%/Bio/DB/SwissProt.pm
+%%SITE_PERL%%/Bio/DB/UpdateableSeqI.pm
+%%SITE_PERL%%/Bio/DB/WebDBSeqI.pm
+%%SITE_PERL%%/Bio/DBLinkContainerI.pm
+%%SITE_PERL%%/Bio/Factory/DriverFactory.pm
+%%SITE_PERL%%/Bio/Factory/SeqAnalysisParserFactory.pm
+%%SITE_PERL%%/Bio/Factory/SeqAnalysisParserFactoryI.pm
+%%SITE_PERL%%/Bio/Index/Abstract.pm
+%%SITE_PERL%%/Bio/Index/AbstractSeq.pm
+%%SITE_PERL%%/Bio/Index/EMBL.pm
+%%SITE_PERL%%/Bio/Index/Fasta.pm
+%%SITE_PERL%%/Bio/Index/GenBank.pm
+%%SITE_PERL%%/Bio/Index/SwissPfam.pm
+%%SITE_PERL%%/Bio/Index/Swissprot.pm
+%%SITE_PERL%%/Bio/LiveSeq/AARange.pm
+%%SITE_PERL%%/Bio/LiveSeq/Chain.pm
+%%SITE_PERL%%/Bio/LiveSeq/ChainI.pm
+%%SITE_PERL%%/Bio/LiveSeq/DNA.pm
+%%SITE_PERL%%/Bio/LiveSeq/Exon.pm
+%%SITE_PERL%%/Bio/LiveSeq/Gene.pm
+%%SITE_PERL%%/Bio/LiveSeq/IO/BioPerl.pm
+%%SITE_PERL%%/Bio/LiveSeq/IO/Loader.pm
+%%SITE_PERL%%/Bio/LiveSeq/IO/SRS.pm
+%%SITE_PERL%%/Bio/LiveSeq/Intron.pm
+%%SITE_PERL%%/Bio/LiveSeq/Mutation.pm
+%%SITE_PERL%%/Bio/LiveSeq/Mutator.pm
+%%SITE_PERL%%/Bio/LiveSeq/Prim_Transcript.pm
+%%SITE_PERL%%/Bio/LiveSeq/Range.pm
+%%SITE_PERL%%/Bio/LiveSeq/Repeat_Region.pm
+%%SITE_PERL%%/Bio/LiveSeq/Repeat_Unit.pm
+%%SITE_PERL%%/Bio/LiveSeq/SeqI.pm
+%%SITE_PERL%%/Bio/LiveSeq/Transcript.pm
+%%SITE_PERL%%/Bio/LiveSeq/Translation.pm
+%%SITE_PERL%%/Bio/LocatableSeq.pm
+%%SITE_PERL%%/Bio/Location/AvWithinCoordPolicy.pm
+%%SITE_PERL%%/Bio/Location/CoordinatePolicyI.pm
+%%SITE_PERL%%/Bio/Location/Fuzzy.pm
+%%SITE_PERL%%/Bio/Location/FuzzyLocationI.pm
+%%SITE_PERL%%/Bio/Location/NarrowestCoordPolicy.pm
+%%SITE_PERL%%/Bio/Location/Simple.pm
+%%SITE_PERL%%/Bio/Location/Split.pm
+%%SITE_PERL%%/Bio/Location/SplitLocationI.pm
+%%SITE_PERL%%/Bio/Location/WidestCoordPolicy.pm
+%%SITE_PERL%%/Bio/LocationI.pm
+%%SITE_PERL%%/Bio/PrimarySeq.pm
+%%SITE_PERL%%/Bio/PrimarySeqI.pm
+%%SITE_PERL%%/Bio/Range.pm
+%%SITE_PERL%%/Bio/RangeI.pm
+%%SITE_PERL%%/Bio/Root/Err.pm
+%%SITE_PERL%%/Bio/Root/Global.pm
+%%SITE_PERL%%/Bio/Root/IO.pm
+%%SITE_PERL%%/Bio/Root/IOManager.pm
+%%SITE_PERL%%/Bio/Root/Object.pm
+%%SITE_PERL%%/Bio/Root/RootI.pm
+%%SITE_PERL%%/Bio/Root/Utilities.pm
+%%SITE_PERL%%/Bio/Root/Vector.pm
+%%SITE_PERL%%/Bio/Root/Xref.pm
+%%SITE_PERL%%/Bio/SearchDist.pm
+%%SITE_PERL%%/Bio/Seq.pm
+%%SITE_PERL%%/Bio/Seq/LargePrimarySeq.pm
+%%SITE_PERL%%/Bio/Seq/LargeSeq.pm
+%%SITE_PERL%%/Bio/Seq/RichSeq.pm
+%%SITE_PERL%%/Bio/Seq/RichSeqI.pm
+%%SITE_PERL%%/Bio/SeqAnalysisParserI.pm
+%%SITE_PERL%%/Bio/SeqFeature/FeaturePair.pm
+%%SITE_PERL%%/Bio/SeqFeature/Gene/Exon.pm
+%%SITE_PERL%%/Bio/SeqFeature/Gene/ExonI.pm
+%%SITE_PERL%%/Bio/SeqFeature/Gene/GeneStructure.pm
+%%SITE_PERL%%/Bio/SeqFeature/Gene/GeneStructureI.pm
+%%SITE_PERL%%/Bio/SeqFeature/Gene/Transcript.pm
+%%SITE_PERL%%/Bio/SeqFeature/Gene/TranscriptI.pm
+%%SITE_PERL%%/Bio/SeqFeature/Generic.pm
+%%SITE_PERL%%/Bio/SeqFeature/Similarity.pm
+%%SITE_PERL%%/Bio/SeqFeature/SimilarityPair.pm
+%%SITE_PERL%%/Bio/SeqFeatureI.pm
+%%SITE_PERL%%/Bio/SeqI.pm
+%%SITE_PERL%%/Bio/SeqIO.pm
+%%SITE_PERL%%/Bio/SeqIO/FTHelper.pm
+%%SITE_PERL%%/Bio/SeqIO/MultiFile.pm
+%%SITE_PERL%%/Bio/SeqIO/ace.pm
+%%SITE_PERL%%/Bio/SeqIO/embl.pm
+%%SITE_PERL%%/Bio/SeqIO/fasta.pm
+%%SITE_PERL%%/Bio/SeqIO/game.pm
+%%SITE_PERL%%/Bio/SeqIO/game/featureHandler.pm
+%%SITE_PERL%%/Bio/SeqIO/game/idHandler.pm
+%%SITE_PERL%%/Bio/SeqIO/game/seqHandler.pm
+%%SITE_PERL%%/Bio/SeqIO/gcg.pm
+%%SITE_PERL%%/Bio/SeqIO/genbank.pm
+%%SITE_PERL%%/Bio/SeqIO/largefasta.pm
+%%SITE_PERL%%/Bio/SeqIO/raw.pm
+%%SITE_PERL%%/Bio/SeqIO/scf.pm
+%%SITE_PERL%%/Bio/SeqIO/swiss.pm
+%%SITE_PERL%%/Bio/SeqUtils.pm
+%%SITE_PERL%%/Bio/SimpleAlign.pm
+%%SITE_PERL%%/Bio/Species.pm
+%%SITE_PERL%%/Bio/Tools/AlignFactory.pm
+%%SITE_PERL%%/Bio/Tools/AnalysisResult.pm
+%%SITE_PERL%%/Bio/Tools/BPbl2seq.pm
+%%SITE_PERL%%/Bio/Tools/BPlite.pm
+%%SITE_PERL%%/Bio/Tools/BPlite/HSP.pm
+%%SITE_PERL%%/Bio/Tools/BPlite/Iteration.pm
+%%SITE_PERL%%/Bio/Tools/BPlite/Sbjct.pm
+%%SITE_PERL%%/Bio/Tools/BPpsilite.pm
+%%SITE_PERL%%/Bio/Tools/Blast.pm
+%%SITE_PERL%%/Bio/Tools/Blast/CHANGES
+%%SITE_PERL%%/Bio/Tools/Blast/HSP.pm
+%%SITE_PERL%%/Bio/Tools/Blast/HTML.pm
+%%SITE_PERL%%/Bio/Tools/Blast/README
+%%SITE_PERL%%/Bio/Tools/Blast/Run/LocalBlast.pm
+%%SITE_PERL%%/Bio/Tools/Blast/Run/Makefile.PL
+%%SITE_PERL%%/Bio/Tools/Blast/Run/Webblast.pm
+%%SITE_PERL%%/Bio/Tools/Blast/Run/postclient.pl
+%%SITE_PERL%%/Bio/Tools/Blast/Sbjct.pm
+%%SITE_PERL%%/Bio/Tools/CodonTable.pm
+%%SITE_PERL%%/Bio/Tools/ESTScan.pm
+%%SITE_PERL%%/Bio/Tools/Fasta.pm
+%%SITE_PERL%%/Bio/Tools/GFF.pm
+%%SITE_PERL%%/Bio/Tools/Genscan.pm
+%%SITE_PERL%%/Bio/Tools/HMMER/Domain.pm
+%%SITE_PERL%%/Bio/Tools/HMMER/Results.pm
+%%SITE_PERL%%/Bio/Tools/HMMER/Set.pm
+%%SITE_PERL%%/Bio/Tools/IUPAC.pm
+%%SITE_PERL%%/Bio/Tools/MZEF.pm
+%%SITE_PERL%%/Bio/Tools/OddCodes.pm
+%%SITE_PERL%%/Bio/Tools/Prediction/Exon.pm
+%%SITE_PERL%%/Bio/Tools/Prediction/Gene.pm
+%%SITE_PERL%%/Bio/Tools/RestrictionEnzyme.pm
+%%SITE_PERL%%/Bio/Tools/Run/Alignment/Clustalw.pm
+%%SITE_PERL%%/Bio/Tools/Run/Alignment/TCoffee.pm
+%%SITE_PERL%%/Bio/Tools/Run/StandAloneBlast.pm
+%%SITE_PERL%%/Bio/Tools/SeqAnal.pm
+%%SITE_PERL%%/Bio/Tools/SeqPattern.pm
+%%SITE_PERL%%/Bio/Tools/SeqStats.pm
+%%SITE_PERL%%/Bio/Tools/SeqWords.pm
+%%SITE_PERL%%/Bio/Tools/Sigcleave.pm
+%%SITE_PERL%%/Bio/Tools/Sim4/Exon.pm
+%%SITE_PERL%%/Bio/Tools/Sim4/Results.pm
+%%SITE_PERL%%/Bio/Tools/WWW.pm
+%%SITE_PERL%%/Bio/Tools/pSW.pm
+%%SITE_PERL%%/Bio/UnivAln.pm
+%%SITE_PERL%%/Bio/Variation/AAChange.pm
+%%SITE_PERL%%/Bio/Variation/AAReverseMutate.pm
+%%SITE_PERL%%/Bio/Variation/Allele.pm
+%%SITE_PERL%%/Bio/Variation/DNAMutation.pm
+%%SITE_PERL%%/Bio/Variation/IO.pm
+%%SITE_PERL%%/Bio/Variation/IO/flat.pm
+%%SITE_PERL%%/Bio/Variation/IO/xml.pm
+%%SITE_PERL%%/Bio/Variation/README
+%%SITE_PERL%%/Bio/Variation/RNAChange.pm
+%%SITE_PERL%%/Bio/Variation/SeqDiff.pm
+%%SITE_PERL%%/Bio/Variation/VariantI.pm
+%%SITE_PERL%%/bioback.pod
+%%SITE_PERL%%/biodesign.pod
+%%SITE_PERL%%/bioperl.pod
+%%SITE_PERL%%/biostart.pod
+%%SITE_PERL%%/bptutorial.pl
+%%PLIST_GUI%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Tk
+%%PLIST_GUI%%@dirrm %%SITE_PERL%%/Bio/Tk
+%%PLIST_CORBA_SERVER%%@dirrm %%SITE_PERL%%/Bio/CorbaServer
+%%PLIST_CORBA_CLIENT%%@dirrm %%SITE_PERL%%/Bio/CorbaClient
+@dirrm %%SITE_PERL%%/Bio/Variation/IO
+@dirrm %%SITE_PERL%%/Bio/Variation
+@dirrm %%SITE_PERL%%/Bio/Tools/Sim4
+@dirrm %%SITE_PERL%%/Bio/Tools/Run/Alignment
+@dirrm %%SITE_PERL%%/Bio/Tools/Run
+@dirrm %%SITE_PERL%%/Bio/Tools/Prediction
+@dirrm %%SITE_PERL%%/Bio/Tools/HMMER
+@dirrm %%SITE_PERL%%/Bio/Tools/Blast/Run
+@dirrm %%SITE_PERL%%/Bio/Tools/Blast
+@dirrm %%SITE_PERL%%/Bio/Tools/BPlite
+@dirrm %%SITE_PERL%%/Bio/Tools
+@dirrm %%SITE_PERL%%/Bio/SeqIO/game
+@dirrm %%SITE_PERL%%/Bio/SeqIO
+@dirrm %%SITE_PERL%%/Bio/SeqFeature/Gene
+@dirrm %%SITE_PERL%%/Bio/SeqFeature
+@dirrm %%SITE_PERL%%/Bio/Seq
+@dirrm %%SITE_PERL%%/Bio/Root
+@dirrm %%SITE_PERL%%/Bio/Location
+@dirrm %%SITE_PERL%%/Bio/LiveSeq/IO
+@dirrm %%SITE_PERL%%/Bio/LiveSeq
+@dirrm %%SITE_PERL%%/Bio/Index
+@dirrm %%SITE_PERL%%/Bio/Factory
+@dirrm %%SITE_PERL%%/Bio/DB
+@dirrm %%SITE_PERL%%/Bio/Annotation
+@dirrm %%SITE_PERL%%/Bio/AlignIO
+@dirrm %%SITE_PERL%%/Bio
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Ext/Align
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/Ext
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bio/Ext
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bio
diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index a2ac2f6b5196..9f2199aff490 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Device::Modem::Log::File.3 Device::Modem::Log::Syslog.3 Device::Modem.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/comms/p5-Device-SerialPort/Makefile b/comms/p5-Device-SerialPort/Makefile
index be8a3ba6e57b..a9907f289358 100644
--- a/comms/p5-Device-SerialPort/Makefile
+++ b/comms/p5-Device-SerialPort/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl5 module for simple serial port control
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Device::SerialPort.3
.include <bsd.port.pre.mk>
diff --git a/comms/p5-Device-SerialPort/pkg-plist b/comms/p5-Device-SerialPort/pkg-plist
index 47c2834d0834..18385da5d66c 100644
--- a/comms/p5-Device-SerialPort/pkg-plist
+++ b/comms/p5-Device-SerialPort/pkg-plist
@@ -1,7 +1,7 @@
bin/modemtest
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Device/SerialPort.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Device/SerialPort/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.so
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Device/SerialPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Device 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/SerialPort.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.so
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Device 2>/dev/null || true
diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index ed59fad2f438..05f73568a2e6 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= An API for hierarchical tag/value structures
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
diff --git a/converters/p5-Boulder/pkg-plist b/converters/p5-Boulder/pkg-plist
index 7ab07ada196d..5c36d96ceae1 100644
--- a/converters/p5-Boulder/pkg-plist
+++ b/converters/p5-Boulder/pkg-plist
@@ -1,23 +1,23 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Boulder/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Stone/Cursor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Stone/GB_Sequence.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Swissprot.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Medline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Blast/NCBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Blast/WU.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Labbase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/LocusLink.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Unigene.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Stream.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Store.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/XML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Omim.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Blast.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Genbank.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/String.pm
-lib/perl5/site_perl/%%PERL_VER%%/Stone.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Boulder
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Boulder/Blast
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Boulder
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Stone
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Boulder/.packlist
+%%SITE_PERL%%/Stone/Cursor.pm
+%%SITE_PERL%%/Stone/GB_Sequence.pm
+%%SITE_PERL%%/Boulder/Swissprot.pm
+%%SITE_PERL%%/Boulder/Medline.pm
+%%SITE_PERL%%/Boulder/Blast/NCBI.pm
+%%SITE_PERL%%/Boulder/Blast/WU.pm
+%%SITE_PERL%%/Boulder/Labbase.pm
+%%SITE_PERL%%/Boulder/LocusLink.pm
+%%SITE_PERL%%/Boulder/Unigene.pm
+%%SITE_PERL%%/Boulder/Stream.pm
+%%SITE_PERL%%/Boulder/Store.pm
+%%SITE_PERL%%/Boulder/XML.pm
+%%SITE_PERL%%/Boulder/Omim.pm
+%%SITE_PERL%%/Boulder/Blast.pm
+%%SITE_PERL%%/Boulder/Genbank.pm
+%%SITE_PERL%%/Boulder/String.pm
+%%SITE_PERL%%/Stone.pm
+%%SITE_PERL%%/Boulder.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Boulder
+@dirrm %%SITE_PERL%%/Boulder/Blast
+@dirrm %%SITE_PERL%%/Boulder
+@dirrm %%SITE_PERL%%/Stone
diff --git a/converters/p5-Convert-ASCII-Armour/Makefile b/converters/p5-Convert-ASCII-Armour/Makefile
index c7f96f199132..6b759091234d 100644
--- a/converters/p5-Convert-ASCII-Armour/Makefile
+++ b/converters/p5-Convert-ASCII-Armour/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
COMMENT= Convert binary octets into ASCII armoured messages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Convert::ASCII::Armour.3 Convert::ASCII::Armor.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/converters/p5-Convert-ASCII-Armour/pkg-plist b/converters/p5-Convert-ASCII-Armour/pkg-plist
index a00ab1134bd3..2b76d5da9256 100644
--- a/converters/p5-Convert-ASCII-Armour/pkg-plist
+++ b/converters/p5-Convert-ASCII-Armour/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/ASCII/Armor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Convert/ASCII/Armour.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/ASCII 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert/ASCII 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
+%%SITE_PERL%%/Convert/ASCII/Armor.pm
+%%SITE_PERL%%/Convert/ASCII/Armour.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Convert/ASCII 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
diff --git a/converters/p5-Convert-Morse/Makefile b/converters/p5-Convert-Morse/Makefile
index 8c56db260381..dd1460cacc8e 100644
--- a/converters/p5-Convert-Morse/Makefile
+++ b/converters/p5-Convert-Morse/Makefile
@@ -21,10 +21,9 @@ COMMENT= Perl module to convert between ASCII and Morse codes
#BROKEN= "Requires perl 5.6.0"
.endif
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Convert::Morse.3
.include <bsd.port.post.mk>
diff --git a/converters/p5-Convert-Morse/pkg-plist b/converters/p5-Convert-Morse/pkg-plist
index 1f81d57e85a4..d9b58def8734 100644
--- a/converters/p5-Convert-Morse/pkg-plist
+++ b/converters/p5-Convert-Morse/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/Morse.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Morse/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Morse
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
+%%SITE_PERL%%/Convert/Morse.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
diff --git a/converters/p5-Convert-PEM/Makefile b/converters/p5-Convert-PEM/Makefile
index a33c1e4c9bd9..9b123bde441c 100644
--- a/converters/p5-Convert-PEM/Makefile
+++ b/converters/p5-Convert-PEM/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
COMMENT= Read/write access to ASN.1-encoded PEM files with optional encryption
-PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERLBASE= ${SITE_PERL}
BUILD_DEPENDS= ${PERLBASE}/Convert/ASN1.pm:${PORTSDIR}/converters/p5-Convert-ASN1 \
${PERLBASE}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES \
${PERLBASE}/Crypt/DES_EDE3.pm:${PORTSDIR}/security/p5-Crypt-DES_EDE3 \
diff --git a/converters/p5-Convert-PEM/pkg-plist b/converters/p5-Convert-PEM/pkg-plist
index 138816e4af5d..2274f6e9f366 100644
--- a/converters/p5-Convert-PEM/pkg-plist
+++ b/converters/p5-Convert-PEM/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/PEM/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Convert/PEM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DES_EDE3.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/PEM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Convert/PEM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/PEM
+%%SITE_PERL%%/Convert/PEM/CBC.pm
+%%SITE_PERL%%/Convert/PEM.pm
+%%SITE_PERL%%/Crypt/DES_EDE3.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/PEM/.packlist
+@dirrm %%SITE_PERL%%/Convert/PEM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/PEM
@unexec rmdir %D/lib/perl5/site_perl/5.005/Crypt || true
diff --git a/converters/p5-Convert-Recode/pkg-plist b/converters/p5-Convert-Recode/pkg-plist
index a2cb90cef97c..ea11e365e1d0 100644
--- a/converters/p5-Convert-Recode/pkg-plist
+++ b/converters/p5-Convert-Recode/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/Recode.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Recode/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Recode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Convert
+%%SITE_PERL%%/Convert/Recode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Recode/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Recode
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrm %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index 2f2b23e0fb82..83c153767a00 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= roman@xpert.com
COMMENT= Perl module to read TNEF files
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS= ${SITE_PERL}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy \
+ ${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/converters/p5-Convert-TNEF/pkg-plist b/converters/p5-Convert-TNEF/pkg-plist
index 5966b34e5ecf..7b2baea90f21 100644
--- a/converters/p5-Convert-TNEF/pkg-plist
+++ b/converters/p5-Convert-TNEF/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/TNEF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/TNEF/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/TNEF
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+%%SITE_PERL%%/Convert/TNEF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF
+@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
diff --git a/converters/p5-Convert-UU/pkg-plist b/converters/p5-Convert-UU/pkg-plist
index 5c63a348145d..d76e8dd4cb88 100644
--- a/converters/p5-Convert-UU/pkg-plist
+++ b/converters/p5-Convert-UU/pkg-plist
@@ -1,7 +1,7 @@
bin/puudecode
bin/puuencode
-lib/perl5/site_perl/%%PERL_VER%%/Convert/UU.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/UU/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Convert
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/UU
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert
+%%SITE_PERL%%/Convert/UU.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UU/.packlist
+@dirrm %%SITE_PERL%%/Convert
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UU
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
diff --git a/converters/p5-Text-Iconv/pkg-plist b/converters/p5-Text-Iconv/pkg-plist
index afed950235d8..1fd71d9c3969 100644
--- a/converters/p5-Text-Iconv/pkg-plist
+++ b/converters/p5-Text-Iconv/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/Iconv.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/Iconv.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
index 69bcc00cc25b..1a48c5ad74e6 100644
--- a/converters/p5-Unicode-IMAPUtf7/Makefile
+++ b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl extension to deal with IMAP UTF7
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Unicode::IMAPUtf7.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/converters/p5-Unicode-IMAPUtf7/pkg-plist b/converters/p5-Unicode-IMAPUtf7/pkg-plist
index aee9efb42eb1..a9b413bf1665 100644
--- a/converters/p5-Unicode-IMAPUtf7/pkg-plist
+++ b/converters/p5-Unicode-IMAPUtf7/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Unicode/IMAPUtf7.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Unicode/IMAPUtf7/autosplit.ix
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Unicode/IMAPUtf7 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7/.packlist
+%%SITE_PERL%%/Unicode/IMAPUtf7.pm
+%%SITE_PERL%%/auto/Unicode/IMAPUtf7/autosplit.ix
+@unexec rmdir %D/%%SITE_PERL%%/auto/Unicode/IMAPUtf7 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Unicode 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Unicode 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
diff --git a/converters/p5-Unicode-Map/pkg-plist b/converters/p5-Unicode-Map/pkg-plist
index de6a6eb2680d..96cbfb4db2fe 100644
--- a/converters/p5-Unicode-Map/pkg-plist
+++ b/converters/p5-Unicode-Map/pkg-plist
@@ -2,115 +2,115 @@ bin/mirrorMappings
bin/mkmapfile
bin/map
bin/mkCSGB2312
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/STDENC.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/SYMBOL.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/ZDINGBAT.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ARABIC.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CENTEURO.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINSIMP.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINTRAD.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CROATIAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CYRILLIC.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DEVANAGA.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DINGBATS.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GREEK.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GUJARATI.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GURMUKHI.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/HEBREW.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ICELAND.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/JAPANESE.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/KOREAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMANIAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/SYMBOL.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/THAI.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/TURKISH.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/BIG5.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/CNS-11643-1986.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-JP.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-KR.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB12345-80.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312-80.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0201.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0208.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0212.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JOHAB.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC1001.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC5601-1992.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/SHIFTJIS.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/IBM/IBM038.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-1.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-10.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-13.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-14.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-15.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-2.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-3.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-4.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-5.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-6.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-7.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-8.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-9.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/ISO646-US.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP437.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP737.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP775.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP850.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP852.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP855.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP857.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP860.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP861.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP862.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP863.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP864.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP865.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP866.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP869.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP874.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP037.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP1026.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP500.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP875.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/CYRILLIC.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/GREEK.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ICELAND.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/LATIN2.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ROMAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/TURKISH.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1250.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1251.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1252.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1253.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1254.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1255.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1256.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1257.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1258.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP932.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP936.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP949.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP950.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/NEXT/NEXTSTEP.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/REGISTRY
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ADOBE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/IBM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/NEXT
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/STDENC.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/SYMBOL.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/ZDINGBAT.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ARABIC.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CENTEURO.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINSIMP.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINTRAD.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CROATIAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CYRILLIC.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DEVANAGA.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DINGBATS.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GREEK.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GUJARATI.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GURMUKHI.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/HEBREW.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ICELAND.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/JAPANESE.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/KOREAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMANIAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/SYMBOL.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/THAI.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/TURKISH.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/BIG5.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/CNS-11643-1986.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-JP.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-KR.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB12345-80.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312-80.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0201.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0208.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0212.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JOHAB.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC1001.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC5601-1992.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/SHIFTJIS.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/IBM/IBM038.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-1.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-10.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-13.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-14.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-15.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-2.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-3.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-4.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-5.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-6.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-7.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-8.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-9.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/ISO646-US.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP437.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP737.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP775.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP850.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP852.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP855.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP857.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP860.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP861.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP862.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP863.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP864.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP865.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP866.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP869.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP874.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP037.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP1026.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP500.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP875.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/CYRILLIC.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/GREEK.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ICELAND.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/LATIN2.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ROMAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/TURKISH.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1250.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1251.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1252.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1253.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1254.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1255.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1256.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1257.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1258.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP932.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP936.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP949.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP950.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/NEXT/NEXTSTEP.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/REGISTRY
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/IBM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/NEXT
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index c8b39b7e5d2f..8e9b08199a85 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= rtdean@cytherianage.net
COMMENT= Perl class that implements conversion between arbitrary charsets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/Map.pm:${PORTSDIR}/converters/p5-Unicode-Map \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/Map8.pm:${PORTSDIR}/converters/p5-Unicode-Map8 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Unicode/Map.pm:${PORTSDIR}/converters/p5-Unicode-Map \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/Map8.pm:${PORTSDIR}/converters/p5-Unicode-Map8 \
+ ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/converters/p5-Unicode-MapUTF8/pkg-plist b/converters/p5-Unicode-MapUTF8/pkg-plist
index 15cd18f4c397..6a633ea87f33 100644
--- a/converters/p5-Unicode-MapUTF8/pkg-plist
+++ b/converters/p5-Unicode-MapUTF8/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Unicode/MapUTF8.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Unicode
+%%SITE_PERL%%/Unicode/MapUTF8.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
+@dirrm %%SITE_PERL%%/Unicode
diff --git a/databases/WWWdb/pkg-plist b/databases/WWWdb/pkg-plist
index 3dd162c45602..feac2309f78b 100644
--- a/databases/WWWdb/pkg-plist
+++ b/databases/WWWdb/pkg-plist
@@ -1,37 +1,37 @@
-lib/perl5/site_perl/%%PERL_VER%%/INSTALL.pl
-lib/perl5/site_perl/%%PERL_VER%%/Apache/WWWdb_TransUri.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/WWWdb.conf
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/ConfigFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession.html
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession_en.po
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Monitor.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/List.html
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/ConfigFile_en.po
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Session.html
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/ConfigPool.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/ConfigFile.html
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Hash.html
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession_de.po
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/ConfigFile_de.po
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Plugin.html
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/List.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Plugin_en.po
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Base.html
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Plugin.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/HTML.html
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/Plugin_de.po
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession/Oracle.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession/Pg.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession/mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession/ODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession/InterBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWWdb/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWWdb/DbSession
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWWdb
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWWdb
+%%SITE_PERL%%/INSTALL.pl
+%%SITE_PERL%%/Apache/WWWdb_TransUri.pm
+%%SITE_PERL%%/Apache/WWWdb.conf
+%%SITE_PERL%%/WWWdb/ConfigFile.pm
+%%SITE_PERL%%/WWWdb/DbSession.pm
+%%SITE_PERL%%/WWWdb/DbSession.html
+%%SITE_PERL%%/WWWdb/DbSession_en.po
+%%SITE_PERL%%/WWWdb/Monitor.pm
+%%SITE_PERL%%/WWWdb/List.html
+%%SITE_PERL%%/WWWdb/HTML.pm
+%%SITE_PERL%%/WWWdb/ConfigFile_en.po
+%%SITE_PERL%%/WWWdb/Session.html
+%%SITE_PERL%%/WWWdb/ConfigPool.pm
+%%SITE_PERL%%/WWWdb/ConfigFile.html
+%%SITE_PERL%%/WWWdb/Hash.html
+%%SITE_PERL%%/WWWdb/DbSession_de.po
+%%SITE_PERL%%/WWWdb/ConfigFile_de.po
+%%SITE_PERL%%/WWWdb/Plugin.html
+%%SITE_PERL%%/WWWdb/Session.pm
+%%SITE_PERL%%/WWWdb/List.pm
+%%SITE_PERL%%/WWWdb/Hash.pm
+%%SITE_PERL%%/WWWdb/Plugin_en.po
+%%SITE_PERL%%/WWWdb/Base.pm
+%%SITE_PERL%%/WWWdb/Base.html
+%%SITE_PERL%%/WWWdb/Plugin.pm
+%%SITE_PERL%%/WWWdb/HTML.html
+%%SITE_PERL%%/WWWdb/Plugin_de.po
+%%SITE_PERL%%/WWWdb/DbSession/Oracle.pm
+%%SITE_PERL%%/WWWdb/DbSession/Pg.pm
+%%SITE_PERL%%/WWWdb/DbSession/mysql.pm
+%%SITE_PERL%%/WWWdb/DbSession/ODBC.pm
+%%SITE_PERL%%/WWWdb/DbSession/InterBase.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWWdb/.packlist
+@dirrm %%SITE_PERL%%/WWWdb/DbSession
+@dirrm %%SITE_PERL%%/WWWdb
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWWdb
diff --git a/databases/mysql2pgsql/Makefile b/databases/mysql2pgsql/Makefile
index a84f15b8ed53..35c2e93c2b20 100644
--- a/databases/mysql2pgsql/Makefile
+++ b/databases/mysql2pgsql/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
COMMENT= Convert a MySQL dump to a PostgreSQL dump
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
PATCH_WRKSRC= ${WRKDIR}
USE_PERL5= yes
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 61b5e71c17fd..d91c87953da7 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -94,7 +94,7 @@ CONFIGURE_ENV+= CXX="${CC}"
# MySQL-Server part
.if !defined(CLIENT_ONLY)
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index a5db2b4378a7..5e3dadd59858 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -100,7 +100,7 @@ CXXFLAGS+= -fno-exceptions
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 7a36ca57d586..6e2f0dcb4585 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -102,7 +102,7 @@ CXX= ${CC}
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 7a36ca57d586..6e2f0dcb4585 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -102,7 +102,7 @@ CXX= ${CC}
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 7a36ca57d586..6e2f0dcb4585 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -102,7 +102,7 @@ CXX= ${CC}
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 7a36ca57d586..6e2f0dcb4585 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -102,7 +102,7 @@ CXX= ${CC}
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 7a36ca57d586..6e2f0dcb4585 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -102,7 +102,7 @@ CXX= ${CC}
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 7a36ca57d586..6e2f0dcb4585 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -102,7 +102,7 @@ CXX= ${CC}
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index e5f902d2cdf6..9145dc69aa09 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
# xlHtml:${PORTSDIR}/textproc/xlhtml \
# wvHtml:${PORTSDIR}/textproc/wv
-PM_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PM_BASE= ${SITE_PERL}
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/databases/p5-ApacheDBILogger/Makefile b/databases/p5-ApacheDBILogger/Makefile
index 1937399624b8..83dded9e9f44 100644
--- a/databases/p5-ApacheDBILogger/Makefile
+++ b/databases/p5-ApacheDBILogger/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= dburr@FreeBSD.ORG
COMMENT= A module that tracks what's being transferred in a DBI database
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
+BUILD_DEPENDS= ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
PERL_CONFIGURE= yes
diff --git a/databases/p5-ApacheDBILogger/pkg-plist b/databases/p5-ApacheDBILogger/pkg-plist
index 86dd282225bf..a0dd3a488af7 100644
--- a/databases/p5-ApacheDBILogger/pkg-plist
+++ b/databases/p5-ApacheDBILogger/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/DBILogger/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/DBILogger.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/DBILogger
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBILogger/.packlist
+%%SITE_PERL%%/Apache/DBILogger.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBILogger
+@dirrm %%SITE_PERL%%/Apache
diff --git a/databases/p5-AsciiDB-TagFile/Makefile b/databases/p5-AsciiDB-TagFile/Makefile
index 1a56eeb1d61e..aa892286c7cc 100644
--- a/databases/p5-AsciiDB-TagFile/Makefile
+++ b/databases/p5-AsciiDB-TagFile/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl tie class for a simple ASCII database
PERL_CONFIGURE= yes
MAN3= AsciiDB::TagFile.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/databases/p5-AsciiDB-TagFile/pkg-plist b/databases/p5-AsciiDB-TagFile/pkg-plist
index 09cb231d1ae4..ab6a3bc82032 100644
--- a/databases/p5-AsciiDB-TagFile/pkg-plist
+++ b/databases/p5-AsciiDB-TagFile/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AsciiDB/TagFile/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/AsciiDB/TagFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/AsciiDB/TagRecord.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AsciiDB/TagFile
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AsciiDB 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AsciiDB 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AsciiDB/TagFile/.packlist
+%%SITE_PERL%%/AsciiDB/TagFile.pm
+%%SITE_PERL%%/AsciiDB/TagRecord.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AsciiDB/TagFile
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AsciiDB 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AsciiDB 2>/dev/null || true
diff --git a/databases/p5-CDB_File-Generator/Makefile b/databases/p5-CDB_File-Generator/Makefile
index 56ddb0afb271..bb612819fd01 100644
--- a/databases/p5-CDB_File-Generator/Makefile
+++ b/databases/p5-CDB_File-Generator/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/cdbmake:${PORTSDIR}/databases/cdb \
${SITE_PERL}/${PERL_ARCH}/CDB_File.pm:${PORTSDIR}/databases/p5-CDB_File
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= CDB_File::Generator.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/databases/p5-CDB_File-Generator/pkg-plist b/databases/p5-CDB_File-Generator/pkg-plist
index d87d4cd140c0..cc017161cb7b 100644
--- a/databases/p5-CDB_File-Generator/pkg-plist
+++ b/databases/p5-CDB_File-Generator/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/CDB_File/Generator.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CDB_File/Generator/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CDB_File/Generator
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CDB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CDB_File 2>/dev/null || true
+%%SITE_PERL%%/CDB_File/Generator.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/Generator/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/Generator
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/CDB_File 2>/dev/null || true
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index 16fdd993f11f..db6ce2c9a5a0 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= DBI driver for CSV files
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Text/CSV_XS.pm:${PORTSDIR}/textproc/p5-Text-CSV_XS \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/CSV_XS.pm:${PORTSDIR}/textproc/p5-Text-CSV_XS \
+ ${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBD::File.3 \
DBD::CSV.3 \
Bundle::DBD::CSV.3
diff --git a/databases/p5-DBD-CSV/pkg-plist b/databases/p5-DBD-CSV/pkg-plist
index 25b95e697352..9738059e2a9b 100644
--- a/databases/p5-DBD-CSV/pkg-plist
+++ b/databases/p5-DBD-CSV/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/DBD/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBD/CSV.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/DBD/CSV.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/CSV/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/CSV
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/DBD
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBD 2>/dev/null || true
+%%SITE_PERL%%/DBD/File.pm
+%%SITE_PERL%%/DBD/CSV.pm
+%%SITE_PERL%%/Bundle/DBD/CSV.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/CSV/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/CSV
+@dirrm %%SITE_PERL%%/Bundle/DBD
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
diff --git a/databases/p5-DBD-Excel/Makefile b/databases/p5-DBD-Excel/Makefile
index 5179aeccaf09..eedcbac3728e 100644
--- a/databases/p5-DBD-Excel/Makefile
+++ b/databases/p5-DBD-Excel/Makefile
@@ -20,12 +20,11 @@ BUILD_DEPENDS= ${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statem
${SITE_PERL}/Spreadsheet/WriteExcel.pm:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel
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= DBD::Excel.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/databases/p5-DBD-Excel/pkg-plist b/databases/p5-DBD-Excel/pkg-plist
index 2527af43a4b5..a8954cdb34e8 100644
--- a/databases/p5-DBD-Excel/pkg-plist
+++ b/databases/p5-DBD-Excel/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Excel/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/DBD/Excel.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel/.packlist
+%%SITE_PERL%%/DBD/Excel.pm
%%PORTDOCS%%share/examples/DBD-Excel/README
%%PORTDOCS%%share/examples/DBD-Excel/dbdtest.xls
%%PORTDOCS%%share/examples/DBD-Excel/newxl.xls
@@ -13,7 +13,7 @@ lib/perl5/site_perl/%%PERL_VER%%/DBD/Excel.pm
%%PORTDOCS%%share/examples/DBD-Excel/texj.pl
%%PORTDOCS%%share/examples/DBD-Excel/thidden.pl
%%PORTDOCS%%share/examples/DBD-Excel/thidden.xls
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Excel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/share/examples/DBD-Excel 2>/dev/null || true
diff --git a/databases/p5-DBD-LDAP/Makefile b/databases/p5-DBD-LDAP/Makefile
index 36dd1941d855..330872916d65 100644
--- a/databases/p5-DBD-LDAP/Makefile
+++ b/databases/p5-DBD-LDAP/Makefile
@@ -18,11 +18,10 @@ COMMENT= DBI interface for accessing LDAP servers
BUILD_DEPENDS= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= DBD::LDAP.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBD-LDAP/pkg-plist b/databases/p5-DBD-LDAP/pkg-plist
index 355365d9a8f5..f26c809607a0 100644
--- a/databases/p5-DBD-LDAP/pkg-plist
+++ b/databases/p5-DBD-LDAP/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/LDAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/DBD/LDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/JLdap.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/DBD/LDAP/autosplit.ix
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/DBD/LDAP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/LDAP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/LDAP/.packlist
+%%SITE_PERL%%/DBD/LDAP.pm
+%%SITE_PERL%%/JLdap.pm
+%%SITE_PERL%%/auto/DBD/LDAP/autosplit.ix
+@unexec rmdir %D/%%SITE_PERL%%/auto/DBD/LDAP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/DBD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/LDAP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile
index 237cc38861f9..91c5e30d4d57 100644
--- a/databases/p5-DBD-SQLite/Makefile
+++ b/databases/p5-DBD-SQLite/Makefile
@@ -17,7 +17,6 @@ COMMENT= Provides access to SQLite2 databases through the DBI
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBD::SQLite.3
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBD-SQLite/pkg-plist b/databases/p5-DBD-SQLite/pkg-plist
index 90e937f764f2..ebefd1d70f3a 100644
--- a/databases/p5-DBD-SQLite/pkg-plist
+++ b/databases/p5-DBD-SQLite/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/SQLite.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/getsqlite.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLite/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLite 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/SQLite.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/getsqlite.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
diff --git a/databases/p5-DBD-SQLite2/Makefile b/databases/p5-DBD-SQLite2/Makefile
index 237cc38861f9..91c5e30d4d57 100644
--- a/databases/p5-DBD-SQLite2/Makefile
+++ b/databases/p5-DBD-SQLite2/Makefile
@@ -17,7 +17,6 @@ COMMENT= Provides access to SQLite2 databases through the DBI
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBD::SQLite.3
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBD-SQLite2/pkg-plist b/databases/p5-DBD-SQLite2/pkg-plist
index 90e937f764f2..ebefd1d70f3a 100644
--- a/databases/p5-DBD-SQLite2/pkg-plist
+++ b/databases/p5-DBD-SQLite2/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/SQLite.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/getsqlite.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLite/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLite 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/SQLite.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/getsqlite.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index cc8ee414d740..a9a3ffb5dc62 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -16,12 +16,11 @@ DISTNAME= dbi_wrapper-${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
COMMENT= Perl extension for generic DBI database access
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBIWrapper.3 DBIWrapper::ResultSet.3 DBIWrapper::XMLParser.3
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBIWrapper/pkg-plist b/databases/p5-DBIWrapper/pkg-plist
index 0494d8251188..27d05e5d2dc8 100644
--- a/databases/p5-DBIWrapper/pkg-plist
+++ b/databases/p5-DBIWrapper/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/DBIWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIWrapper/ResultSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIWrapper/XMLParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/DBIWrapper/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/DBIWrapper/ResultSet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/DBIWrapper/XMLParser/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIWrapper/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIWrapper
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/DBIWrapper/XMLParser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/DBIWrapper/ResultSet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/DBIWrapper
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/DBIWrapper
+%%SITE_PERL%%/DBIWrapper.pm
+%%SITE_PERL%%/DBIWrapper/ResultSet.pm
+%%SITE_PERL%%/DBIWrapper/XMLParser.pm
+%%SITE_PERL%%/auto/DBIWrapper/autosplit.ix
+%%SITE_PERL%%/auto/DBIWrapper/ResultSet/autosplit.ix
+%%SITE_PERL%%/auto/DBIWrapper/XMLParser/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIWrapper/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIWrapper
+@dirrm %%SITE_PERL%%/auto/DBIWrapper/XMLParser
+@dirrm %%SITE_PERL%%/auto/DBIWrapper/ResultSet
+@dirrm %%SITE_PERL%%/auto/DBIWrapper
+@dirrm %%SITE_PERL%%/DBIWrapper
diff --git a/databases/p5-DBIx-AnyDBD/Makefile b/databases/p5-DBIx-AnyDBD/Makefile
index c45ad71989d3..7a68f2cba2f4 100644
--- a/databases/p5-DBIx-AnyDBD/Makefile
+++ b/databases/p5-DBIx-AnyDBD/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= svenasse@polaris.ca
COMMENT= DBD independant class
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= DBIx::AnyDBD.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBIx-AnyDBD/pkg-plist b/databases/p5-DBIx-AnyDBD/pkg-plist
index ebd4a75facfe..1a29a7ebf3da 100644
--- a/databases/p5-DBIx-AnyDBD/pkg-plist
+++ b/databases/p5-DBIx-AnyDBD/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/AnyDBD.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBIx 2>/dev/null || true
+%%SITE_PERL%%/DBIx/AnyDBD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
diff --git a/databases/p5-DBIx-Browse/Makefile b/databases/p5-DBIx-Browse/Makefile
index c05f1e1e832c..ad8d7313397d 100644
--- a/databases/p5-DBIx-Browse/Makefile
+++ b/databases/p5-DBIx-Browse/Makefile
@@ -19,7 +19,6 @@ PERL_CONFIGURE= yes
MAN3= DBIx::Browse::CGI.3 \
DBIx::Browse.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBIx-Browse/pkg-plist b/databases/p5-DBIx-Browse/pkg-plist
index a5ab968f8122..8031f6147956 100644
--- a/databases/p5-DBIx-Browse/pkg-plist
+++ b/databases/p5-DBIx-Browse/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Browse.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Browse/CGI.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/DBIx/Browse/
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/Browse/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/Browse/
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBIx 2>/dev/null || true
+%%SITE_PERL%%/DBIx/Browse.pm
+%%SITE_PERL%%/DBIx/Browse/CGI.pm
+@dirrm %%SITE_PERL%%/DBIx/Browse/
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Browse/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Browse/
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
diff --git a/databases/p5-DBIx-DBSchema/Makefile b/databases/p5-DBIx-DBSchema/Makefile
index 93c5c50b5365..13c008a60390 100644
--- a/databases/p5-DBIx-DBSchema/Makefile
+++ b/databases/p5-DBIx-DBSchema/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= An OO-interface to database schemas
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw
+BUILD_DEPENDS= ${SITE_PERL}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBIx::DBSchema.3 DBIx::DBSchema::ColGroup.3 \
DBIx::DBSchema::ColGroup::Index.3 DBIx::DBSchema::ColGroup::Unique.3 \
DBIx::DBSchema::Column.3 DBIx::DBSchema::DBD.3 \
diff --git a/databases/p5-DBIx-DBSchema/pkg-plist b/databases/p5-DBIx-DBSchema/pkg-plist
index 4c029f475cc7..e5e00912ef2e 100644
--- a/databases/p5-DBIx-DBSchema/pkg-plist
+++ b/databases/p5-DBIx-DBSchema/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/DBSchema/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/ColGroup.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/ColGroup/Unique.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/ColGroup/Index.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/Column.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/DBD.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/DBD/Pg.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/DBD/Sybase.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/DBD/mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/Table.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/DBSchema
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/ColGroup
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema/DBD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/DBIx/DBSchema
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBIx 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DBSchema/.packlist
+%%SITE_PERL%%/DBIx/DBSchema.pm
+%%SITE_PERL%%/DBIx/DBSchema/ColGroup.pm
+%%SITE_PERL%%/DBIx/DBSchema/ColGroup/Unique.pm
+%%SITE_PERL%%/DBIx/DBSchema/ColGroup/Index.pm
+%%SITE_PERL%%/DBIx/DBSchema/Column.pm
+%%SITE_PERL%%/DBIx/DBSchema/DBD.pm
+%%SITE_PERL%%/DBIx/DBSchema/DBD/Pg.pm
+%%SITE_PERL%%/DBIx/DBSchema/DBD/Sybase.pm
+%%SITE_PERL%%/DBIx/DBSchema/DBD/mysql.pm
+%%SITE_PERL%%/DBIx/DBSchema/Table.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DBSchema
+@dirrm %%SITE_PERL%%/DBIx/DBSchema/ColGroup
+@dirrm %%SITE_PERL%%/DBIx/DBSchema/DBD
+@dirrm %%SITE_PERL%%/DBIx/DBSchema
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
diff --git a/databases/p5-DBIx-DataSource/Makefile b/databases/p5-DBIx-DataSource/Makefile
index ed9c3875e052..e1ed5746b314 100644
--- a/databases/p5-DBIx-DataSource/Makefile
+++ b/databases/p5-DBIx-DataSource/Makefile
@@ -19,7 +19,6 @@ PERL_CONFIGURE= yes
MAN3= DBIx::DataSource.3 DBIx::DataSource::Driver.3 \
DBIx::DataSource::mysql.3 DBIx::DataSource::Pg.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBIx-DataSource/pkg-plist b/databases/p5-DBIx-DataSource/pkg-plist
index c765c858fa48..4b7c499d71c0 100644
--- a/databases/p5-DBIx-DataSource/pkg-plist
+++ b/databases/p5-DBIx-DataSource/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/DataSource/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DataSource.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DataSource/Driver.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DataSource/mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/DataSource/Pg.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/DataSource
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/DBIx/DataSource
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBIx 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DataSource/.packlist
+%%SITE_PERL%%/DBIx/DataSource.pm
+%%SITE_PERL%%/DBIx/DataSource/Driver.pm
+%%SITE_PERL%%/DBIx/DataSource/mysql.pm
+%%SITE_PERL%%/DBIx/DataSource/Pg.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DataSource
+@dirrm %%SITE_PERL%%/DBIx/DataSource
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
diff --git a/databases/p5-DBIx-Password/Makefile b/databases/p5-DBIx-Password/Makefile
index cbf0aa28da0f..c48c76a8a8b8 100644
--- a/databases/p5-DBIx-Password/Makefile
+++ b/databases/p5-DBIx-Password/Makefile
@@ -18,7 +18,6 @@ COMMENT= Allows you to create a global password file for DB passwords
PERL_CONFIGURE= yes
MAN3= DBIx::Password.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBIx-Password/pkg-plist b/databases/p5-DBIx-Password/pkg-plist
index ef1916b89913..5b226f6b33ff 100644
--- a/databases/p5-DBIx-Password/pkg-plist
+++ b/databases/p5-DBIx-Password/pkg-plist
@@ -1,2 +1,2 @@
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Password.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBIx 2>/dev/null || true
+%%SITE_PERL%%/DBIx/Password.pm
+@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
diff --git a/databases/p5-DBIx-Recordset/Makefile b/databases/p5-DBIx-Recordset/Makefile
index 430548be5239..a2257d8b9718 100644
--- a/databases/p5-DBIx-Recordset/Makefile
+++ b/databases/p5-DBIx-Recordset/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module for abstraction and simplification of database access
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBIx::Compat.3 DBIx::Database.3 DBIx::Intrors.3 \
DBIx::Recordset.3 DBIx::Recordset::DBSeq.3 \
DBIx::Recordset::FileSeq.3
diff --git a/databases/p5-DBIx-Recordset/pkg-plist b/databases/p5-DBIx-Recordset/pkg-plist
index dbb9070bfef0..ba9380b9033b 100644
--- a/databases/p5-DBIx-Recordset/pkg-plist
+++ b/databases/p5-DBIx-Recordset/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/Recordset/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Compat.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Database.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Intrors.pod
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Recordset.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Recordset/DBSeq.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Recordset/FileSeq.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/DBIx/Recordset
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/Recordset
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBIx 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Recordset/.packlist
+%%SITE_PERL%%/DBIx/Compat.pm
+%%SITE_PERL%%/DBIx/Database.pm
+%%SITE_PERL%%/DBIx/Intrors.pod
+%%SITE_PERL%%/DBIx/Recordset.pm
+%%SITE_PERL%%/DBIx/Recordset/DBSeq.pm
+%%SITE_PERL%%/DBIx/Recordset/FileSeq.pm
+@dirrm %%SITE_PERL%%/DBIx/Recordset
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Recordset
+@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
diff --git a/databases/p5-DBIx-SQLEngine/Makefile b/databases/p5-DBIx-SQLEngine/Makefile
index 82810ea46f7a..3128c866957d 100644
--- a/databases/p5-DBIx-SQLEngine/Makefile
+++ b/databases/p5-DBIx-SQLEngine/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/DBIx/AnyDBD.pm:${PORTSDIR}/databases/p5-DBIx-AnyDBD
${SITE_PERL}/Class/MakeMethods/Template.pm:${PORTSDIR}/devel/p5-Class-MakeMethods
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= DBIx::SQLEngine::Criteria::StringEquality.3\
@@ -38,6 +38,5 @@ MAN3= DBIx::SQLEngine::Criteria::StringEquality.3\
DBIx::SQLEngine::Mixin::SeqTable.3\
DBIx::SQLEngine.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Table/Makefile b/databases/p5-DBIx-Table/Makefile
index 8eba325ad666..de2d10a25556 100644
--- a/databases/p5-DBIx-Table/Makefile
+++ b/databases/p5-DBIx-Table/Makefile
@@ -18,6 +18,5 @@ COMMENT= Class used to represent DBI database tables
PERL_CONFIGURE= yes
MAN3= DBIx::Table.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Table/pkg-plist b/databases/p5-DBIx-Table/pkg-plist
index ee47e5d4431b..fa709ee90cdf 100644
--- a/databases/p5-DBIx-Table/pkg-plist
+++ b/databases/p5-DBIx-Table/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/Table/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/Table 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBIx 2>/dev/null || true
+%%SITE_PERL%%/DBIx/Table.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Table/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Table 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
diff --git a/databases/p5-DBIx-XML_RDB/Makefile b/databases/p5-DBIx-XML_RDB/Makefile
index b0a9ba85715f..67919fc38587 100644
--- a/databases/p5-DBIx-XML_RDB/Makefile
+++ b/databases/p5-DBIx-XML_RDB/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl extension for creating XML from existing DBI datasources
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBIx::XML_RDB.3
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBIx-XML_RDB/pkg-plist b/databases/p5-DBIx-XML_RDB/pkg-plist
index 3874100f23fd..2889440e2d97 100644
--- a/databases/p5-DBIx-XML_RDB/pkg-plist
+++ b/databases/p5-DBIx-XML_RDB/pkg-plist
@@ -1,9 +1,9 @@
bin/sql2xml.pl
bin/xml2sql.pl
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/XML_RDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/sql2xml.pl
-lib/perl5/site_perl/%%PERL_VER%%/DBIx/xml2sql.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBIx 2>/dev/null || true
+%%SITE_PERL%%/DBIx/XML_RDB.pm
+%%SITE_PERL%%/DBIx/sql2xml.pl
+%%SITE_PERL%%/DBIx/xml2sql.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
diff --git a/databases/p5-DBZ_File/Makefile b/databases/p5-DBZ_File/Makefile
index 4ac8a19e29e7..d6c521275086 100644
--- a/databases/p5-DBZ_File/Makefile
+++ b/databases/p5-DBZ_File/Makefile
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+= POLLUTE=1
WRKSRC= ${WRKDIR}/DBZ_File
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= DBZ_File.3
.include <bsd.port.post.mk>
diff --git a/databases/p5-GDBM/Makefile b/databases/p5-GDBM/Makefile
index 97924919cb27..fa34aef3af40 100644
--- a/databases/p5-GDBM/Makefile
+++ b/databases/p5-GDBM/Makefile
@@ -24,6 +24,5 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/ext/GDBM_File
MAN3= GDBM_File.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/databases/p5-GDBM/pkg-plist b/databases/p5-GDBM/pkg-plist
index b0415fe19d34..9b0fb6c1721f 100644
--- a/databases/p5-GDBM/pkg-plist
+++ b/databases/p5-GDBM/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GDBM_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
+%%SITE_PERL%%/%%PERL_ARCH%%/GDBM_File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDBM_File/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GDBM_File
diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index 68396e211fc3..5304ab1380ba 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -15,19 +15,18 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= MLDBM::Sync - safe concurrent access to MLDBM databases
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM
+BUILD_DEPENDS= ${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= MLDBM::Sync.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
.endif
.include <bsd.port.post.mk>
diff --git a/databases/p5-MLDBM-Sync/pkg-plist b/databases/p5-MLDBM-Sync/pkg-plist
index d680c8d91122..609fe1aebeeb 100644
--- a/databases/p5-MLDBM-Sync/pkg-plist
+++ b/databases/p5-MLDBM-Sync/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Sync.pm
-lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Sync/SDBM_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MLDBM/Sync/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MLDBM/Sync
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MLDBM 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Sync
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MLDBM 2>/dev/null || true
+%%SITE_PERL%%/MLDBM/Sync.pm
+%%SITE_PERL%%/MLDBM/Sync/SDBM_File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM/Sync/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM/Sync
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM 2>/dev/null || true
+@dirrm %%SITE_PERL%%/MLDBM/Sync
+@unexec rmdir %D/%%SITE_PERL%%/MLDBM 2>/dev/null || true
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 722f8bfd2c31..7dd977f46392 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -15,19 +15,18 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Store multi-level hash structure in single level tied hash
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw
+BUILD_DEPENDS= ${SITE_PERL}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= MLDBM.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.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/databases/p5-MLDBM/pkg-plist b/databases/p5-MLDBM/pkg-plist
index 7dbbc232f971..fcd37c5735aa 100644
--- a/databases/p5-MLDBM/pkg-plist
+++ b/databases/p5-MLDBM/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/MLDBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer/FreezeThaw.pm
-lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer/Storable.pm
-lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer/Data/Dumper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MLDBM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MLDBM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer/Data
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MLDBM
+%%SITE_PERL%%/MLDBM.pm
+%%SITE_PERL%%/MLDBM/Serializer/FreezeThaw.pm
+%%SITE_PERL%%/MLDBM/Serializer/Storable.pm
+%%SITE_PERL%%/MLDBM/Serializer/Data/Dumper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM
+@dirrm %%SITE_PERL%%/MLDBM/Serializer/Data
+@dirrm %%SITE_PERL%%/MLDBM/Serializer
+@dirrm %%SITE_PERL%%/MLDBM
diff --git a/databases/p5-Metadata/Makefile b/databases/p5-Metadata/Makefile
index 2341a00b4518..461a82f1a91d 100644
--- a/databases/p5-Metadata/Makefile
+++ b/databases/p5-Metadata/Makefile
@@ -18,13 +18,12 @@ COMMENT= Perl implementation of Dublin Core compatible metadata
BUILD_DEPENDS= ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Metadata::Base.3 \
Metadata::HTTP.3 \
Metadata::IAFA.3 \
Metadata::SOIF.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/databases/p5-Metadata/pkg-plist b/databases/p5-Metadata/pkg-plist
index a344bcaca5b4..afed4d7021b1 100644
--- a/databases/p5-Metadata/pkg-plist
+++ b/databases/p5-Metadata/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Metadata/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Metadata/HTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Metadata/IAFA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Metadata/SOIF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Metadata/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Metadata
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Metadata
+%%SITE_PERL%%/Metadata/Base.pm
+%%SITE_PERL%%/Metadata/HTTP.pm
+%%SITE_PERL%%/Metadata/IAFA.pm
+%%SITE_PERL%%/Metadata/SOIF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Metadata/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Metadata
+@dirrm %%SITE_PERL%%/Metadata
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index f8533e43c4e5..6e36aa940b1a 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -16,7 +16,7 @@ DISTNAME= Msql-Mysql-modules-${PORTVERSION}
MAINTAINER= jedgar@FreeBSD.org
COMMENT= Perl5 modules for accessing MySQL databases
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable
+BUILD_DEPENDS= ${SITE_PERL}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable
RUN_DEPENDS= ${BUILD_DEPENDS}
.include <bsd.port.pre.mk>
diff --git a/databases/p5-Mysql/pkg-plist b/databases/p5-Mysql/pkg-plist
index cebf02907e5a..28eb305dd2e5 100644
--- a/databases/p5-Mysql/pkg-plist
+++ b/databases/p5-Mysql/pkg-plist
@@ -1,14 +1,14 @@
bin/dbimon
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/DBD/mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/DBD
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Mysql.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBD/mysql.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/mysql.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mysql/Statement.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/mysql
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Mysql
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBD
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index 837deba5e469..a2f593ccdeb9 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= POE interface to Round Robin Database Tools
-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 \
${LOCALBASE}/bin/rrdtool:${PORTSDIR}/net/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/databases/p5-POE-Component-RRDTool/pkg-plist b/databases/p5-POE-Component-RRDTool/pkg-plist
index 975c5b42eda6..ae6853c7d35f 100644
--- a/databases/p5-POE-Component-RRDTool/pkg-plist
+++ b/databases/p5-POE-Component-RRDTool/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/RRDTool.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool
-@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
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist
+%%SITE_PERL%%/POE/Component/RRDTool.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool
+@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/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index a6fb5cd38a94..3e0c772a8a30 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
USE_PERL5= yes
MAN3= Pg.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERL_CONFIGURE= YES
CONFIGURE_ENV= POSTGRES_INCLUDE=${LOCALBASE}/include POSTGRES_LIB=${LOCALBASE}/lib
diff --git a/databases/p5-Pg/pkg-plist b/databases/p5-Pg/pkg-plist
index 7e1038624cc8..adc7f9fe797d 100644
--- a/databases/p5-Pg/pkg-plist
+++ b/databases/p5-Pg/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Pg.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg/Pg.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg/Pg.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg
+%%SITE_PERL%%/%%PERL_ARCH%%/Pg.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pg/Pg.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pg/Pg.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pg/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pg/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pg
diff --git a/databases/p5-ResourcePool-Resource-DBI/Makefile b/databases/p5-ResourcePool-Resource-DBI/Makefile
index aef6635ca359..5b70e4262868 100644
--- a/databases/p5-ResourcePool-Resource-DBI/Makefile
+++ b/databases/p5-ResourcePool-Resource-DBI/Makefile
@@ -16,12 +16,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= ResourcePool::Resource::DBI - A ResourcePool wrapper for DBI
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool
+BUILD_DEPENDS= ${SITE_PERL}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= ResourcePool::Resource::DBI.3 ResourcePool::Factory::DBI.3 \
ResourcePool::Command::DBI::Execute.3 ResourcePool::Command::DBI::Select.3 \
ResourcePool::Command::DBI::SelectRow.3
diff --git a/databases/p5-ResourcePool-Resource-DBI/pkg-plist b/databases/p5-ResourcePool-Resource-DBI/pkg-plist
index 5d779664fb7d..e2fcb2a34551 100644
--- a/databases/p5-ResourcePool-Resource-DBI/pkg-plist
+++ b/databases/p5-ResourcePool-Resource-DBI/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/DBI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/DBI/Execute.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/DBI/SelectRow.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/DBI/Select.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/DBI/Select.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/DBI/SelectRow.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/DBI/Execute.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/DBI/Common.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/DBI.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/DBI.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/DBI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/DBI
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/DBI/.packlist
+%%SITE_PERL%%/ResourcePool/Command/DBI/Execute.pm
+%%SITE_PERL%%/ResourcePool/Command/DBI/SelectRow.pod
+%%SITE_PERL%%/ResourcePool/Command/DBI/Select.pod
+%%SITE_PERL%%/ResourcePool/Command/DBI/Select.pm
+%%SITE_PERL%%/ResourcePool/Command/DBI/SelectRow.pm
+%%SITE_PERL%%/ResourcePool/Command/DBI/Execute.pod
+%%SITE_PERL%%/ResourcePool/Command/DBI/Common.pm
+%%SITE_PERL%%/ResourcePool/Resource/DBI.pm
+%%SITE_PERL%%/ResourcePool/Resource/DBI.pod
+%%SITE_PERL%%/ResourcePool/Factory/DBI.pm
+%%SITE_PERL%%/ResourcePool/Factory/DBI.pod
+@dirrm %%SITE_PERL%%/ResourcePool/Command/DBI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/DBI
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true
diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile
index 1c12384daf88..3459fef44d41 100644
--- a/databases/p5-SQL-Abstract/Makefile
+++ b/databases/p5-SQL-Abstract/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl extension to generate SQL from Perl data structures
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= SQL::Abstract.3
.include <bsd.port.mk>
diff --git a/databases/p5-SQL-Abstract/pkg-plist b/databases/p5-SQL-Abstract/pkg-plist
index 00e745551201..22e7cf3ea4b3 100644
--- a/databases/p5-SQL-Abstract/pkg-plist
+++ b/databases/p5-SQL-Abstract/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SQL/Abstract/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/SQL/Abstract.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SQL/Abstract
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SQL 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SQL 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Abstract/.packlist
+%%SITE_PERL%%/SQL/Abstract.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Abstract
+@unexec rmdir %D/%%SITE_PERL%%/SQL 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL 2>/dev/null || true
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 55826af0746e..fde27c99d220 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -17,7 +17,6 @@ COMMENT= A perl5 module for SQL parsing and processing
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= SQL::Dialects::ANSI.3 SQL::Dialects::AnyData.3 \
SQL::Dialects::CSV.3 SQL::Eval.3 SQL::Parser.3 SQL::Statement.3
diff --git a/databases/p5-SQL-Statement/pkg-plist b/databases/p5-SQL-Statement/pkg-plist
index 9904cde0a0e4..028537be3adf 100644
--- a/databases/p5-SQL-Statement/pkg-plist
+++ b/databases/p5-SQL-Statement/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/SQL/Dialects/ANSI.pm
-lib/perl5/site_perl/%%PERL_VER%%/SQL/Dialects/AnyData.pm
-lib/perl5/site_perl/%%PERL_VER%%/SQL/Dialects/CSV.pm
-lib/perl5/site_perl/%%PERL_VER%%/SQL/Eval.pm
-lib/perl5/site_perl/%%PERL_VER%%/SQL/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/SQL/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/SQL/Statement/GetInfo.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SQL/Statement
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SQL/Dialects 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SQL 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SQL/Statement/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SQL/Statement
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SQL/Statement 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SQL 2>/dev/null || true
+%%SITE_PERL%%/SQL/Dialects/ANSI.pm
+%%SITE_PERL%%/SQL/Dialects/AnyData.pm
+%%SITE_PERL%%/SQL/Dialects/CSV.pm
+%%SITE_PERL%%/SQL/Eval.pm
+%%SITE_PERL%%/SQL/Parser.pm
+%%SITE_PERL%%/SQL/Statement.pm
+%%SITE_PERL%%/SQL/Statement/GetInfo.pm
+@dirrm %%SITE_PERL%%/SQL/Statement
+@unexec rmdir %D/%%SITE_PERL%%/SQL/Dialects 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/SQL 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Statement/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Statement
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Statement 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL 2>/dev/null || true
diff --git a/databases/p5-Search-Namazu/Makefile b/databases/p5-Search-Namazu/Makefile
index 62e715f0806a..4e8e629fb65e 100644
--- a/databases/p5-Search-Namazu/Makefile
+++ b/databases/p5-Search-Namazu/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
PERL_CONFIGURE= YES
CONFIGURE_ENV= PREFIX=${PREFIX}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Search::Namazu.3
.include <bsd.port.mk>
diff --git a/databases/p5-Search-Namazu/pkg-plist b/databases/p5-Search-Namazu/pkg-plist
index 16166779a1b6..1f7aa662d663 100644
--- a/databases/p5-Search-Namazu/pkg-plist
+++ b/databases/p5-Search-Namazu/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Search/Namazu.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Namazu/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Namazu/Namazu.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Namazu/Namazu.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Namazu
-@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%%/%%PERL_ARCH%%/Search 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Search/Namazu.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu/Namazu.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu/Namazu.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Search 2>/dev/null || true
diff --git a/databases/p5-Tangram/Makefile b/databases/p5-Tangram/Makefile
index 564042da3573..ed1f191f011a 100644
--- a/databases/p5-Tangram/Makefile
+++ b/databases/p5-Tangram/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Orthogonal Object Persistence in Relational Databases
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Set/Object.pm:${PORTSDIR}/devel/p5-Set-Object
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Set/Object.pm:${PORTSDIR}/devel/p5-Set-Object
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tangram.3 Tangram::Array.3 Tangram::Core.3 Tangram::Cursor.3 \
Tangram::DateTime.3 Tangram::Deploy.3 Tangram::Dialect.3 \
Tangram::Expr.3 Tangram::FlatArray.3 Tangram::FlatHash.3 \
diff --git a/databases/p5-Tangram/pkg-plist b/databases/p5-Tangram/pkg-plist
index a31f28da3bd9..c83bc9b51051 100644
--- a/databases/p5-Tangram/pkg-plist
+++ b/databases/p5-Tangram/pkg-plist
@@ -1,65 +1,65 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tangram/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Tangram.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/AbstractArray.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/AbstractHash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/AbstractSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Array.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Array.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Coll.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Core.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Core.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Cursor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Cursor.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/DMDateTime.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/DateTime.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Deploy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Deploy.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Dialect.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Expr.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/FlatArray.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/FlatArray.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/FlatHash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/FlatHash.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/IntrArray.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/IntrArray.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/IntrHash.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/IntrSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/IntrSet.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/PerlDump.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/PerlDump.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/RawDate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/RawDateTime.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/RawTime.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Ref.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Ref.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Relational.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Relational.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Relational/Engine.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Relational/Mappings.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Remote.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Scalar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Scalar.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Schema.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Schema.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Set.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Set.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Springfield.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Springfield.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Storage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Storage.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Sybase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Sybase.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Tour.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Type.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Type.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/Type/Extending.pod
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tangram/mysql.pod
-lib/perl5/site_perl/%%PERL_VER%%/auto/Tangram/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Tangram/Relational
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Tangram/Type
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Tangram
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tangram
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tangram/.packlist
+%%SITE_PERL%%/Tangram.pm
+%%SITE_PERL%%/Tangram.pod
+%%SITE_PERL%%/Tangram/AbstractArray.pm
+%%SITE_PERL%%/Tangram/AbstractHash.pm
+%%SITE_PERL%%/Tangram/AbstractSet.pm
+%%SITE_PERL%%/Tangram/Array.pm
+%%SITE_PERL%%/Tangram/Array.pod
+%%SITE_PERL%%/Tangram/Coll.pm
+%%SITE_PERL%%/Tangram/Core.pm
+%%SITE_PERL%%/Tangram/Core.pod
+%%SITE_PERL%%/Tangram/Cursor.pm
+%%SITE_PERL%%/Tangram/Cursor.pod
+%%SITE_PERL%%/Tangram/DMDateTime.pm
+%%SITE_PERL%%/Tangram/DateTime.pod
+%%SITE_PERL%%/Tangram/Deploy.pm
+%%SITE_PERL%%/Tangram/Deploy.pod
+%%SITE_PERL%%/Tangram/Dialect.pod
+%%SITE_PERL%%/Tangram/Expr.pm
+%%SITE_PERL%%/Tangram/Expr.pod
+%%SITE_PERL%%/Tangram/FlatArray.pm
+%%SITE_PERL%%/Tangram/FlatArray.pod
+%%SITE_PERL%%/Tangram/FlatHash.pm
+%%SITE_PERL%%/Tangram/FlatHash.pod
+%%SITE_PERL%%/Tangram/Hash.pm
+%%SITE_PERL%%/Tangram/IntrArray.pm
+%%SITE_PERL%%/Tangram/IntrArray.pod
+%%SITE_PERL%%/Tangram/IntrHash.pm
+%%SITE_PERL%%/Tangram/IntrSet.pm
+%%SITE_PERL%%/Tangram/IntrSet.pod
+%%SITE_PERL%%/Tangram/PerlDump.pm
+%%SITE_PERL%%/Tangram/PerlDump.pod
+%%SITE_PERL%%/Tangram/RawDate.pm
+%%SITE_PERL%%/Tangram/RawDateTime.pm
+%%SITE_PERL%%/Tangram/RawTime.pm
+%%SITE_PERL%%/Tangram/Ref.pm
+%%SITE_PERL%%/Tangram/Ref.pod
+%%SITE_PERL%%/Tangram/Relational.pm
+%%SITE_PERL%%/Tangram/Relational.pod
+%%SITE_PERL%%/Tangram/Relational/Engine.pm
+%%SITE_PERL%%/Tangram/Relational/Mappings.pod
+%%SITE_PERL%%/Tangram/Remote.pod
+%%SITE_PERL%%/Tangram/Scalar.pm
+%%SITE_PERL%%/Tangram/Scalar.pod
+%%SITE_PERL%%/Tangram/Schema.pm
+%%SITE_PERL%%/Tangram/Schema.pod
+%%SITE_PERL%%/Tangram/Set.pm
+%%SITE_PERL%%/Tangram/Set.pod
+%%SITE_PERL%%/Tangram/Springfield.pm
+%%SITE_PERL%%/Tangram/Springfield.pod
+%%SITE_PERL%%/Tangram/Storage.pm
+%%SITE_PERL%%/Tangram/Storage.pod
+%%SITE_PERL%%/Tangram/Sybase.pm
+%%SITE_PERL%%/Tangram/Sybase.pod
+%%SITE_PERL%%/Tangram/Tour.pod
+%%SITE_PERL%%/Tangram/Type.pm
+%%SITE_PERL%%/Tangram/Type.pod
+%%SITE_PERL%%/Tangram/Type/Extending.pod
+%%SITE_PERL%%/Tangram/mysql.pm
+%%SITE_PERL%%/Tangram/mysql.pod
+%%SITE_PERL%%/auto/Tangram/autosplit.ix
+@dirrm %%SITE_PERL%%/Tangram/Relational
+@dirrm %%SITE_PERL%%/Tangram/Type
+@dirrm %%SITE_PERL%%/Tangram
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tangram
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index a31887e6b92b..63c1aa4aba04 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Text-Query-SQL provides query builders for SQL databases
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Query.pm:${PORTSDIR}/textproc/p5-Text-Query
+BUILD_DEPENDS= ${SITE_PERL}/Text/Query.pm:${PORTSDIR}/textproc/p5-Text-Query
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -24,7 +24,6 @@ MAN3= Text::Query::BuildSQLMifluz.3 Text::Query::BuildSQLMySQL.3 \
Text::Query::BuildSQLFulcrum.3 Text::Query::BuildSQL.3 \
Text::Query::BuildSQLPg.3 Text::Query::SolveSQL.3 \
Bundle::Text::Query::BuildSQL.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@${PERL} -pi -e '/DBI/ and $$_=""' ${WRKSRC}/Makefile.PL
diff --git a/databases/p5-Text-Query-SQL/pkg-plist b/databases/p5-Text-Query-SQL/pkg-plist
index 52336fa11d42..c464700811a9 100644
--- a/databases/p5-Text-Query-SQL/pkg-plist
+++ b/databases/p5-Text-Query-SQL/pkg-plist
@@ -1,13 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Query/SQL/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildSQLMifluz.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildSQLMySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildSQLFulcrum.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildSQLPg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/SolveSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/Text/Query/BuildSQL.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Query/SQL
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle/Text/Query 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/Query 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query/SQL/.packlist
+%%SITE_PERL%%/Text/Query/BuildSQLMifluz.pm
+%%SITE_PERL%%/Text/Query/BuildSQLMySQL.pm
+%%SITE_PERL%%/Text/Query/BuildSQLFulcrum.pm
+%%SITE_PERL%%/Text/Query/BuildSQL.pm
+%%SITE_PERL%%/Text/Query/BuildSQLPg.pm
+%%SITE_PERL%%/Text/Query/SolveSQL.pm
+%%SITE_PERL%%/Bundle/Text/Query/BuildSQL.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query/SQL
+@unexec rmdir %D/%%SITE_PERL%%/Bundle/Text/Query 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text/Query 2>/dev/null || true
diff --git a/databases/p5-Tie-DBI/Makefile b/databases/p5-Tie-DBI/Makefile
index 760642c5bbfe..d3bd2138ab47 100644
--- a/databases/p5-Tie-DBI/Makefile
+++ b/databases/p5-Tie-DBI/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module implementing Tie hash to a DBI handle
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tie::RDBM.3 Tie::DBI.3
.include <bsd.port.mk>
diff --git a/databases/p5-Time-Piece-MySQL/Makefile b/databases/p5-Time-Piece-MySQL/Makefile
index ff7a55c76c35..6412780ea715 100644
--- a/databases/p5-Time-Piece-MySQL/Makefile
+++ b/databases/p5-Time-Piece-MySQL/Makefile
@@ -21,6 +21,5 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Time::Piece::MySQL.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/databases/p5-hp200lx-db/Makefile b/databases/p5-hp200lx-db/Makefile
index 93b516d5825c..c59aff20a326 100644
--- a/databases/p5-hp200lx-db/Makefile
+++ b/databases/p5-hp200lx-db/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to handle HP 200LX palmtop computer databases
PERL_CONFIGURE= yes
MAN3= HP200LX::DB.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/databases/p5-hp200lx-db/pkg-plist b/databases/p5-hp200lx-db/pkg-plist
index 05a874e5eec6..4c373f6cb1aa 100644
--- a/databases/p5-hp200lx-db/pkg-plist
+++ b/databases/p5-hp200lx-db/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HP200LX/DB/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DB.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DB/adb.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DB/recurrence.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DB/tools.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DB/vpt.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DB/diag.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DBgui.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DBgui/card.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DBgui/list.pm
-lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DBgui/vpt.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HP200LX/DB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HP200LX
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HP200LX/DBgui
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HP200LX
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HP200LX/DB/.packlist
+%%SITE_PERL%%/HP200LX/DB.pm
+%%SITE_PERL%%/HP200LX/DB/adb.pm
+%%SITE_PERL%%/HP200LX/DB/recurrence.pm
+%%SITE_PERL%%/HP200LX/DB/tools.pm
+%%SITE_PERL%%/HP200LX/DB/vpt.pm
+%%SITE_PERL%%/HP200LX/DB/diag.pm
+%%SITE_PERL%%/HP200LX/DBgui.pm
+%%SITE_PERL%%/HP200LX/DBgui/card.pm
+%%SITE_PERL%%/HP200LX/DBgui/list.pm
+%%SITE_PERL%%/HP200LX/DBgui/vpt.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HP200LX/DB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HP200LX
+@dirrm %%SITE_PERL%%/HP200LX/DB
+@dirrm %%SITE_PERL%%/HP200LX/DBgui
+@dirrm %%SITE_PERL%%/HP200LX
diff --git a/databases/p5-sqlrelay/pkg-plist b/databases/p5-sqlrelay/pkg-plist
index d12657193efc..24f7f0f3fed2 100644
--- a/databases/p5-sqlrelay/pkg-plist
+++ b/databases/p5-sqlrelay/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/%%PERL_VER%%/DBD/SQLRelay.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/DBD 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLRelay/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/SQLRelay
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Firstworks/SQLRConnection.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/SQLRConnection.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/SQLRConnection.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Firstworks/SQLRCursor.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/SQLRCursor.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/SQLRCursor.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Firstworks 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Firstworks 2>/dev/null || true
+%%SITE_PERL%%/DBD/SQLRelay.pm
+@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLRelay/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLRelay
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Firstworks/SQLRConnection.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/SQLRConnection.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/SQLRConnection.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection
+%%SITE_PERL%%/%%PERL_ARCH%%/Firstworks/SQLRCursor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/SQLRCursor.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/SQLRCursor.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Firstworks 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks 2>/dev/null || true
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 7a36ca57d586..6e2f0dcb4585 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -102,7 +102,7 @@ CXX= ${CC}
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha
diff --git a/databases/postgresql_autodoc/Makefile b/databases/postgresql_autodoc/Makefile
index c9cb9ead2479..361554cdbc9e 100644
--- a/databases/postgresql_autodoc/Makefile
+++ b/databases/postgresql_autodoc/Makefile
@@ -14,8 +14,8 @@ DIST_SUBDIR= postgresql
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Automatic documentation generator for postgresql databases
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
+ ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 579be8a0753f..a84a6d29e72e 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -73,16 +73,16 @@ share/doc/rrdtool/html/rrdtutorial.es.html
share/doc/rrdtool/html/RRDs.html
share/doc/rrdtool/html/RRDp.html
share/doc/rrdtool/html/rrdxport.html
-lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/RRDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+%%SITE_PERL%%/RRDp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
@dirrm share/examples/rrdtool/trytime
@dirrm share/examples/rrdtool
@dirrm share/doc/rrdtool/html
@dirrm share/doc/rrdtool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/databases/rrdtool10/pkg-plist b/databases/rrdtool10/pkg-plist
index 579be8a0753f..a84a6d29e72e 100644
--- a/databases/rrdtool10/pkg-plist
+++ b/databases/rrdtool10/pkg-plist
@@ -73,16 +73,16 @@ share/doc/rrdtool/html/rrdtutorial.es.html
share/doc/rrdtool/html/RRDs.html
share/doc/rrdtool/html/RRDp.html
share/doc/rrdtool/html/rrdxport.html
-lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/RRDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+%%SITE_PERL%%/RRDp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
@dirrm share/examples/rrdtool/trytime
@dirrm share/examples/rrdtool
@dirrm share/doc/rrdtool/html
@dirrm share/doc/rrdtool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/deskutils/dailystrips/Makefile b/deskutils/dailystrips/Makefile
index e0f5964cf33f..a15528f63257 100644
--- a/deskutils/dailystrips/Makefile
+++ b/deskutils/dailystrips/Makefile
@@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
COMMENT= Utility to download or view your favorite online comic strips daily
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
NO_BUILD= yes
USE_PERL5= yes
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
diff --git a/dns/dnssecwalker/Makefile b/dns/dnssecwalker/Makefile
index e4fd227514ae..2017409905ff 100644
--- a/dns/dnssecwalker/Makefile
+++ b/dns/dnssecwalker/Makefile
@@ -15,7 +15,7 @@ DISTNAME= walker-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= DNSSEC Walker
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
USE_PERL5= yes
NO_BUILD= yes
diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile
index b33999023f1a..788e3d10bb59 100644
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.visi.com/~barr/dnswalk/
MAINTAINER= mph@freebsd.org
COMMENT= DNS debugger - requests a zone transfer and analyzes the result
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
NO_WRKSUBDIR= YES
NO_BUILD= YES
diff --git a/dns/p5-BIND-Conf_Parser/Makefile b/dns/p5-BIND-Conf_Parser/Makefile
index 78071d4f3be8..9d0f1c715d78 100644
--- a/dns/p5-BIND-Conf_Parser/Makefile
+++ b/dns/p5-BIND-Conf_Parser/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to parse BIND 8 configuration files
PERL_CONFIGURE= yes
MAN3= BIND::Conf_Parser.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/dns/p5-BIND-Conf_Parser/pkg-plist b/dns/p5-BIND-Conf_Parser/pkg-plist
index f543b76718f7..3738883e119e 100644
--- a/dns/p5-BIND-Conf_Parser/pkg-plist
+++ b/dns/p5-BIND-Conf_Parser/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/BIND/Conf_Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/BIND
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser
+%%SITE_PERL%%/BIND/Conf_Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser/.packlist
+@dirrm %%SITE_PERL%%/BIND
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser
diff --git a/dns/p5-Net-DNS-ZoneFile/Makefile b/dns/p5-Net-DNS-ZoneFile/Makefile
index a2c859789380..92b0edfae44b 100644
--- a/dns/p5-Net-DNS-ZoneFile/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+SITE_PERL= ${SITE_PERL}
MAN3= Net::DNS::ZoneFile.3
post-patch:
diff --git a/dns/p5-Net-DNS-ZoneFile/pkg-plist b/dns/p5-Net-DNS-ZoneFile/pkg-plist
index d70a2acbae76..543e3047902f 100644
--- a/dns/p5-Net-DNS-ZoneFile/pkg-plist
+++ b/dns/p5-Net-DNS-ZoneFile/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/DNS/ZoneFile.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/DNS 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile/.packlist
+%%SITE_PERL%%/Net/DNS/ZoneFile.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile
+@unexec rmdir %D/%%SITE_PERL%%/Net/DNS 2>/dev/null || true
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index e5f3e28817a9..68b8e60ad629 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC
PERL_CONFIGURE= yes
CONFIGURE_ARGS+=--pm
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::DNS.3 Net::DNS::Header.3 Net::DNS::Packet.3 \
Net::DNS::Question.3 Net::DNS::RR.3 Net::DNS::RR::A.3 \
diff --git a/dns/p5-Tie-DNS/Makefile b/dns/p5-Tie-DNS/Makefile
index e18f5de0aac3..09365a36b341 100644
--- a/dns/p5-Tie-DNS/Makefile
+++ b/dns/p5-Tie-DNS/Makefile
@@ -18,12 +18,11 @@ COMMENT= Tie interface to p5-Net-DNS
BUILD_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
EXAMPLESDIR?= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
PERL_CONFIGURE= yes
MAN3= Tie::DNS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/dns/p5-Tie-DNS/pkg-plist b/dns/p5-Tie-DNS/pkg-plist
index 73a186a3ba63..fab71504d04d 100644
--- a/dns/p5-Tie-DNS/pkg-plist
+++ b/dns/p5-Tie-DNS/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/DNS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Tie/DNS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS/.packlist
+%%SITE_PERL%%/Tie/DNS.pm
%%PORTDOCS%%share/examples/p5-Tie-DNS/example1.pl
%%PORTDOCS%%share/examples/p5-Tie-DNS/example2.pl
%%PORTDOCS%%share/examples/p5-Tie-DNS/example3.pl
@@ -7,7 +7,7 @@ lib/perl5/site_perl/%%PERL_VER%%/Tie/DNS.pm
%%PORTDOCS%%share/examples/p5-Tie-DNS/example5.pl
%%PORTDOCS%%share/examples/p5-Tie-DNS/example6.pl
%%PORTDOCS%%share/examples/p5-Tie-DNS/example7.pl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/DNS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/share/examples/p5-Tie-DNS 2>/dev/null || true
diff --git a/dns/sleuth/Makefile b/dns/sleuth/Makefile
index c885360af6ac..6d3162e734a6 100644
--- a/dns/sleuth/Makefile
+++ b/dns/sleuth/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/
MAINTAINER= markp@FreeBSD.org
COMMENT= A tool for checking DNS zones
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
USE_PERL5= yes
diff --git a/finance/p5-Business-CreditCard/Makefile b/finance/p5-Business-CreditCard/Makefile
index 4d0eb785256f..b969db700d8d 100644
--- a/finance/p5-Business-CreditCard/Makefile
+++ b/finance/p5-Business-CreditCard/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 module to validate/generate credit card checksums/names
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Business::CreditCard.3
.include <bsd.port.mk>
diff --git a/finance/p5-Business-CreditCard/pkg-plist b/finance/p5-Business-CreditCard/pkg-plist
index 7e378dff00e8..1e4fd4adc9b1 100644
--- a/finance/p5-Business-CreditCard/pkg-plist
+++ b/finance/p5-Business-CreditCard/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/CreditCard.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/CreditCard/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/CreditCard
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business 2>/dev/null || true
+%%SITE_PERL%%/Business/CreditCard.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/CreditCard/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/CreditCard
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
index 493ffa581b9a..35ed06f86ce4 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/2CheckOut.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/2CheckOut/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/2CheckOut
+%%SITE_PERL%%/Business/OnlinePayment/2CheckOut.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/2CheckOut/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/2CheckOut
@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist b/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
index 50f1b84189cd..777449e73911 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/AuthorizeNet.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/AuthorizeNet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/AuthorizeNet
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/AuthorizeNet.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/AuthorizeNet/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/AuthorizeNet
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist b/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
index b68a0cd10e1b..137530e67f43 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/BankOfAmerica.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/BankOfAmerica/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/BankOfAmerica
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/BankOfAmerica.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/BankOfAmerica/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/BankOfAmerica
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist b/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
index 921153dae2f5..0b67429a01cf 100644
--- a/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/Beanstream.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Beanstream/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Beanstream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/Beanstream.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/Beanstream/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Beanstream
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist b/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
index af9de49deade..06fdb0b47c38 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/Cardstream.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Cardstream/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Cardstream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/Cardstream.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/Cardstream/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Cardstream
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-Jettis/pkg-plist b/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
index 37d73b3e5fc3..f96f934eca99 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/Jettis.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Jettis/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Jettis
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/Jettis.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/Jettis/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Jettis
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
index 68a5a04ffba6..0e48d959feee 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/LinkPoint.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/LinkPoint/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/LinkPoint
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/LinkPoint.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/LinkPoint/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/LinkPoint
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
index 59ee55516fd4..c244efd14859 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/MerchantCommerce.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/MerchantCommerce/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/MerchantCommerce
+%%SITE_PERL%%/Business/OnlinePayment/MerchantCommerce.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/MerchantCommerce/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/MerchantCommerce
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist b/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
index 72f2730b9c3d..d733e8a6142b 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/Network1Financial.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Network1Financial/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/Network1Financial
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/Network1Financial.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/Network1Financial/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Network1Financial
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist b/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
index 2221cd75a575..096b70a83566 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/PayConnect.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/PayConnect/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/PayConnect
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/PayConnect.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/PayConnect/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/PayConnect
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist b/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
index 67e43b5ff8ec..3243f897c03d 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/PaymentsGateway.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/PaymentsGateway/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/PaymentsGateway
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/PaymentsGateway.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/PaymentsGateway/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/PaymentsGateway
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
index 112e1772d159..bceac1e33d7a 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/SurePay.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay
+%%SITE_PERL%%/Business/OnlinePayment/SurePay.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay
@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-TCLink/pkg-plist b/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
index 3b2a8627c8a2..b810b118954c 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/TCLink.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/TCLink/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/TCLink
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/TCLink.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/TCLink/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/TCLink
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist b/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
index d11416b0fe99..9f732513f9d8 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/VirtualNet.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/VirtualNet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/VirtualNet
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/VirtualNet.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/VirtualNet/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/VirtualNet
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment-eSec/pkg-plist b/finance/p5-Business-OnlinePayment-eSec/pkg-plist
index 0211119016a0..38c055d1ba3b 100644
--- a/finance/p5-Business-OnlinePayment-eSec/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-eSec/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/eSec.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/eSec/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/eSec
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
+%%SITE_PERL%%/Business/OnlinePayment/eSec.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/eSec/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/eSec
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
diff --git a/finance/p5-Business-OnlinePayment/pkg-plist b/finance/p5-Business-OnlinePayment/pkg-plist
index 54531fc978c1..acce58f6a7cc 100644
--- a/finance/p5-Business-OnlinePayment/pkg-plist
+++ b/finance/p5-Business-OnlinePayment/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Business
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business
+%%SITE_PERL%%/Business/OnlinePayment.pm
+%%SITE_PERL%%/auto/Business/OnlinePayment/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Business
+@dirrm %%SITE_PERL%%/auto/Business/OnlinePayment
+@dirrm %%SITE_PERL%%/auto/Business
diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index 8a0147932420..9f90512f3efa 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${SITE_PERL}/Business/CreditCard.pm:${PORTSDIR}/finance/p5-Busine
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Business::WorldPay::Junior.3
diff --git a/finance/p5-Finance-Currency-Convert/Makefile b/finance/p5-Finance-Currency-Convert/Makefile
index 4ab058133e71..2c0b78df88c3 100644
--- a/finance/p5-Finance-Currency-Convert/Makefile
+++ b/finance/p5-Finance-Currency-Convert/Makefile
@@ -19,6 +19,5 @@ COMMENT= Convert currencies and fetch their exchange rates
PERL_CONFIGURE= yes
MAN3= Finance::Currency::Convert.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/finance/p5-Finance-Currency-Convert/pkg-plist b/finance/p5-Finance-Currency-Convert/pkg-plist
index 73fda488e846..0f529d8b2deb 100644
--- a/finance/p5-Finance-Currency-Convert/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Currency/Convert.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency/Convert/autosplit.ix
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/.packlist
+%%SITE_PERL%%/Finance/Currency/Convert.pm
+%%SITE_PERL%%/auto/Finance/Currency/Convert/autosplit.ix
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance/Currency/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile
index e059a4582ad7..286dc2e5c6e6 100644
--- a/finance/p5-Finance-Quote/Makefile
+++ b/finance/p5-Finance-Quote/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Get stock and mutual fund quotes from various exchanges
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
+ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Finance::Quote.3 Finance::Quote::AEX.3 Finance::Quote::ASX.3 \
Finance::Quote::Cdnfundlibrary.3 Finance::Quote::DWS.3 \
Finance::Quote::Fidelity.3 Finance::Quote::Fool.3 \
diff --git a/finance/p5-Finance-Quote/pkg-plist b/finance/p5-Finance-Quote/pkg-plist
index fa2532f90873..14061834195d 100644
--- a/finance/p5-Finance-Quote/pkg-plist
+++ b/finance/p5-Finance-Quote/pkg-plist
@@ -1,24 +1,24 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Quote/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/AEX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/ASX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Cdnfundlibrary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/DWS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Fidelity.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Fool.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Tdwaterhouse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Tiaacref.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Troweprice.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Trustnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/VWD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Asia.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Australia.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Europe.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/USA.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Quote
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Quote/.packlist
+%%SITE_PERL%%/Finance/Quote.pm
+%%SITE_PERL%%/Finance/Quote/AEX.pm
+%%SITE_PERL%%/Finance/Quote/ASX.pm
+%%SITE_PERL%%/Finance/Quote/Cdnfundlibrary.pm
+%%SITE_PERL%%/Finance/Quote/DWS.pm
+%%SITE_PERL%%/Finance/Quote/Fidelity.pm
+%%SITE_PERL%%/Finance/Quote/Fool.pm
+%%SITE_PERL%%/Finance/Quote/Tdwaterhouse.pm
+%%SITE_PERL%%/Finance/Quote/Tiaacref.pm
+%%SITE_PERL%%/Finance/Quote/Troweprice.pm
+%%SITE_PERL%%/Finance/Quote/Trustnet.pm
+%%SITE_PERL%%/Finance/Quote/UserAgent.pm
+%%SITE_PERL%%/Finance/Quote/VWD.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Asia.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Australia.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Base.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Europe.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/USA.pm
+@dirrm %%SITE_PERL%%/Finance/Quote/Yahoo
+@dirrm %%SITE_PERL%%/Finance/Quote
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Quote
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
diff --git a/finance/p5-Finance-QuoteHist/Makefile b/finance/p5-Finance-QuoteHist/Makefile
index bd22ac434806..7dbe3d946be7 100644
--- a/finance/p5-Finance-QuoteHist/Makefile
+++ b/finance/p5-Finance-QuoteHist/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Finance::QuoteHist::Yahoo.3 \
@@ -28,6 +28,5 @@ MAN3= Finance::QuoteHist::Yahoo.3 \
Finance::QuoteHist::WallStreetCity.3 \
Finance::QuoteHist::SiliconInvestor.3 \
Finance::QuoteHist::Generic.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/finance/p5-Finance-QuoteHist/pkg-plist b/finance/p5-Finance-QuoteHist/pkg-plist
index 02a621c4500e..b2674a16e66b 100644
--- a/finance/p5-Finance-QuoteHist/pkg-plist
+++ b/finance/p5-Finance-QuoteHist/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance-QuoteHist/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/Generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/SiliconInvestor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/Yahoo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/WallStreetCity.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance-QuoteHist 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist/.packlist
+%%SITE_PERL%%/Finance/QuoteHist.pm
+%%SITE_PERL%%/Finance/QuoteHist/Generic.pm
+%%SITE_PERL%%/Finance/QuoteHist/SiliconInvestor.pm
+%%SITE_PERL%%/Finance/QuoteHist/Yahoo.pm
+%%SITE_PERL%%/Finance/QuoteHist/WallStreetCity.pm
+@unexec rmdir %D/%%SITE_PERL%%/Finance/QuoteHist 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist 2>/dev/null || true
diff --git a/finance/p5-Math-Financial/Makefile b/finance/p5-Math-Financial/Makefile
index 411676a6b1d8..2c25cc74437a 100644
--- a/finance/p5-Math-Financial/Makefile
+++ b/finance/p5-Math-Financial/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module containing common functions for loans and annuities
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::Financial.3
.include <bsd.port.mk>
diff --git a/finance/p5-Math-Financial/pkg-plist b/finance/p5-Math-Financial/pkg-plist
index 88ad2cd27ee5..c355eb260985 100644
--- a/finance/p5-Math-Financial/pkg-plist
+++ b/finance/p5-Math-Financial/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Math/Financial.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Financial/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Financial
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
+%%SITE_PERL%%/Math/Financial.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Financial/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Financial
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
diff --git a/french/facturier/Makefile b/french/facturier/Makefile
index f5b62d060922..2bf970263d1a 100644
--- a/french/facturier/Makefile
+++ b/french/facturier/Makefile
@@ -29,7 +29,7 @@ USE_REINPLACE= yes
APACHE_PORT?= ${PORTSDIR}/www/apache13
APACHE_CNFDIR?= ${LOCALBASE}/etc/apache
APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf
-PBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PBASE= ${SITE_PERL}
DBOWN?= PROP_BD
DBPWD?= MDP_BD
diff --git a/french/plgrenouille/Makefile b/french/plgrenouille/Makefile
index 1a4888d46655..f145e36dda6f 100644
--- a/french/plgrenouille/Makefile
+++ b/french/plgrenouille/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= cyrille.lefevre@laposte.net
COMMENT= Un client pour determiner votre bande passante a un raccordement large bande
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS= ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
.if !defined(BATCH)
IS_INTERACTIVE= yes
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 43fa44269af7..cb6dcbbf646c 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.intec.co.jp/pub/utils/ftpmirror/beta/
MAINTAINER= yasuf@big.or.jp
COMMENT= An utility to mirror directory hierarchy with FTP
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
USE_PERL5= YES
GNU_CONFIGURE= YES
diff --git a/ftp/ftpmirror/pkg-plist b/ftp/ftpmirror/pkg-plist
index 469cac93e6a3..f39697a5fb56 100644
--- a/ftp/ftpmirror/pkg-plist
+++ b/ftp/ftpmirror/pkg-plist
@@ -1,283 +1,283 @@
bin/rotate
bin/ftpmirror
etc/ftpmirror.cf-sample
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5File.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5String.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/MD5/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Usage/Usage.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Usage/Usage.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/full_setup.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/find_archive.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/check.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/subst_directory.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/gen_match.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/gen_subst.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/do_lock.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/cleanup.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/net_init.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/last_seq.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/step_synch.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/run_step_mirror.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/run_full_mirror.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/quit.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/list.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/get.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/put.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/fill_mtime.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/fill_size.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/add.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/del.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/local_add.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/local_del.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/remote_add.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/remote_del.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/besame.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/date_check.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/calc_offset.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/adjust_offset.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/mkdirinfo.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/remote_scanner.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/local_scanner.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/server_filter.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/client_filter.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/changer_filter.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/get_uid.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/get_gid.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/scan_any.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/scan_remote.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/scan_local.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/attr_encode.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/attr_decode.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/mtime.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/get_mtime.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/gmt2mdtm.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/cleanup.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/validate.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/compare.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/copyfrom.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/duplicate.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/to_line.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/fill_checksum.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/fill.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_path.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_line.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_list.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/parsetime.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/update_master.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/append.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/mkdirhier.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/rmdirhier.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/plog.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/plog_level.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/plog_mask.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/plock.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/encode.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/decode.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/str4time.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/str4date.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/timezone.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/isleap.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/dayofyear.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/days.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/dayofweek.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/daysofmonth.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/nameofmonth.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/lookup.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/get.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/add.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/delete.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/index.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/load.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/fill.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/store.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/update.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/putdata.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/stats.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/passive.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/putreq.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/getres.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/quit.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/login.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/do_login.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/port.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/acpt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/pasv.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/cleardataconn.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/makedataconn.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/list.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/get.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/put.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/stat.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/chdir.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/cwd.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/pwd.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/type.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/image.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/ascii.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/size.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/mtime.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/unlink.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/mkdir.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/rmdir.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/rename.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/chmod.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/umask.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/group.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/idle.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/d_begin.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/d_add.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/d_end.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/generate.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/normalize.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/update.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/farm_filter.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/genindex.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/synch.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/getrev.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/HTTP/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/HTTP/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/HTTP/get.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/HTTP/parse_url.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/HTTP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/search.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_line.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_option.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_file.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/combine_hash.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/merge_hash.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/dumpall.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/get_value.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/error.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/addkey.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/try_check.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/getval.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/delete.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/setval.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/addval.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/dump.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/combine.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/merge.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_ref.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_code.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_hash.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_array.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_boolean.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_decimal.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_octal.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_integer.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_ipv4_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_path.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_file.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_directory.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/want_timezone.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/findpath.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/where.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/start.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/end.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/down.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/up.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/open.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/close.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/add_filter.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/clr_filter.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/perform_filter.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/unget.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/get.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/getone.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/get_index.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/get_misc.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_local.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_ftp.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_lslR.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/getline_lslR.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/dump.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/summary.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/getcmp.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/guess.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/fileglob.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_mklist.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_mkdiff.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_update.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/attr_cmp.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/status_report.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/FATAL.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/stats.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/clearerror.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/error.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/fatal.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/status.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/dump.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/putln.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/getln.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/putdata.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/getdata.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/nowait.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/open_socket.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/do_client.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/do_server.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/new_client.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/close.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/handle.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/sockname.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/peername.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/Attrib.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/Cool.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/DIR.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/FTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/Farm.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/HTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/Loader.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/Param.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/Scan.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan/Usage.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Attrib
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Cool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/DIR
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/FTP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Farm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/HTTP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Loader
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/MD5
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Param
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Scan
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/TCP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan/Usage
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fan
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Fan
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5File.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5String.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Usage/Usage.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Usage/Usage.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/full_setup.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/find_archive.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/check.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/subst_directory.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/gen_match.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/gen_subst.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/do_lock.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/cleanup.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/net_init.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/last_seq.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/step_synch.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/run_step_mirror.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/run_full_mirror.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/quit.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/list.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/put.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/fill_mtime.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/fill_size.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/add.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/del.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_add.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_del.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_add.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_del.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/besame.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/date_check.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/calc_offset.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/adjust_offset.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/mkdirinfo.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_scanner.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_scanner.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/server_filter.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/client_filter.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/changer_filter.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get_uid.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get_gid.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_any.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_remote.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_local.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/attr_encode.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/attr_decode.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/mtime.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/get_mtime.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/gmt2mdtm.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/cleanup.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/validate.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/compare.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/copyfrom.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/duplicate.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/to_line.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/fill_checksum.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/fill.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_path.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_line.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_list.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/parsetime.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/update_master.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/append.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/mkdirhier.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/rmdirhier.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog_level.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog_mask.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plock.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/encode.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/decode.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/str4time.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/str4date.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/timezone.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/isleap.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/dayofyear.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/days.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/dayofweek.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/daysofmonth.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/nameofmonth.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/lookup.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/get.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/add.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/delete.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/index.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/load.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/fill.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/store.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/update.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/putdata.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/stats.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/passive.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/putreq.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/getres.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/quit.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/login.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/do_login.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/port.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/acpt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/pasv.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/cleardataconn.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/makedataconn.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/list.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/get.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/put.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/stat.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/chdir.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/cwd.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/pwd.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/type.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/image.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/ascii.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/size.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/mtime.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/unlink.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/mkdir.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/rmdir.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/rename.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/chmod.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/umask.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/group.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/idle.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_begin.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_add.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_end.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/generate.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/normalize.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/update.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/farm_filter.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/genindex.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/synch.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/getrev.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/get.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/parse_url.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/search.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_line.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_option.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_file.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/combine_hash.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/merge_hash.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/dumpall.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/get_value.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/error.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/addkey.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/try_check.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/getval.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/delete.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/setval.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/addval.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/dump.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/combine.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/merge.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_ref.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_code.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_hash.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_array.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_boolean.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_decimal.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_octal.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_integer.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_ipv4_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_path.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_file.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_directory.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_timezone.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/findpath.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/where.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/start.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/end.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/down.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/up.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/open.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/close.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/add_filter.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/clr_filter.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/perform_filter.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/unget.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getone.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get_index.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get_misc.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_local.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_ftp.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_lslR.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getline_lslR.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dump.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/summary.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getcmp.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/guess.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/fileglob.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_mklist.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_mkdiff.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_update.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/attr_cmp.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/status_report.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/FATAL.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/stats.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/clearerror.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/error.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/fatal.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/status.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/dump.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/putln.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/getln.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/putdata.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/getdata.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/nowait.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/open_socket.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/do_client.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/do_server.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/new_client.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/close.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/handle.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/sockname.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/peername.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Attrib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Cool.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/DIR.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/FTP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Farm.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/HTTP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Loader.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/MD5.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Param.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Scan.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/TCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Usage.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Usage
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Fan
share/doc/ftpmirror/README.jis
share/doc/ftpmirror/RELEASE.jis
@dirrm share/doc/ftpmirror
diff --git a/ftp/jmirror/Makefile b/ftp/jmirror/Makefile
index 43e1c49d5877..52bdcd47fbfc 100644
--- a/ftp/jmirror/Makefile
+++ b/ftp/jmirror/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://galileo.spaceports.com/~jharris/distfiles/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= FTP mirroring program written in PERL (REQUIRES PERL5,Net::FTP)
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS= ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
USE_PERL5= YES
NO_BUILD= YES
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index 0acf24e62928..32f8ca447148 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -28,10 +28,9 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_REINPLACE= yes
MAKE_ENV+= NOCONF=1
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::FTPServer.3 \
Net::FTPServer::DBeg1::DirHandle.3 \
Net::FTPServer::DBeg1::FileHandle.3 \
diff --git a/ftp/p5-Net-FTPServer/pkg-plist b/ftp/p5-Net-FTPServer/pkg-plist
index 48504f78b2ca..e641a27d107d 100644
--- a/ftp/p5-Net-FTPServer/pkg-plist
+++ b/ftp/p5-Net-FTPServer/pkg-plist
@@ -1,23 +1,23 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1/DirHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1/FileHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1/IOBlob.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/DirHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/FileHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/Full/DirHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/Full/FileHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/Full/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/Handle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/InMem/DirHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/InMem/FileHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/InMem/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/RO/DirHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/RO/FileHandle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/RO/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/FTPServer/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/FTPServer/FTPServer.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/FTPServer/FTPServer.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1/DirHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1/FileHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1/IOBlob.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/DirHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/FileHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/Full/DirHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/Full/FileHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/Full/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/Handle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/InMem/DirHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/InMem/FileHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/InMem/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/RO/DirHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/RO/FileHandle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/RO/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer/FTPServer.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer/FTPServer.so
sbin/dbeg1-ftpd.pl
sbin/ftpd.pl
sbin/inmem-ftpd.pl
@@ -37,11 +37,11 @@ sbin/ro-ftpd.pl
share/examples/Net-FTPServer/ftpd.conf
@dirrm share/examples/Net-FTPServer
%%PORTDOCS%%@dirrm share/doc/Net-FTPServer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/FTPServer
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/RO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/InMem
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/Full
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/RO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/InMem
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/Full
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer/DBeg1
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/FTPServer
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
diff --git a/ftp/paraget/Makefile b/ftp/paraget/Makefile
index 49c740ed9bf3..ae026545d00f 100644
--- a/ftp/paraget/Makefile
+++ b/ftp/paraget/Makefile
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
COMMENT= Parallel ftp-fetching program
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker
+BUILD_DEPENDS= ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
+ ${SITE_PERL}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker
RUN_DEPENDS= ${BUILD_DEPENDS} \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
PERL_CONFIGURE= yes
diff --git a/ftp/paraget/pkg-plist b/ftp/paraget/pkg-plist
index d8da9ac41d6a..8e5d5f1e5357 100644
--- a/ftp/paraget/pkg-plist
+++ b/ftp/paraget/pkg-plist
@@ -1,22 +1,22 @@
bin/paraget
bin/paraget-child
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/Assignment.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/AssignmentManager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/ClientManager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/Context.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/Display.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/Interval.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/IntervalList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/IntervalManager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/Mirror.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/MirrorSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/MirrorSetGatherer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/PerformanceReport.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/ServerList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget/ServerQueue.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Paraget
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/paraget/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/paraget 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Paraget/Assignment.pm
+%%SITE_PERL%%/Net/Paraget/AssignmentManager.pm
+%%SITE_PERL%%/Net/Paraget/Client.pm
+%%SITE_PERL%%/Net/Paraget/ClientManager.pm
+%%SITE_PERL%%/Net/Paraget/Context.pm
+%%SITE_PERL%%/Net/Paraget/Display.pm
+%%SITE_PERL%%/Net/Paraget/Interval.pm
+%%SITE_PERL%%/Net/Paraget/IntervalList.pm
+%%SITE_PERL%%/Net/Paraget/IntervalManager.pm
+%%SITE_PERL%%/Net/Paraget/Mirror.pm
+%%SITE_PERL%%/Net/Paraget/MirrorSet.pm
+%%SITE_PERL%%/Net/Paraget/MirrorSetGatherer.pm
+%%SITE_PERL%%/Net/Paraget/PerformanceReport.pm
+%%SITE_PERL%%/Net/Paraget/Server.pm
+%%SITE_PERL%%/Net/Paraget/ServerList.pm
+%%SITE_PERL%%/Net/Paraget/ServerQueue.pm
+@dirrm %%SITE_PERL%%/Net/Paraget
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile
index 5d5a13106098..42906ddccd0f 100644
--- a/ftp/profxp/Makefile
+++ b/ftp/profxp/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${PERL_SITELIBDIR}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-
RUN_DEPENDS+= ${PERL_SITELIBDIR}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
.endif
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
diff --git a/ftp/profxp/pkg-plist b/ftp/profxp/pkg-plist
index 9a9f996d790e..7d34a4d95c7e 100644
--- a/ftp/profxp/pkg-plist
+++ b/ftp/profxp/pkg-plist
@@ -1,6 +1,6 @@
bin/profxp
-lib/perl5/site_perl/%%PERL_VER%%/profxp/command.pm
-lib/perl5/site_perl/%%PERL_VER%%/profxp/config.pm
-lib/perl5/site_perl/%%PERL_VER%%/profxp/screen.pm
-lib/perl5/site_perl/%%PERL_VER%%/profxp/tcp.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/profxp
+%%SITE_PERL%%/profxp/command.pm
+%%SITE_PERL%%/profxp/config.pm
+%%SITE_PERL%%/profxp/screen.pm
+%%SITE_PERL%%/profxp/tcp.pm
+@dirrm %%SITE_PERL%%/profxp
diff --git a/ftp/vcheck/Makefile b/ftp/vcheck/Makefile
index 146d9e286bbb..5cd17e6f020d 100644
--- a/ftp/vcheck/Makefile
+++ b/ftp/vcheck/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.stud.tu-ilmenau.de/~gomar/stuff/vcheck/
MAINTAINER= svenasse@polaris.ca
COMMENT= Automatically check for and download most recent versions of software
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/ftp/vcheck/pkg-plist b/ftp/vcheck/pkg-plist
index d7d97931259c..1c8b9fa90aac 100644
--- a/ftp/vcheck/pkg-plist
+++ b/ftp/vcheck/pkg-plist
@@ -1,3 +1,3 @@
bin/vcheck
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vcheck/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vcheck
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/vcheck/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/vcheck
diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index e2913952afaf..21d1a7c52fd8 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -17,8 +17,8 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= klaus.goger@reflex.at
COMMENT= Throw colourful bubbles to build groups and destroy the groups
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
SDL_image.10:${PORTSDIR}/graphics/sdl_image
diff --git a/games/frozenbubble/pkg-plist b/games/frozenbubble/pkg-plist
index 09ac7e8d240b..5e77e05474f9 100644
--- a/games/frozenbubble/pkg-plist
+++ b/games/frozenbubble/pkg-plist
@@ -1,12 +1,12 @@
bin/frozen-bubble.pl
bin/frozen-bubble
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/fb_c_stuff/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/build_fbsyms
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/fb_c_stuff.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/fbsyms.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/fbmdkcommon.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/build_fbsyms
+%%SITE_PERL%%/%%PERL_ARCH%%/fb_c_stuff.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/fbsyms.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/fbmdkcommon.pm
share/frozen-bubble/data/levels
share/frozen-bubble/data/plasma.raw
share/frozen-bubble/snd/applause.wav
@@ -285,7 +285,7 @@ share/frozen-bubble/gfx/tomate.png
share/frozen-bubble/gfx/win_panel_p1.png
share/frozen-bubble/gfx/win_panel_p2.png
share/frozen-bubble/highscores.default
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/fb_c_stuff
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff
@dirrm share/frozen-bubble/data
@dirrm share/frozen-bubble/snd
@dirrm share/frozen-bubble/gfx/balls
diff --git a/games/lm-solve/pkg-plist b/games/lm-solve/pkg-plist
index aa4aae30b47f..b1440c7f3228 100644
--- a/games/lm-solve/pkg-plist
+++ b/games/lm-solve/pkg-plist
@@ -1,18 +1,18 @@
bin/lm-solve
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Alice.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Input.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Minotaur.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Numbers.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Plank/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Tilt/RedBlue.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Tilt/Single.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Tilt/Multi.pm
-lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Tilt/Base.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Plank
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver/Tilt
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Shlomif/LMSolver
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Shlomif
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shlomif/LMSolver/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shlomif/LMSolver
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Shlomif
+%%SITE_PERL%%/Shlomif/LMSolver/Alice.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Base.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Input.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Minotaur.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Numbers.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Plank/Base.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Tilt/RedBlue.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Tilt/Single.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Tilt/Multi.pm
+%%SITE_PERL%%/Shlomif/LMSolver/Tilt/Base.pm
+@dirrm %%SITE_PERL%%/Shlomif/LMSolver/Plank
+@dirrm %%SITE_PERL%%/Shlomif/LMSolver/Tilt
+@dirrm %%SITE_PERL%%/Shlomif/LMSolver
+@dirrm %%SITE_PERL%%/Shlomif
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shlomif/LMSolver/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shlomif/LMSolver
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shlomif
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index a897f0f41765..5a257803494e 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= bbbike
MAINTAINER= slaven@rezic.de
COMMENT= A route-finder for cyclists in Berlin and Brandenburg
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
USE_PERL5= YES
POD2MAN= pod2man
diff --git a/graphics/GIFgraph/Makefile b/graphics/GIFgraph/Makefile
index 0b49e0d37ef3..3f450dc013df 100644
--- a/graphics/GIFgraph/Makefile
+++ b/graphics/GIFgraph/Makefile
@@ -17,11 +17,10 @@ DISTNAME= GIFgraph-${PORTVERSION}
MAINTAINER= ls@gambit.com.ru
COMMENT= A Perl package to generate PNG charts
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GIFgraph.3 GIFgraph::colour.3
post-patch:
diff --git a/graphics/GIFgraph/pkg-plist b/graphics/GIFgraph/pkg-plist
index 471c4ab1f951..1178dc0ac67b 100644
--- a/graphics/GIFgraph/pkg-plist
+++ b/graphics/GIFgraph/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/pie.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/utils.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/axestype.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/colour.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/bars.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/linespoints.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/area.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/lines.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/mixed.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph/points.pm
-lib/perl5/site_perl/%%PERL_VER%%/GIFgraph.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GIFgraph/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GIFgraph
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/GIFgraph
+%%SITE_PERL%%/GIFgraph/pie.pm
+%%SITE_PERL%%/GIFgraph/utils.pm
+%%SITE_PERL%%/GIFgraph/axestype.pm
+%%SITE_PERL%%/GIFgraph/colour.pm
+%%SITE_PERL%%/GIFgraph/bars.pm
+%%SITE_PERL%%/GIFgraph/linespoints.pm
+%%SITE_PERL%%/GIFgraph/area.pm
+%%SITE_PERL%%/GIFgraph/lines.pm
+%%SITE_PERL%%/GIFgraph/mixed.pm
+%%SITE_PERL%%/GIFgraph/points.pm
+%%SITE_PERL%%/GIFgraph.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GIFgraph/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GIFgraph
+@dirrm %%SITE_PERL%%/GIFgraph
diff --git a/graphics/IPA/Makefile b/graphics/IPA/Makefile
index ca425d2b36af..662d25ce6dc5 100644
--- a/graphics/IPA/Makefile
+++ b/graphics/IPA/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.prima.eu.org/IPA/
MAINTAINER= ports@FreeBSD.org
COMMENT= Image Processing Algorithms
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Prima.pm:${PORTSDIR}/x11-toolkits/p5-Prima
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Prima.pm:${PORTSDIR}/x11-toolkits/p5-Prima
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/graphics/IPA/pkg-plist b/graphics/IPA/pkg-plist
index 841ab899d898..1d210a866e16 100644
--- a/graphics/IPA/pkg-plist
+++ b/graphics/IPA/pkg-plist
@@ -1,34 +1,34 @@
bin/iterm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/IPAsupp.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/generic/Geometry.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/generic/Global.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/generic/IPA.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/generic/Local.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/generic/Misc.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/generic/Morphology.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/generic/Point.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/Geometry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/Global.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/Local.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/Misc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/Morphology.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/Point.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/Region.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE/generic
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA/CORE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IPA
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Geometry/Geometry.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Global/Global.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/IPA.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Local/Local.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Misc/Misc.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Morphology/Morphology.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Point/Point.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Geometry
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Global
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Local
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Misc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Morphology
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA/Point
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPA
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/IPAsupp.h
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Geometry.h
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Global.h
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/IPA.h
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Local.h
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Misc.h
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Morphology.h
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic/Point.h
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Geometry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Global.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Local.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Misc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Morphology.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Point.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IPA/Region.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE/generic
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IPA/CORE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IPA
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Geometry/Geometry.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Global/Global.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/IPA.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Local/Local.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Misc/Misc.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Morphology/Morphology.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Point/Point.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Geometry
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Global
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Local
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Misc
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Morphology
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA/Point
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPA
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 84850c2aeae7..4ba3df33aaa7 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -441,11 +441,11 @@ lib/libMagick.so
lib/libMagick.so.6
libdata/pkgconfig/ImageMagick++.pc
libdata/pkgconfig/ImageMagick.pc
-%%WITH_PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm
-%%WITH_PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist
-%%WITH_PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs
-%%WITH_PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so
-%%WITH_PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
share/ImageMagick-5.5.7/Copyright.txt
share/ImageMagick-5.5.7/QuickStart.txt
%%PORTDOCS%%share/doc/ImageMagick/images/background.gif
@@ -640,9 +640,9 @@ share/ImageMagick-5.5.7/QuickStart.txt
%%PORTDOCS%%@dirrm share/doc/ImageMagick
@dirrm share/ImageMagick-5.5.7
@dirrm share/ImageMagick
-%%WITH_PERL%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick
-%%WITH_PERL%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image
-%%WITH_PERL%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Image
%%Q8%%@dirrm lib/ImageMagick/modules-Q8/filters
%%Q8%%@dirrm lib/ImageMagick/modules-Q8/coders
%%Q8%%@dirrm lib/ImageMagick/modules-Q8
diff --git a/graphics/cadubi/Makefile b/graphics/cadubi/Makefile
index bc527a129e73..541c5aa16393 100644
--- a/graphics/cadubi/Makefile
+++ b/graphics/cadubi/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= ASCII drawing utility
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
NO_BUILD= yes
diff --git a/graphics/cthumb/Makefile b/graphics/cthumb/Makefile
index 5de9624a69d7..4db2dc9e5a61 100644
--- a/graphics/cthumb/Makefile
+++ b/graphics/cthumb/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/pnmscale:${PORTSDIR}/graphics/netpbm \
${SITE_PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-SITE_PERL_ARCH= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}
+SITE_PERL_ARCH= ${SITE_PERL}/${PERL_ARCH}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-themedir=${PREFIX}/share/${PORTNAME}
diff --git a/graphics/eps2png/pkg-plist b/graphics/eps2png/pkg-plist
index 29214ff88ced..863541afba00 100644
--- a/graphics/eps2png/pkg-plist
+++ b/graphics/eps2png/pkg-plist
@@ -1,3 +1,3 @@
bin/eps2png
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/eps2png/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/eps2png 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/eps2png/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/eps2png 2>/dev/null || true
diff --git a/graphics/imc/Makefile b/graphics/imc/Makefile
index 96aee2c77315..b9c044db6f50 100644
--- a/graphics/imc/Makefile
+++ b/graphics/imc/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES= http://users.skynet.be/Peter.Verthez/projects/imc/
MAINTAINER= ports@FreeBSD.org
COMMENT= Image Compiler
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
+ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PERL5= yes
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index f0d0a8ecd8b6..6de7760e9a29 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -16,13 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A Perl module for generating presentation graphics (i.e., charts)
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
+ ${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
MAN3= Chart::PNGgraph.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/graphics/p5-Chart-PNGgraph/pkg-plist b/graphics/p5-Chart-PNGgraph/pkg-plist
index 0b9ad593c051..762ff8701566 100644
--- a/graphics/p5-Chart-PNGgraph/pkg-plist
+++ b/graphics/p5-Chart-PNGgraph/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/Convert.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/area.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/axestype.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/bars.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/lines.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/linespoints.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/mixed.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/pie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph/points.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chart/PNGgraph/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chart/PNGgraph
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Chart/PNGgraph
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chart > /dev/null 2>&1 || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Chart > /dev/null 2>&1 || true
+%%SITE_PERL%%/Chart/PNGgraph.pm
+%%SITE_PERL%%/Chart/PNGgraph/Convert.pm
+%%SITE_PERL%%/Chart/PNGgraph/area.pm
+%%SITE_PERL%%/Chart/PNGgraph/axestype.pm
+%%SITE_PERL%%/Chart/PNGgraph/bars.pm
+%%SITE_PERL%%/Chart/PNGgraph/lines.pm
+%%SITE_PERL%%/Chart/PNGgraph/linespoints.pm
+%%SITE_PERL%%/Chart/PNGgraph/mixed.pm
+%%SITE_PERL%%/Chart/PNGgraph/pie.pm
+%%SITE_PERL%%/Chart/PNGgraph/points.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/PNGgraph/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/PNGgraph
+@dirrm %%SITE_PERL%%/Chart/PNGgraph
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart > /dev/null 2>&1 || true
+@unexec rmdir %D/%%SITE_PERL%%/Chart > /dev/null 2>&1 || true
diff --git a/graphics/p5-GD-Barcode/Makefile b/graphics/p5-GD-Barcode/Makefile
index 1ef423e58941..75e0eba53fba 100644
--- a/graphics/p5-GD-Barcode/Makefile
+++ b/graphics/p5-GD-Barcode/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= GD::Barcode - Create barcode image with GD
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index a9846286185b..db710c65413c 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Creates 3D charts with GD::Graph and GD
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS= ${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GD::Graph3d.3
post-patch:
diff --git a/graphics/p5-GD-Graph3d/pkg-plist b/graphics/p5-GD-Graph3d/pkg-plist
index d4ec2662accf..a172d13064eb 100644
--- a/graphics/p5-GD-Graph3d/pkg-plist
+++ b/graphics/p5-GD-Graph3d/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/GD/Graph3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/GD/Graph/axestype3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/GD/Graph/bars3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/GD/Graph/cylinder3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/GD/Graph/cylinder.pm
-lib/perl5/site_perl/%%PERL_VER%%/GD/Graph/lines3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/GD/Graph/pie3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/Graph3d/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/GD/Graph 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/GD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/Graph3d 2>/dev/null || true
+%%SITE_PERL%%/GD/Graph3d.pm
+%%SITE_PERL%%/GD/Graph/axestype3d.pm
+%%SITE_PERL%%/GD/Graph/bars3d.pm
+%%SITE_PERL%%/GD/Graph/cylinder3d.pm
+%%SITE_PERL%%/GD/Graph/cylinder.pm
+%%SITE_PERL%%/GD/Graph/lines3d.pm
+%%SITE_PERL%%/GD/Graph/pie3d.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph3d/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/GD/Graph 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph3d 2>/dev/null || true
diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile
index d5b3e9ceab51..4b15ee8a831a 100644
--- a/graphics/p5-GD-TextUtil/Makefile
+++ b/graphics/p5-GD-TextUtil/Makefile
@@ -16,11 +16,10 @@ DISTNAME= GDTextUtil-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Text utilities for use with GD drawing package
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GD::Text.3 GD::Text::Wrap.3 GD::Text::Align.3
.include <bsd.port.mk>
diff --git a/graphics/p5-GD1/Makefile b/graphics/p5-GD1/Makefile
index 178612e37930..3dc06479b83b 100644
--- a/graphics/p5-GD1/Makefile
+++ b/graphics/p5-GD1/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= gd1.2:${PORTSDIR}/graphics/gd1
PERL_CONFIGURE= yes
USE_REINPLACE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GD.3
post-patch:
diff --git a/graphics/p5-GD1/pkg-plist b/graphics/p5-GD1/pkg-plist
index d87ad5c57600..dd057f0991ef 100644
--- a/graphics/p5-GD1/pkg-plist
+++ b/graphics/p5-GD1/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/patch_gd.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/qd.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD
+%%SITE_PERL%%/%%PERL_ARCH%%/GD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/patch_gd.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
diff --git a/graphics/p5-GraphViz-Data-Structure/Makefile b/graphics/p5-GraphViz-Data-Structure/Makefile
index b3709d7020db..94e9c4d67a09 100644
--- a/graphics/p5-GraphViz-Data-Structure/Makefile
+++ b/graphics/p5-GraphViz-Data-Structure/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= ${PERL_SITELIBDIR}/GraphViz.pm:${PORTSDIR}/graphics/p5-GraphViz \
${PERL_SITELIBDIR}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= GraphViz::Data::Structure.3
.include <bsd.port.mk>
diff --git a/graphics/p5-GraphViz-Data-Structure/pkg-plist b/graphics/p5-GraphViz-Data-Structure/pkg-plist
index 78fbe03415e1..f5428044dbc4 100644
--- a/graphics/p5-GraphViz-Data-Structure/pkg-plist
+++ b/graphics/p5-GraphViz-Data-Structure/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Data/Structure.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GraphViz/Data/Structure/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Data 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GraphViz/Data/Structure
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GraphViz/Data 2>/dev/null || true
+%%SITE_PERL%%/GraphViz/Data/Structure.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Data/Structure/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/GraphViz/Data 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Data/Structure
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Data 2>/dev/null || true
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index 742d52d8619b..a55d031cd4b6 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= GraphViz - Perl interface to the GraphViz graphing tool
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Graph.pm:${PORTSDIR}/math/p5-Graph \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Math/Bezier.pm:${PORTSDIR}/math/p5-Math-Bezier
+BUILD_DEPENDS= ${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run \
+ ${SITE_PERL}/Graph.pm:${PORTSDIR}/math/p5-Graph \
+ ${SITE_PERL}/Math/Bezier.pm:${PORTSDIR}/math/p5-Math-Bezier
RUN_DEPENDS= ${BUILD_DEPENDS} \
dot:${PORTSDIR}/graphics/graphviz
diff --git a/graphics/p5-GraphViz/pkg-plist b/graphics/p5-GraphViz/pkg-plist
index 474f7061725a..a603e205bf2c 100644
--- a/graphics/p5-GraphViz/pkg-plist
+++ b/graphics/p5-GraphViz/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GraphViz/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz.pm
-lib/perl5/site_perl/%%PERL_VER%%/Devel/GraphVizProf.pm
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Small.pm
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Regex.pm
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/XML.pm
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/No.pm
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Parse/Yapp.pm
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Parse/RecDescent.pm
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Parse/Yacc.pm
-lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Data/Grapher.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Parse
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/GraphViz/Data
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GraphViz 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/GraphViz 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/.packlist
+%%SITE_PERL%%/GraphViz.pm
+%%SITE_PERL%%/Devel/GraphVizProf.pm
+%%SITE_PERL%%/GraphViz/Small.pm
+%%SITE_PERL%%/GraphViz/Regex.pm
+%%SITE_PERL%%/GraphViz/XML.pm
+%%SITE_PERL%%/GraphViz/No.pm
+%%SITE_PERL%%/GraphViz/Parse/Yapp.pm
+%%SITE_PERL%%/GraphViz/Parse/RecDescent.pm
+%%SITE_PERL%%/GraphViz/Parse/Yacc.pm
+%%SITE_PERL%%/GraphViz/Data/Grapher.pm
+@dirrm %%SITE_PERL%%/GraphViz/Parse
+@dirrm %%SITE_PERL%%/GraphViz/Data
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/GraphViz 2>/dev/null || true
diff --git a/graphics/p5-Graphics-ColorNames/Makefile b/graphics/p5-Graphics-ColorNames/Makefile
index f6a66c4ed244..1a9dbb5685c1 100644
--- a/graphics/p5-Graphics-ColorNames/Makefile
+++ b/graphics/p5-Graphics-ColorNames/Makefile
@@ -17,7 +17,6 @@ COMMENT= A perl class that defines RGB values for common color names
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Graphics::ColorNames.3 \
Graphics::HTML.3 \
Graphics::Netscape.3 \
diff --git a/graphics/p5-Graphics-ColorNames/pkg-plist b/graphics/p5-Graphics-ColorNames/pkg-plist
index 397c86e7ae66..139f151a2fea 100644
--- a/graphics/p5-Graphics-ColorNames/pkg-plist
+++ b/graphics/p5-Graphics-ColorNames/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/Graphics/ColorNames.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graphics/ColorNames/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graphics/ColorNames/Netscape.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graphics/ColorNames/Windows.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graphics/ColorNames/X.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Graphics/ColorNames/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Graphics/ColorNames
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Graphics 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Graphics/ColorNames
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Graphics 2>/dev/null || true
+%%SITE_PERL%%/Graphics/ColorNames.pm
+%%SITE_PERL%%/Graphics/ColorNames/HTML.pm
+%%SITE_PERL%%/Graphics/ColorNames/Netscape.pm
+%%SITE_PERL%%/Graphics/ColorNames/Windows.pm
+%%SITE_PERL%%/Graphics/ColorNames/X.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/ColorNames/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/ColorNames
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Graphics/ColorNames
+@unexec rmdir %D/%%SITE_PERL%%/Graphics 2>/dev/null || true
diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile
index 9adfb34884c8..5e04d158596f 100644
--- a/graphics/p5-Image-Grab/Makefile
+++ b/graphics/p5-Image-Grab/Makefile
@@ -24,11 +24,10 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-D
${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
CONFIGURE_ENV= ${ECHO_CMD} "N" |
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Image::Grab.3
.include <bsd.port.mk>
diff --git a/graphics/p5-Image-Grab/pkg-plist b/graphics/p5-Image-Grab/pkg-plist
index 2b28fac3b682..df12191a66c0 100644
--- a/graphics/p5-Image-Grab/pkg-plist
+++ b/graphics/p5-Image-Grab/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Image/Grab.pod
-lib/perl5/site_perl/%%PERL_VER%%/Image/Grab/RequestAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Image/Grab.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Grab/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Image/Grab
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Image 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Grab
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true
+%%SITE_PERL%%/Image/Grab.pod
+%%SITE_PERL%%/Image/Grab/RequestAgent.pm
+%%SITE_PERL%%/Image/Grab.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Grab/.packlist
+@dirrm %%SITE_PERL%%/Image/Grab
+@unexec rmdir %D/%%SITE_PERL%%/Image 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Grab
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true
diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index 7a7bf1da4b4a..9938600041f7 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -29,7 +29,6 @@ CONFIGURE_ENV= IM_LIBPATH="${LOCALBASE}/lib" \
IM_INCPATH="${LOCALBASE}/include/freetype1/freetype"
USE_GMAKE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Imager.3 Imager::Color.3 Imager::Color::Float.3 Imager::Expr.3 \
Imager::Expr::Assem.3 Imager::Fill.3 Imager::Font.3 \
Imager::Font::FreeType2.3 Imager::Font::Truetype.3 \
diff --git a/graphics/p5-Imager/pkg-plist b/graphics/p5-Imager/pkg-plist
index 6bdbf0bfbf45..3508ec97df2d 100644
--- a/graphics/p5-Imager/pkg-plist
+++ b/graphics/p5-Imager/pkg-plist
@@ -1,31 +1,31 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Color/Float.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Expr/Assem.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Font/FreeType2.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Font/Type1.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Font/Win32.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Font/Truetype.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Color.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Draw.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Engines.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Files.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Fill.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Filters.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Font.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Fountain.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/ImageTypes.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Matrix2d.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Regops.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Transform.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Transformations.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/interface.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/regmach.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imager/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imager/Imager.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imager/Imager.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imager
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Color
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Expr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager/Font
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imager
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Color/Float.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Expr/Assem.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/FreeType2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/Type1.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/Win32.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font/Truetype.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Color.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Draw.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Engines.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Expr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Files.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Fill.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Filters.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Fountain.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/ImageTypes.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Matrix2d.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Regops.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Transform.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/Transformations.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/interface.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager/regmach.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Imager.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Imager.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Imager.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Imager/Color
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Imager/Expr
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Imager/Font
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Imager
diff --git a/graphics/p5-Imlib2/pkg-plist b/graphics/p5-Imlib2/pkg-plist
index 241f2438651b..84aeeadcca7f 100644
--- a/graphics/p5-Imlib2/pkg-plist
+++ b/graphics/p5-Imlib2/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imlib2.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imlib2/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imlib2/ooimlib.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imlib2/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imlib2/Imlib2.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imlib2/Imlib2.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imlib2/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Imlib2
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Imlib2
+%%SITE_PERL%%/%%PERL_ARCH%%/Imlib2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imlib2/Object.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Imlib2/ooimlib.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imlib2/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imlib2/Imlib2.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imlib2/Imlib2.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imlib2/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Imlib2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Imlib2
diff --git a/graphics/p5-PGPLOT/pkg-plist b/graphics/p5-PGPLOT/pkg-plist
index 1ee39501a03c..85a18566a5d1 100644
--- a/graphics/p5-PGPLOT/pkg-plist
+++ b/graphics/p5-PGPLOT/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PGPLOT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/old_test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGPLOT/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/PGPLOT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/old_test.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT/.packlist
share/doc/pgperl/LICENSE
share/doc/pgperl/test.img
share/doc/pgperl/test.pl
@@ -18,5 +18,5 @@ share/doc/pgperl/test6.p
share/doc/pgperl/test7.p
share/doc/pgperl/test8.p
share/doc/pgperl/test9.p
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGPLOT
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT
@dirrm share/doc/pgperl
diff --git a/graphics/p5-VCG/Makefile b/graphics/p5-VCG/Makefile
index 816857b66e10..b5af5adf8ab3 100644
--- a/graphics/p5-VCG/Makefile
+++ b/graphics/p5-VCG/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS} \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= VCG.3
.include <bsd.port.mk>
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index 309cd77d402e..a3a8d31bebfe 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -26,7 +26,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/perl_ext
PERL_CONFIGURE= yes
CONFIGURE_ENV= LOCALBASE="${LOCALBASE}"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= SWF.3 \
SWF::Action.3 \
SWF::Bitmap.3 \
diff --git a/graphics/p5-ming/pkg-plist b/graphics/p5-ming/pkg-plist
index 6dd154574b06..f1653cf4186e 100644
--- a/graphics/p5-ming/pkg-plist
+++ b/graphics/p5-ming/pkg-plist
@@ -1,23 +1,23 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Action.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Bitmap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Button.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/DisplayItem.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Fill.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Font.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Gradient.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Morph.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Movie.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Shape.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Sound.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Sprite.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF/TextField.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SWF
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SWF/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SWF/SWF.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SWF/SWF.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SWF
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Action.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Bitmap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Button.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/DisplayItem.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Fill.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Font.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Gradient.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Morph.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Movie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Shape.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Sound.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Sprite.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/Text.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SWF/TextField.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SWF
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/SWF.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/SWF.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF
%%PORTDOCS%%share/examples/perl5/ming/animation.cgi
%%PORTDOCS%%share/examples/perl5/ming/jpegfill.cgi
%%PORTDOCS%%share/examples/perl5/ming/morph.cgi
diff --git a/graphics/pgperl/pkg-plist b/graphics/pgperl/pkg-plist
index 1ee39501a03c..85a18566a5d1 100644
--- a/graphics/pgperl/pkg-plist
+++ b/graphics/pgperl/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PGPLOT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/old_test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGPLOT/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/PGPLOT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/old_test.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT/PGPLOT.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT/.packlist
share/doc/pgperl/LICENSE
share/doc/pgperl/test.img
share/doc/pgperl/test.pl
@@ -18,5 +18,5 @@ share/doc/pgperl/test6.p
share/doc/pgperl/test7.p
share/doc/pgperl/test8.p
share/doc/pgperl/test9.p
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGPLOT
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGPLOT
@dirrm share/doc/pgperl
diff --git a/graphics/springgraph/Makefile b/graphics/springgraph/Makefile
index cc354cea9df7..894876fd5bd6 100644
--- a/graphics/springgraph/Makefile
+++ b/graphics/springgraph/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .pl
MAINTAINER= ports@FreeBSD.org
COMMENT= Render graph described in a .dot file
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
USE_PERL5= yes
EXTRACT_CMD= ${CP}
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index 7e1c49b3f669..e19da79643a9 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -5,22 +5,22 @@ etc/irssi.conf.sample
%%WITH_PROXY%%/lib/irssi/modules/libirc_proxy.la
%%WITH_PROXY%%/lib/irssi/modules/libirc_proxy.so
%%WITH_PROXY%%/lib/irssi/modules/libirc_proxy.so.0
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/Irc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/TextUI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/UI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/Irc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/TextUI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/UI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
share/doc/irssi/botnet.txt
share/doc/irssi/design.txt
share/doc/irssi/faq.html
@@ -165,11 +165,11 @@ share/irssi/scripts/splitlong.pl
share/irssi/scripts/usercount.pl
share/irssi/themes/colorless.theme
share/irssi/themes/default.theme
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi
@dirrm lib/irssi/modules
@dirrm lib/irssi
@dirrm share/doc/irssi
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 7e1c49b3f669..e19da79643a9 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -5,22 +5,22 @@ etc/irssi.conf.sample
%%WITH_PROXY%%/lib/irssi/modules/libirc_proxy.la
%%WITH_PROXY%%/lib/irssi/modules/libirc_proxy.so
%%WITH_PROXY%%/lib/irssi/modules/libirc_proxy.so.0
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/Irc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/TextUI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/UI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/Irc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/TextUI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/UI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
share/doc/irssi/botnet.txt
share/doc/irssi/design.txt
share/doc/irssi/faq.html
@@ -165,11 +165,11 @@ share/irssi/scripts/splitlong.pl
share/irssi/scripts/usercount.pl
share/irssi/themes/colorless.theme
share/irssi/themes/default.theme
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi
@dirrm lib/irssi/modules
@dirrm lib/irssi
@dirrm share/doc/irssi
diff --git a/irc/nethirc/Makefile b/irc/nethirc/Makefile
index 733ec75cb2ad..60815a52c680 100644
--- a/irc/nethirc/Makefile
+++ b/irc/nethirc/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Perl-based irc client that uses Net::IRC
.include <bsd.port.pre.mk>
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/IRC.pm:${PORTSDIR}/irc/p5-IRC
+RUN_DEPENDS= ${SITE_PERL}/Net/IRC.pm:${PORTSDIR}/irc/p5-IRC
NO_BUILD= yes
USE_PERL5= yes
diff --git a/irc/p5-POE-Component-IRC-Object/Makefile b/irc/p5-POE-Component-IRC-Object/Makefile
index 0b5372d257fd..af2f995ae6d5 100644
--- a/irc/p5-POE-Component-IRC-Object/Makefile
+++ b/irc/p5-POE-Component-IRC-Object/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= A slightly simpler OO interface to POE::Component::IRC
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE/Component/IRC.pm:${PORTSDIR}/irc/p5-POE-Component-IRC
+BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
+ ${SITE_PERL}/POE/Component/IRC.pm:${PORTSDIR}/irc/p5-POE-Component-IRC
RUN_DEPENDS= ${BUILD_DEPENDS}
PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= POE::Component::IRC::Object.3
post-install:
diff --git a/irc/p5-POE-Component-IRC-Object/pkg-plist b/irc/p5-POE-Component-IRC-Object/pkg-plist
index dbda88557268..75ac361b80eb 100644
--- a/irc/p5-POE-Component-IRC-Object/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Object/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/IRC/Object.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/IRC 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 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object/.packlist
+%%SITE_PERL%%/POE/Component/IRC/Object.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component/IRC 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 2>/dev/null || true
%%PORTDOCS%%%%EXAMPLESDIR%%/elizabot.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/japanese/another-htmllint/Makefile b/japanese/another-htmllint/Makefile
index 9a2d5c5d9c92..eaa999d0b2d1 100644
--- a/japanese/another-htmllint/Makefile
+++ b/japanese/another-htmllint/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= kuriyama
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Another HTML-lint (all messages are written in Japanese)
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
USE_ZIP= YES
WRKSRC= ${WRKDIR}
diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile
index 4a93b25c373d..23fe39759068 100644
--- a/japanese/eijiro-fpw/Makefile
+++ b/japanese/eijiro-fpw/Makefile
@@ -16,7 +16,7 @@ COMMENT= EIJIRO English - Japanese Dictionary (EPWING V1 format)
EXTRACT_DEPENDS=${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+ ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
RESTRICTED= "The original dictionary is not free"
NO_PACKAGE= "The original dictionary is not free"
diff --git a/japanese/freepwing/pkg-plist b/japanese/freepwing/pkg-plist
index ff0c7fe775c4..5079eff0b642 100644
--- a/japanese/freepwing/pkg-plist
+++ b/japanese/freepwing/pkg-plist
@@ -1,37 +1,37 @@
bin/fpwmake
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/BaseText.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/BaseUserChar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/BaseWord.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/CharConv.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/ColorGraphic.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Control.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/EndWord.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Copyright.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/ColorGraphic.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/FPWParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/FPWUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Heading.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/KeyWord.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Menu.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Sound.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Word2.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FullUserChar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/HalfUserChar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Heading.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Index.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/KeyWord.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Link.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/RefUserChar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Reference.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Sort.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Sound.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Tag.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Word.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/Word2.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING/FPWUtils
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreePWING
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseText.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseUserChar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseWord.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/CharConv.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/ColorGraphic.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Control.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/EndWord.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Copyright.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/ColorGraphic.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/FPWParser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/FPWUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Heading.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/KeyWord.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Menu.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Sound.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Text.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Word2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FullUserChar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/HalfUserChar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Heading.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Index.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/KeyWord.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Link.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/RefUserChar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Reference.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Sort.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Sound.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Tag.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Text.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Word.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Word2.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/FreePWING
libexec/freepwing/catdump
libexec/freepwing/cphier
libexec/freepwing/fpwcontrol
diff --git a/japanese/mypaedia-fpw/Makefile b/japanese/mypaedia-fpw/Makefile
index 83fef296b7bc..9d2480ea7fb1 100644
--- a/japanese/mypaedia-fpw/Makefile
+++ b/japanese/mypaedia-fpw/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= taoka@FreeBSD.org
COMMENT= An encyclopedia "Mypaedia" (EPWING V1 format)
BUILD_DEPENDS= fpwmake:${PORTSDIR}/japanese/freepwing \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+ ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
IS_INTERACTIVE= YES
RESTRICTED= "The original dictionary is not free"
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
index aa5f485b01f1..399e997f46af 100644
--- a/japanese/namazu2/Makefile
+++ b/japanese/namazu2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= nmz.6:${PORTSDIR}/databases/namazu2
RUN_DEPENDS= ${PM_BASE}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf \
${PM_BASE}/${PERL_ARCH}/Text/${MODULE_NAME}.pm:${PORTSDIR}/japanese/p5-Text-${MODULE_NAME}
-PM_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PM_BASE= ${SITE_PERL}
.if defined(WITH_CHASEN)
MODULE_NAME= ChaSen
diff --git a/japanese/otojiro-fpw/Makefile b/japanese/otojiro-fpw/Makefile
index 25c70855040b..4b0c1d911130 100644
--- a/japanese/otojiro-fpw/Makefile
+++ b/japanese/otojiro-fpw/Makefile
@@ -17,7 +17,7 @@ COMMENT= OTOJIRO English - Japanese Dictionary (EPWING V1 format)
EXTRACT_DEPENDS=${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+ ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
RESTRICTED= "The original dictionary is not free"
NO_PACKAGE= "The original dictionary is not free"
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index 0e7b4b61097c..a2b4885013f7 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -14,13 +14,12 @@ MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DANKOGAI
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension interface to convert Japanese text
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
PERL_CONFIGURE= yes
MAN3= Jcode.3 Jcode::Unicode.3 Jcode::Unicode::Constants.3 \
Jcode::Unicode::NoXS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/japanese/p5-Jcode/pkg-plist b/japanese/p5-Jcode/pkg-plist
index 5538caa71202..e37c3724965c 100644
--- a/japanese/p5-Jcode/pkg-plist
+++ b/japanese/p5-Jcode/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/H2Z.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/Tr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/Unicode.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/Unicode/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/Unicode/NoXS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/_test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Jcode/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mac_install.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/win_install.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/Unicode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Jcode/
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Jcode/Unicode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Jcode
+%%SITE_PERL%%/%%PERL_ARCH%%/Jcode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/H2Z.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Tr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/NoXS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/_test.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.so
+%%SITE_PERL%%/%%PERL_ARCH%%/mac_install.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/win_install.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode/
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode
diff --git a/japanese/p5-PDFJ/pkg-plist b/japanese/p5-PDFJ/pkg-plist
index 3f2083830bb1..e7fa4feaddd3 100644
--- a/japanese/p5-PDFJ/pkg-plist
+++ b/japanese/p5-PDFJ/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/PDFJ.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDFJ/E2U.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDFJ/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDFJ/S2U.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDFJ/TTF.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDFJ/U2C.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDFJ/Unicode.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDFJ/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDFJ
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDFJ
+%%SITE_PERL%%/PDFJ.pm
+%%SITE_PERL%%/PDFJ/E2U.pm
+%%SITE_PERL%%/PDFJ/Object.pm
+%%SITE_PERL%%/PDFJ/S2U.pm
+%%SITE_PERL%%/PDFJ/TTF.pm
+%%SITE_PERL%%/PDFJ/U2C.pm
+%%SITE_PERL%%/PDFJ/Unicode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFJ/.packlist
+@dirrm %%SITE_PERL%%/PDFJ
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFJ
diff --git a/japanese/p5-Text-ChaSen/Makefile b/japanese/p5-Text-ChaSen/Makefile
index 23eb97a5d640..e02b444db1e5 100644
--- a/japanese/p5-Text-ChaSen/Makefile
+++ b/japanese/p5-Text-ChaSen/Makefile
@@ -24,7 +24,6 @@ CHASEN_VERSION= 2.3.0
WRKSRC= ${WRKDIR}/chasen-${CHASEN_VERSION}/perl
PERL_CONFIGURE= yes
CONFIGURE_ENV= PREFIX="${PREFIX}"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Text::ChaSen.3
.include <bsd.port.pre.mk>
diff --git a/japanese/p5-Text-ChaSen/pkg-plist b/japanese/p5-Text-ChaSen/pkg-plist
index 4fbb0ee9a1c5..d5fe30580ec6 100644
--- a/japanese/p5-Text-ChaSen/pkg-plist
+++ b/japanese/p5-Text-ChaSen/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/ChaSen.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/ChaSen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
%%PORTDOCS%%share/chasen/doc/README.perl
diff --git a/japanese/p5-Text-Kakasi/Makefile b/japanese/p5-Text-Kakasi/Makefile
index e44a6a54ba34..5ad7341ce381 100644
--- a/japanese/p5-Text-Kakasi/Makefile
+++ b/japanese/p5-Text-Kakasi/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= kakasi.3:${PORTSDIR}/japanese/kakasi
PERL_CONFIGURE= yes
CONFIGURE_ENV= PREFIX="${PREFIX}"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Text::Kakasi.3
.include <bsd.port.pre.mk>
diff --git a/japanese/p5-Text-Kakasi/pkg-plist b/japanese/p5-Text-Kakasi/pkg-plist
index 193f8d982dfe..ee8ee8e8d6f3 100644
--- a/japanese/p5-Text-Kakasi/pkg-plist
+++ b/japanese/p5-Text-Kakasi/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/Kakasi.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Kakasi/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Kakasi
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Kakasi 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/Kakasi.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index 8cdf1d7332b8..29b4d0a979b2 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -18,6 +18,5 @@ COMMENT= A perl extension module to use NKF
PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/NKF.mod
MAN3= NKF.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/japanese/p5-nkf/pkg-plist b/japanese/p5-nkf/pkg-plist
index f13c00420685..d7c7cc452570 100644
--- a/japanese/p5-nkf/pkg-plist
+++ b/japanese/p5-nkf/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/NKF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NKF/NKF.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NKF/NKF.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NKF/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NKF
+%%SITE_PERL%%/%%PERL_ARCH%%/NKF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NKF/NKF.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NKF/NKF.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NKF/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NKF
diff --git a/japanese/srd-fpw/Makefile b/japanese/srd-fpw/Makefile
index 6d38741350ec..e9ce9f694d2f 100644
--- a/japanese/srd-fpw/Makefile
+++ b/japanese/srd-fpw/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= taoka@FreeBSD.org
COMMENT= A English - Japanese Dictionary "Random House" (EPWING V1 format)
BUILD_DEPENDS= fpwmake:${PORTSDIR}/japanese/freepwing \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+ ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
IS_INTERACTIVE= YES
RESTRICTED= "The original dictionary is not free"
diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile
index ce4f3164d81b..1004ff2ce42b 100644
--- a/japanese/waeijiro-fpw/Makefile
+++ b/japanese/waeijiro-fpw/Makefile
@@ -17,7 +17,7 @@ COMMENT= WAEIJIRO English - Japanese Dictionary (EPWING V1 format)
EXTRACT_DEPENDS=${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+ ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
RESTRICTED= "The original dictionary is not free"
NO_PACKAGE= "The original dictionary is not free"
diff --git a/japanese/weblint97/Makefile b/japanese/weblint97/Makefile
index 6d3a5788b89d..b3c0c0708994 100644
--- a/japanese/weblint97/Makefile
+++ b/japanese/weblint97/Makefile
@@ -16,7 +16,7 @@ DISTNAME= weblint-97-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An internationalized HTML checker with japanese message(EUC-JP)
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/jcode.pl:${PORTSDIR}/japanese/jcode.pl
+RUN_DEPENDS= ${SITE_PERL}/jcode.pl:${PORTSDIR}/japanese/jcode.pl
WRKSRC= ${WRKDIR}/weblint-97
MANLANG= ja
diff --git a/lang/p5-Error/Makefile b/lang/p5-Error/Makefile
index 6226a316af26..51d3a8806e60 100644
--- a/lang/p5-Error/Makefile
+++ b/lang/p5-Error/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to provide Error/exception support for perl: Error
PERL_CONFIGURE= YES
MAN3= Error.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/lang/p5-Error/pkg-plist b/lang/p5-Error/pkg-plist
index 71a183710826..e8875e37ddc9 100644
--- a/lang/p5-Error/pkg-plist
+++ b/lang/p5-Error/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Error.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Error/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Error 2>/dev/null || true
+%%SITE_PERL%%/Error.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error 2>/dev/null || true
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index 814c268b3b52..ceb99eef7fb8 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Perl module inspired by the Tcl version of Expect
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO/Tty.pm:${PORTSDIR}/devel/p5-IO-Tty \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Stty.pm:${PORTSDIR}/devel/p5-IO-Stty
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO/Tty.pm:${PORTSDIR}/devel/p5-IO-Tty \
+ ${SITE_PERL}/IO/Stty.pm:${PORTSDIR}/devel/p5-IO-Stty
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Expect.3
.include <bsd.port.mk>
diff --git a/lang/p5-Expect/pkg-plist b/lang/p5-Expect/pkg-plist
index 04c3ce025fb5..edc73e0e5fce 100644
--- a/lang/p5-Expect/pkg-plist
+++ b/lang/p5-Expect/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Expect.pod
-lib/perl5/site_perl/%%PERL_VER%%/Expect.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Expect/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Expect 2>/dev/null || true
+%%SITE_PERL%%/Expect.pod
+%%SITE_PERL%%/Expect.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect 2>/dev/null || true
diff --git a/lang/p5-Scalar-List-Utils/pkg-plist b/lang/p5-Scalar-List-Utils/pkg-plist
index a36c83f0f0ef..c202f3eda11f 100644
--- a/lang/p5-Scalar-List-Utils/pkg-plist
+++ b/lang/p5-Scalar-List-Utils/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util/Util.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util/Util.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Scalar/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/List/Util.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/List 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/Util.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/Util.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Scalar/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/List/Util.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Scalar 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/List 2>/dev/null || true
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index 9a7e05ccda23..574e70291891 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Switch - A switch statement for Perl
-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}/Text/Balanced.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
+ ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Switch.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/lang/p5-Switch/pkg-plist b/lang/p5-Switch/pkg-plist
index 8fed5517e612..6dadc139d1ff 100644
--- a/lang/p5-Switch/pkg-plist
+++ b/lang/p5-Switch/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Switch/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Switch.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Switch 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch/.packlist
+%%SITE_PERL%%/Switch.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch 2>/dev/null || true
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index b6bf7952aa48..fd57d0277e8d 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+= POLLUTE=1
CONFIGURE_ENV+= PREFIX=${PREFIX}
WRKSRC= ${WRKDIR}/${PORTNAME}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tcl.3
.include <bsd.port.mk>
diff --git a/lang/p5-Tcl/pkg-plist b/lang/p5-Tcl/pkg-plist
index e75d422354b1..d06b92d73503 100644
--- a/lang/p5-Tcl/pkg-plist
+++ b/lang/p5-Tcl/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tcl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tcl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tcl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl
+%%SITE_PERL%%/%%PERL_ARCH%%/Tcl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tcl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tcl.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl
diff --git a/lang/p5-ePerl/Makefile b/lang/p5-ePerl/Makefile
index ef56af3cece1..484a101f04e4 100644
--- a/lang/p5-ePerl/Makefile
+++ b/lang/p5-ePerl/Makefile
@@ -19,6 +19,5 @@ COMMENT= Perl Modules of ePerl package: Parse::ePerl, Apache::ePerl
PERL_CONFIGURE= yes
MAN3= Parse::ePerl.3 Apache::ePerl.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/lang/p5-ePerl/pkg-plist b/lang/p5-ePerl/pkg-plist
index 34c6f4866d60..8a338de6974f 100644
--- a/lang/p5-ePerl/pkg-plist
+++ b/lang/p5-ePerl/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ePerl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Parse/ePerl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl/ePerl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl/ePerl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/ePerl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Parse
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/ePerl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Parse/ePerl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/ePerl.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/ePerl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Parse
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/lang/perl5.10/pkg-plist b/lang/perl5.10/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.10/pkg-plist
+++ b/lang/perl5.10/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5.12/pkg-plist b/lang/perl5.12/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.12/pkg-plist
+++ b/lang/perl5.12/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5.6/pkg-plist b/lang/perl5.6/pkg-plist
index 81a9ea1ce296..ec2a2459167c 100644
--- a/lang/perl5.6/pkg-plist
+++ b/lang/perl5.6/pkg-plist
@@ -898,11 +898,11 @@ lib/perl5/%%PERL_VER%%/validate.pl
lib/perl5/%%PERL_VER%%/vars.pm
lib/perl5/%%PERL_VER%%/warnings.pm
lib/perl5/%%PERL_VER%%/warnings/register.pm
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
diff --git a/lang/perl5.8/pkg-plist b/lang/perl5.8/pkg-plist
index 2790feac56e6..a69fdf5833bc 100644
--- a/lang/perl5.8/pkg-plist
+++ b/lang/perl5.8/pkg-plist
@@ -1285,8 +1285,8 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@dirrm lib/perl5/5.8.0/BSDPAN/BSDPAN
@dirrm lib/perl5/5.8.0/BSDPAN/ExtUtils
@dirrm lib/perl5/5.8.0/BSDPAN
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
@@ -1447,9 +1447,9 @@ lib/perl5/%%PERL_VER%%/AutoSplit.pm
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
@unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5/pkg-plist b/lang/perl5/pkg-plist
index 81a9ea1ce296..ec2a2459167c 100644
--- a/lang/perl5/pkg-plist
+++ b/lang/perl5/pkg-plist
@@ -898,11 +898,11 @@ lib/perl5/%%PERL_VER%%/validate.pl
lib/perl5/%%PERL_VER%%/vars.pm
lib/perl5/%%PERL_VER%%/warnings.pm
lib/perl5/%%PERL_VER%%/warnings/register.pm
-@unexec find %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%% 2>/dev/null || true
+@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
diff --git a/lang/ruby-perl/pkg-plist b/lang/ruby-perl/pkg-plist
index 30830750ff66..82abc52fb36f 100644
--- a/lang/ruby-perl/pkg-plist
+++ b/lang/ruby-perl/pkg-plist
@@ -9,8 +9,8 @@
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ruby.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/Ruby.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/Ruby.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby
+%%SITE_PERL%%/%%PERL_ARCH%%/Ruby.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ruby/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ruby/Ruby.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ruby/Ruby.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ruby
diff --git a/mail/bayespam/Makefile b/mail/bayespam/Makefile
index 4187f3fe893e..a852b7743e0f 100644
--- a/mail/bayespam/Makefile
+++ b/mail/bayespam/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.garyarnold.com/projects/
MAINTAINER= lioux@FreeBSD.org
COMMENT= qmail spam filter written in Perl using Bayesian classification
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
+RUN_DEPENDS= ${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
USE_PERL5= yes
USE_REINPLACE= yes
diff --git a/mail/bayespam/pkg-plist b/mail/bayespam/pkg-plist
index 413d0522855a..ee78e836b847 100644
--- a/mail/bayespam/pkg-plist
+++ b/mail/bayespam/pkg-plist
@@ -1,7 +1,7 @@
bin/bayes_process_email.pl
bin/bayes_spam_check.pl
bin/bayestest.pl
-lib/perl5/site_perl/%%PERL_VER%%/Bayespam/Process.pm
+%%SITE_PERL%%/Bayespam/Process.pm
%%PORTDOCS%%share/doc/bayespam/AUTHORS
%%PORTDOCS%%share/doc/bayespam/COPYING
%%PORTDOCS%%share/doc/bayespam/Changelog
@@ -10,4 +10,4 @@ lib/perl5/site_perl/%%PERL_VER%%/Bayespam/Process.pm
%%PORTDOCS%%share/doc/bayespam/TODO
%%PORTDOCS%%share/doc/bayespam/qmail.sample
%%PORTDOCS%%@dirrm share/doc/bayespam
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bayespam
+@dirrm %%SITE_PERL%%/Bayespam
diff --git a/mail/cmail/pkg-plist b/mail/cmail/pkg-plist
index 7cfa9da4ea48..64a21d534077 100644
--- a/mail/cmail/pkg-plist
+++ b/mail/cmail/pkg-plist
@@ -4,17 +4,17 @@ bin/cmail
%%PORTDOCS%%@dirrm share/doc/cmail
share/examples/cmail/cmail.rc
@dirrm share/examples/cmail
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cmail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cmail
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/file.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/pop3.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/maildir.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/mbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/In/imap.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/color.pm
-lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/plain.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail/In
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail/Out
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/cmail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/cmail
+%%SITE_PERL%%/CMail/In/Base.pm
+%%SITE_PERL%%/CMail/In/file.pm
+%%SITE_PERL%%/CMail/In/pop3.pm
+%%SITE_PERL%%/CMail/In/maildir.pm
+%%SITE_PERL%%/CMail/In/mbox.pm
+%%SITE_PERL%%/CMail/In/imap.pm
+%%SITE_PERL%%/CMail/Out/Base.pm
+%%SITE_PERL%%/CMail/Out/color.pm
+%%SITE_PERL%%/CMail/Out/plain.pm
+@dirrm %%SITE_PERL%%/CMail/In
+@dirrm %%SITE_PERL%%/CMail/Out
+@dirrm %%SITE_PERL%%/CMail
diff --git a/mail/cyrus-imapd/pkg-plist b/mail/cyrus-imapd/pkg-plist
index 0be945641dc4..5cf28fd7971f 100644
--- a/mail/cyrus-imapd/pkg-plist
+++ b/mail/cyrus-imapd/pkg-plist
@@ -59,29 +59,29 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 6d1199956909..9d2a994ce2c1 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -111,10 +111,10 @@ PKGINSTALL= ${WRKDIR}/pkg-install
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
@@ -143,7 +143,7 @@ post-patch:
${WRKSRC}/tools/mkimap
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
- @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+ @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
index ddde37ab1d7e..2c080ed13049 100644
--- a/mail/cyrus-imapd2/pkg-plist
+++ b/mail/cyrus-imapd2/pkg-plist
@@ -77,24 +77,24 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 381332b97bcb..9ae82e1bdbef 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -133,10 +133,10 @@ PKGINSTALL= ${WRKDIR}/pkg-install
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
@@ -168,7 +168,7 @@ post-patch:
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
- @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+ @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index d60cce6f568f..430c67e0260c 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -85,24 +85,24 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 381332b97bcb..9ae82e1bdbef 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -133,10 +133,10 @@ PKGINSTALL= ${WRKDIR}/pkg-install
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
@@ -168,7 +168,7 @@ post-patch:
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
- @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+ @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index d60cce6f568f..430c67e0260c 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -85,24 +85,24 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 381332b97bcb..9ae82e1bdbef 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -133,10 +133,10 @@ PKGINSTALL= ${WRKDIR}/pkg-install
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
@@ -168,7 +168,7 @@ post-patch:
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
- @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+ @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index d60cce6f568f..430c67e0260c 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -85,24 +85,24 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index e39296fcc233..824a8406bea3 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -15,11 +15,11 @@ DISTFILES= ${PORTNAME}.${PORTVERSION}:demime demime_junkmail.cf:junkmail
MAINTAINER= petef@FreeBSD.org
COMMENT= A tool to scrub mime from mailing lists
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/FormatText.pm:${PORTSDIR}/textproc/p5-HTML-Format \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+ ${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/HTML/FormatText.pm:${PORTSDIR}/textproc/p5-HTML-Format \
+ ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
+ ${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
NO_BUILD= yes
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index 4784783b68f4..d31edc4a24fc 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= erwin@FreeBSD.org
COMMENT= A script to fetch mail from a Hotmail or MSN mailbox
RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/libnet.cfg:${PORTSDIR}/net/p5-Net
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/Net/libnet.cfg:${PORTSDIR}/net/p5-Net
MAN1= ${PORTNAME}.1
NO_BUILD= yes
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 3823e5751ef6..d41f496e8cbf 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
COMMENT= Search mailboxes for a given regexp and display matching emails
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS= ${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS= ${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
PERL_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/mail/grepmail/pkg-plist b/mail/grepmail/pkg-plist
index 281cbfa14ff6..d4a1e3e833a2 100644
--- a/mail/grepmail/pkg-plist
+++ b/mail/grepmail/pkg-plist
@@ -1,3 +1,3 @@
bin/grepmail
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/grepmail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/grepmail
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/grepmail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/grepmail
diff --git a/mail/mail2procmailrc/Makefile b/mail/mail2procmailrc/Makefile
index 44eaa9a23721..1439be27f181 100644
--- a/mail/mail2procmailrc/Makefile
+++ b/mail/mail2procmailrc/Makefile
@@ -15,9 +15,9 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= mail to procmailrc generator
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Curses/Widgets.pm:${PORTSDIR}/devel/p5-Curses-Widgets \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
+ ${SITE_PERL}/Curses/Widgets.pm:${PORTSDIR}/devel/p5-Curses-Widgets \
+ ${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools
USE_PERL5= yes
NO_BUILD= yes
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 31d55b72fe88..8e00796467ca 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -17,9 +17,9 @@ MAINTAINER= anders@FreeBSD.org
COMMENT= A mailing list manager
.if defined(WITH_SHA1_COOKIES)
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
.else
-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
.endif
USE_PERL5= yes
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index 15e66f3e0345..563c42de4a7e 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= MS Outlook Express .mbx to mbox file converter
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
+BUILD_DEPENDS= ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/mail/mbx2mbox/pkg-plist b/mail/mbx2mbox/pkg-plist
index 4d5a1c1f7df3..3c86ea46896f 100644
--- a/mail/mbx2mbox/pkg-plist
+++ b/mail/mbx2mbox/pkg-plist
@@ -1,3 +1,3 @@
bin/mbx2mbox
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mbx2mbox/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mbx2mbox
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/mbx2mbox/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mbx2mbox
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 623945a45cc5..b4ec7aab867f 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS= \
USE_PERL5= yes
USE_REINPLACE= yes
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
GNU_CONFIGURE= yes
MAILUSER?= mailnull
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 4724d8aeb853..15c1e5ce1a47 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Find RFC 822 email addresses in plain text
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
+BUILD_DEPENDS= ${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/mail/p5-Email-Find/pkg-plist b/mail/p5-Email-Find/pkg-plist
index 589207986f1c..777a675f573c 100644
--- a/mail/p5-Email-Find/pkg-plist
+++ b/mail/p5-Email-Find/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Email/Find.pm
-lib/perl5/site_perl/%%PERL_VER%%/Email/Find/addrspec.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Email/Find/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Email/Find
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Email/Find
+%%SITE_PERL%%/Email/Find.pm
+%%SITE_PERL%%/Email/Find/addrspec.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find/.packlist
+@dirrm %%SITE_PERL%%/Email/Find
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index d010a5de6c21..2e9950224338 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -21,6 +21,5 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Email::Valid::Loose.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index 9b3bfff60021..bbd6dd8f36b1 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -22,6 +22,5 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Email::Valid.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index 771032e54841..bbc92d433314 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module for basic IMAP server administration
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= IMAP::Admin.3
post-install:
diff --git a/mail/p5-IMAP-Admin/pkg-plist b/mail/p5-IMAP-Admin/pkg-plist
index 4dd734fc2d3b..09bfac3bace7 100644
--- a/mail/p5-IMAP-Admin/pkg-plist
+++ b/mail/p5-IMAP-Admin/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMAP/Admin/.packlist
+%%SITE_PERL%%/IMAP/Admin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Admin/.packlist
share/examples/p5-IMAP-Admin/create.pl
share/examples/p5-IMAP-Admin/delete.pl
@dirrm share/examples/p5-IMAP-Admin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMAP/Admin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IMAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Admin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
+@dirrm %%SITE_PERL%%/IMAP
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 19ac4f2b90e4..f9777a3f8d6f 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -16,14 +16,13 @@ DISTNAME= MIME-tools-${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= A set of perl5 modules for MIME
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS= ${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
WRKSRC= ${WRKDIR}/MIME-tools-5.411
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= MIME::Body.3 \
MIME::Decoder.3 \
MIME::Decoder::Base64.3 \
@@ -49,7 +48,7 @@ MAN3= MIME::Body.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
.endif
post-patch:
diff --git a/mail/p5-MIME-Tools/pkg-plist b/mail/p5-MIME-Tools/pkg-plist
index 120906b55a6d..5722ecd9136b 100644
--- a/mail/p5-MIME-Tools/pkg-plist
+++ b/mail/p5-MIME-Tools/pkg-plist
@@ -1,27 +1,27 @@
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Body.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Entity.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/QuotedPrint.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/Base64.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/Binary.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/Gzip64.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/NBit.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder/UU.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Field/ConTraEnc.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Field/ContDisp.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Field/ContType.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Field/ParamVal.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Head.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser/Filer.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser/Reader.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser/Results.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Tools.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/WordDecoder.pm
-lib/perl5/site_perl/%%PERL_VER%%/MIME/Words.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME-tools/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME-tools
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MIME/Field
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MIME/Decoder
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MIME/Parser
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MIME 2>/dev/null || true
+%%SITE_PERL%%/MIME/Body.pm
+%%SITE_PERL%%/MIME/Entity.pm
+%%SITE_PERL%%/MIME/Decoder.pm
+%%SITE_PERL%%/MIME/Decoder/QuotedPrint.pm
+%%SITE_PERL%%/MIME/Decoder/Base64.pm
+%%SITE_PERL%%/MIME/Decoder/Binary.pm
+%%SITE_PERL%%/MIME/Decoder/Gzip64.pm
+%%SITE_PERL%%/MIME/Decoder/NBit.pm
+%%SITE_PERL%%/MIME/Decoder/UU.pm
+%%SITE_PERL%%/MIME/Field/ConTraEnc.pm
+%%SITE_PERL%%/MIME/Field/ContDisp.pm
+%%SITE_PERL%%/MIME/Field/ContType.pm
+%%SITE_PERL%%/MIME/Field/ParamVal.pm
+%%SITE_PERL%%/MIME/Head.pm
+%%SITE_PERL%%/MIME/Parser.pm
+%%SITE_PERL%%/MIME/Parser/Filer.pm
+%%SITE_PERL%%/MIME/Parser/Reader.pm
+%%SITE_PERL%%/MIME/Parser/Results.pm
+%%SITE_PERL%%/MIME/Tools.pm
+%%SITE_PERL%%/MIME/WordDecoder.pm
+%%SITE_PERL%%/MIME/Words.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME-tools/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME-tools
+@dirrm %%SITE_PERL%%/MIME/Field
+@dirrm %%SITE_PERL%%/MIME/Decoder
+@dirrm %%SITE_PERL%%/MIME/Parser
+@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 571cb32d46ca..5decd3847e90 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -23,10 +23,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Net/Config.pm:${PORTSDIR}/net/p5-Net \
${SITE_PERL}/${PERL_ARCH}/Razor2/Client/Agent.pm:${PORTSDIR}/mail/razor-agents
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= Mail::Audit.3 \
Mail::Audit::KillDups.3 \
Mail::Audit::List.3 \
diff --git a/mail/p5-Mail-Audit/pkg-plist b/mail/p5-Mail-Audit/pkg-plist
index c973337c8596..5f3836ff4bf9 100644
--- a/mail/p5-Mail-Audit/pkg-plist
+++ b/mail/p5-Mail-Audit/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/KillDups.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/List.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/MAPS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/MailInternet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/MimeEntity.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/PGP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit/Razor.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Audit/.packlist
+%%SITE_PERL%%/Mail/Audit.pm
+%%SITE_PERL%%/Mail/Audit/KillDups.pm
+%%SITE_PERL%%/Mail/Audit/List.pm
+%%SITE_PERL%%/Mail/Audit/MAPS.pm
+%%SITE_PERL%%/Mail/Audit/MailInternet.pm
+%%SITE_PERL%%/Mail/Audit/MimeEntity.pm
+%%SITE_PERL%%/Mail/Audit/PGP.pm
+%%SITE_PERL%%/Mail/Audit/Razor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/.packlist
%%PORTDOCS%%share/doc/p5-Mail-Audit/Changes
%%PORTDOCS%%share/doc/p5-Mail-Audit/FAQ
%%PORTDOCS%%share/doc/p5-Mail-Audit/README
@@ -14,7 +14,7 @@ share/examples/p5-Mail-Audit/popread
share/examples/p5-Mail-Audit/proc2ma
@dirrm share/examples/p5-Mail-Audit
%%PORTDOCS%%@dirrm share/doc/p5-Mail-Audit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Audit
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Audit
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Mail/Audit
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-Box1/Makefile b/mail/p5-Mail-Box1/Makefile
index 89b1a5ca620c..ee8cd1b01df1 100644
--- a/mail/p5-Mail-Box1/Makefile
+++ b/mail/p5-Mail-Box1/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= ${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
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= Mail::Box.3 \
Mail::Box::Index.3 \
Mail::Box::Locker.3 \
diff --git a/mail/p5-Mail-Box1/pkg-plist b/mail/p5-Mail-Box1/pkg-plist
index 3f30987b987c..a9fb9b401ae7 100644
--- a/mail/p5-Mail-Box1/pkg-plist
+++ b/mail/p5-Mail-Box1/pkg-plist
@@ -1,26 +1,26 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Index.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/DotLock.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/NFS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Manager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Threads.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie/ARRAY.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie/HASH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Box
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Box.pm
+%%SITE_PERL%%/Mail/Box/Index.pm
+%%SITE_PERL%%/Mail/Box/Locker.pm
+%%SITE_PERL%%/Mail/Box/Locker/DotLock.pm
+%%SITE_PERL%%/Mail/Box/Locker/File.pm
+%%SITE_PERL%%/Mail/Box/Locker/NFS.pm
+%%SITE_PERL%%/Mail/Box/MH.pm
+%%SITE_PERL%%/Mail/Box/MH/Message.pm
+%%SITE_PERL%%/Mail/Box/Manager.pm
+%%SITE_PERL%%/Mail/Box/Mbox.pm
+%%SITE_PERL%%/Mail/Box/Mbox/Message.pm
+%%SITE_PERL%%/Mail/Box/Message.pm
+%%SITE_PERL%%/Mail/Box/Threads.pm
+%%SITE_PERL%%/Mail/Box/Tie.pm
+%%SITE_PERL%%/Mail/Box/Tie/ARRAY.pm
+%%SITE_PERL%%/Mail/Box/Tie/HASH.pm
+%%SITE_PERL%%/Mail/Message.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Mail/Box/Locker
+@dirrm %%SITE_PERL%%/Mail/Box/Mbox
+@dirrm %%SITE_PERL%%/Mail/Box/MH
+@dirrm %%SITE_PERL%%/Mail/Box/Tie
+@dirrm %%SITE_PERL%%/Mail/Box
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index fd175e0c46a0..0145c56b7c39 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -25,7 +25,6 @@ EZMLM_DIR?= ${LOCALBASE}
USE_PERL5= YES
MAN3= Mail::Ezmlm.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
# For this version, since it is a bugfix
WRKSRC= ${WRKDIR}/Ezmlm-0.03
diff --git a/mail/p5-Mail-Ezmlm/pkg-plist b/mail/p5-Mail-Ezmlm/pkg-plist
index 64eea9c5d158..4318a9d7fcfd 100644
--- a/mail/p5-Mail-Ezmlm/pkg-plist
+++ b/mail/p5-Mail-Ezmlm/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Ezmlm.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Ezmlm/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Ezmlm
+%%SITE_PERL%%/Mail/Ezmlm.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index a57daf9fc600..c8b2441ac9bc 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Mail/Audit.pm:${PORTSDIR}/mail/p5-Mail-Audit \
${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
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::FilterXML.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-FilterXML/pkg-plist b/mail/p5-Mail-FilterXML/pkg-plist
index 710dd16eaa03..be856d318e47 100644
--- a/mail/p5-Mail-FilterXML/pkg-plist
+++ b/mail/p5-Mail-FilterXML/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/mailfilter.pl
-lib/perl5/site_perl/%%PERL_VER%%/Mail/FilterXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/FilterXML/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/FilterXML
+%%SITE_PERL%%/Mail/mailfilter.pl
+%%SITE_PERL%%/Mail/FilterXML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/FilterXML/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/FilterXML
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 42f363226564..8d8d582580f6 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -16,18 +16,17 @@ DISTNAME= MailFolder-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl module for a folder-independant interface to email folders
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Head.pm:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS= ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync
+RUN_DEPENDS= ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \
+ ${SITE_PERL}/MIME/Head.pm:${PORTSDIR}/mail/p5-MIME-Tools
PERL_CONFIGURE= YES
MAN3= Mail::Folder.3 Mail::Folder::Emaul.3 Mail::Folder::Mbox.3 \
Mail::Folder::NNTP.3 Mail::Folder::Maildir.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Folder/pkg-plist b/mail/p5-Mail-Folder/pkg-plist
index 5fd4400df364..0205c6f82c86 100644
--- a/mail/p5-Mail-Folder/pkg-plist
+++ b/mail/p5-Mail-Folder/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder/Emaul.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder/Maildir.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder/Mbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder/NNTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Folder
+%%SITE_PERL%%/Mail/Folder.pm
+%%SITE_PERL%%/Mail/Folder/Emaul.pm
+%%SITE_PERL%%/Mail/Folder/Maildir.pm
+%%SITE_PERL%%/Mail/Folder/Mbox.pm
+%%SITE_PERL%%/Mail/Folder/NNTP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
+@dirrm %%SITE_PERL%%/Mail/Folder
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index c95e0822a2cb..acb62597f4f2 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module to parse daily newsletters from freshmeat.net
BUILD_DEPENDS= ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
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= Freshmeat.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Freshmeat/pkg-plist b/mail/p5-Mail-Freshmeat/pkg-plist
index 6bc030c0cfdf..c95a97212fc6 100644
--- a/mail/p5-Mail-Freshmeat/pkg-plist
+++ b/mail/p5-Mail-Freshmeat/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat/Article.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat/Entry.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat/Utils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Freshmeat/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Freshmeat
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Freshmeat.pm
+%%SITE_PERL%%/Mail/Freshmeat/Article.pm
+%%SITE_PERL%%/Mail/Freshmeat/Entry.pm
+%%SITE_PERL%%/Mail/Freshmeat/Utils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat/.packlist
+@dirrm %%SITE_PERL%%/Mail/Freshmeat
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index d0934990563c..f37c538e1ef7 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module to detect newer messages in procmail-generated mailboxes
BUILD_DEPENDS= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
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= Mail::Stats::Record.3 Mail::Stats.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist
index 5ef06671a955..6631fc615c67 100644
--- a/mail/p5-Mail-MailStats/pkg-plist
+++ b/mail/p5-Mail-MailStats/pkg-plist
@@ -1,10 +1,10 @@
bin/countmail
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Record.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Stats
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Stats.pm
+%%SITE_PERL%%/Mail/Stats/Config.pm
+%%SITE_PERL%%/Mail/Stats/Parser.pm
+%%SITE_PERL%%/Mail/Stats/Record.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats
+@dirrm %%SITE_PERL%%/Mail/Stats
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-QuoteWrap/Makefile b/mail/p5-Mail-QuoteWrap/Makefile
index ec1fe7108831..dad16ebbb547 100644
--- a/mail/p5-Mail-QuoteWrap/Makefile
+++ b/mail/p5-Mail-QuoteWrap/Makefile
@@ -17,11 +17,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= mharo@FreeBSD.org
COMMENT= Provides wrapping functionality for quoted Email and Usenet messages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Format.pm:${PORTSDIR}/textproc/p5-Text-Format
+BUILD_DEPENDS= ${SITE_PERL}/Text/Format.pm:${PORTSDIR}/textproc/p5-Text-Format
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::QuoteWrap.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-QuoteWrap/pkg-plist b/mail/p5-Mail-QuoteWrap/pkg-plist
index 92a055039a40..feb3473995ba 100644
--- a/mail/p5-Mail-QuoteWrap/pkg-plist
+++ b/mail/p5-Mail-QuoteWrap/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/QuoteWrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/QuoteWrap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index 7775b955b845..6281791d21fc 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl extension to access RBL-style host verification services
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::RBL.3
FILES= Makefile.PL test.pl RBL.pm
diff --git a/mail/p5-Mail-RBL/pkg-plist b/mail/p5-Mail-RBL/pkg-plist
index c6fbb6e5b3a8..2ccbd7513252 100644
--- a/mail/p5-Mail-RBL/pkg-plist
+++ b/mail/p5-Mail-RBL/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/RBL.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RBL/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RBL
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/RBL.pm
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-RFC822-Address/Makefile b/mail/p5-Mail-RFC822-Address/Makefile
index b79c9e6677f9..0cb493b9c08e 100644
--- a/mail/p5-Mail-RFC822-Address/Makefile
+++ b/mail/p5-Mail-RFC822-Address/Makefile
@@ -19,7 +19,6 @@ PERL_CONFIGURE= yes
INSTALL_TARGET= pure_site_install
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::RFC822::Address.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-RFC822-Address/pkg-plist b/mail/p5-Mail-RFC822-Address/pkg-plist
index 2f3138b4efd6..388f128629dd 100644
--- a/mail/p5-Mail-RFC822-Address/pkg-plist
+++ b/mail/p5-Mail-RFC822-Address/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/RFC822/Address.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/RFC822
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/RFC822
+%%SITE_PERL%%/Mail/RFC822/Address.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address/.packlist
+@dirrm %%SITE_PERL%%/Mail/RFC822
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 2afacabf6f9a..5ea00b7646b9 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${SITE_PERL}/File/NFSLock.pm:${PORTSDIR}/devel/p5-File-NFSLock \
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::Spool.3 Mail::Spool::Handle.3 Mail::Spool::Node.3
diff --git a/mail/p5-Mail-Spool/pkg-plist b/mail/p5-Mail-Spool/pkg-plist
index 61a2d6dc2a10..87d022981d17 100644
--- a/mail/p5-Mail-Spool/pkg-plist
+++ b/mail/p5-Mail-Spool/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Spool.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Spool/Handle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Spool/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Spool/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Spool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Spool
+%%SITE_PERL%%/Mail/Spool.pm
+%%SITE_PERL%%/Mail/Spool/Handle.pm
+%%SITE_PERL%%/Mail/Spool/Node.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool/.packlist
+@dirrm %%SITE_PERL%%/Mail/Spool
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool
diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist
index 01589bb17ec8..30ab4dbdb400 100644
--- a/mail/p5-Mail-Tools/pkg-plist
+++ b/mail/p5-Mail-Tools/pkg-plist
@@ -1,39 +1,39 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Address.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Cap.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Field.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Field/AddrList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Field/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Header.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Internet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/qmail.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/rfc822.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/sendmail.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/smtp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer/test.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Send.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/_prephdr.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/add_signature.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/escape_from.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/nntppost.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/reply.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/send.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/sign.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/smtpsend.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/unescape_from.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/mailaddress.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/maildomain.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/read_mbox.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Field
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Address.pm
+%%SITE_PERL%%/Mail/Cap.pm
+%%SITE_PERL%%/Mail/Field.pm
+%%SITE_PERL%%/Mail/Field/AddrList.pm
+%%SITE_PERL%%/Mail/Field/Date.pm
+%%SITE_PERL%%/Mail/Filter.pm
+%%SITE_PERL%%/Mail/Header.pm
+%%SITE_PERL%%/Mail/Internet.pm
+%%SITE_PERL%%/Mail/Mailer.pm
+%%SITE_PERL%%/Mail/Mailer/qmail.pm
+%%SITE_PERL%%/Mail/Mailer/rfc822.pm
+%%SITE_PERL%%/Mail/Mailer/sendmail.pm
+%%SITE_PERL%%/Mail/Mailer/smtp.pm
+%%SITE_PERL%%/Mail/Mailer/test.pm
+%%SITE_PERL%%/Mail/Send.pm
+%%SITE_PERL%%/Mail/Util.pm
+%%SITE_PERL%%/auto/Mail/Internet/_prephdr.al
+%%SITE_PERL%%/auto/Mail/Internet/add_signature.al
+%%SITE_PERL%%/auto/Mail/Internet/autosplit.ix
+%%SITE_PERL%%/auto/Mail/Internet/escape_from.al
+%%SITE_PERL%%/auto/Mail/Internet/nntppost.al
+%%SITE_PERL%%/auto/Mail/Internet/reply.al
+%%SITE_PERL%%/auto/Mail/Internet/send.al
+%%SITE_PERL%%/auto/Mail/Internet/sign.al
+%%SITE_PERL%%/auto/Mail/Internet/smtpsend.al
+%%SITE_PERL%%/auto/Mail/Internet/unescape_from.al
+%%SITE_PERL%%/auto/Mail/Util/autosplit.ix
+%%SITE_PERL%%/auto/Mail/Util/mailaddress.al
+%%SITE_PERL%%/auto/Mail/Util/maildomain.al
+%%SITE_PERL%%/auto/Mail/Util/read_mbox.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/Mail/Util
+@dirrm %%SITE_PERL%%/auto/Mail/Internet
+@dirrm %%SITE_PERL%%/auto/Mail
+@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Mail/Mailer
+@dirrm %%SITE_PERL%%/Mail/Field
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index e5ae57dd382e..f09b987ae568 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module to verify email addresses
BUILD_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
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= Mail::Verify.3
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Verify/pkg-plist b/mail/p5-Mail-Verify/pkg-plist
index 93316c1916b0..e092fe55d7c5 100644
--- a/mail/p5-Mail-Verify/pkg-plist
+++ b/mail/p5-Mail-Verify/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Verify.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Verify
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/Mail/Verify.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index a7fcc3808c1f..376fed3f3a58 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -16,7 +16,7 @@ DISTNAME= SMTP-Server-${PORTVERSION}
MAINTAINER= erwin@FreeBSD.org
COMMENT= A native Perl SMTP Server
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
RUN_DEPENDS= ${BUILD_DEPENDS}
MASTER_SITE_BACKUP+= http://www.macgyver.org/software/perl/
@@ -30,8 +30,8 @@ MAN3= Net::SMTP::Server.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
.endif
.include <bsd.port.post.mk>
diff --git a/mail/p5-Net-SMTP-Server/pkg-plist b/mail/p5-Net-SMTP-Server/pkg-plist
index a0b294ed30d3..267f6efa5ba2 100644
--- a/mail/p5-Net-SMTP-Server/pkg-plist
+++ b/mail/p5-Net-SMTP-Server/pkg-plist
@@ -1,18 +1,18 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP/Server/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP/Server/Relay.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/Client/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/Relay/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMTP/Server/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/Client
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server/Relay
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMTP/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/SMTP/Server.pm
+%%SITE_PERL%%/Net/SMTP/Server/Client.pm
+%%SITE_PERL%%/Net/SMTP/Server/Relay.pm
+%%SITE_PERL%%/auto/Net/SMTP/Server/Client/autosplit.ix
+%%SITE_PERL%%/auto/Net/SMTP/Server/Relay/autosplit.ix
+%%SITE_PERL%%/auto/Net/SMTP/Server/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server/.packlist
+@dirrm %%SITE_PERL%%/Net/SMTP/Server
+@unexec rmdir %D/%%SITE_PERL%%/Net/SMTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server/Client
+@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server/Relay
+@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net/SMTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index 30c1e7e23624..674ac5fce79a 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/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/mail/p5-POE-Component-Client-POP3/pkg-plist b/mail/p5-POE-Component-Client-POP3/pkg-plist
index eed6aad99217..5dd93f06af76 100644
--- a/mail/p5-POE-Component-Client-POP3/pkg-plist
+++ b/mail/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/mail/p5-Sendmail-Milter/pkg-plist b/mail/p5-Sendmail-Milter/pkg-plist
index f4ee907a779f..9e50dcab9ae2 100644
--- a/mail/p5-Sendmail-Milter/pkg-plist
+++ b/mail/p5-Sendmail-Milter/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Sendmail/Milter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Sendmail/sample.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail/Milter
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sendmail
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Sendmail
+%%SITE_PERL%%/%%PERL_ARCH%%/Sendmail/Milter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Sendmail/sample.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Sendmail
diff --git a/mail/p5-vpopmail/Makefile b/mail/p5-vpopmail/Makefile
index 125e2294cd4f..772a0b517844 100644
--- a/mail/p5-vpopmail/Makefile
+++ b/mail/p5-vpopmail/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= vpopmail.3
.include <bsd.port.mk>
diff --git a/mail/p5-vpopmail/pkg-plist b/mail/p5-vpopmail/pkg-plist
index 8b7e287a27cc..5c26ac126a40 100644
--- a/mail/p5-vpopmail/pkg-plist
+++ b/mail/p5-vpopmail/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vpopmail/vpopmail.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vpopmail/vpopmail.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vpopmail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/vpopmail
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/vpopmail.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/vpopmail/vpopmail.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/vpopmail/vpopmail.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/vpopmail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/vpopmail
+%%SITE_PERL%%/%%PERL_ARCH%%/vpopmail.pm
diff --git a/mail/pflogsumm/Makefile b/mail/pflogsumm/Makefile
index 3331e0bce35d..d4647af76df1 100644
--- a/mail/pflogsumm/Makefile
+++ b/mail/pflogsumm/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://jimsun.LinxNet.com/downloads/ \
MAINTAINER= erwin@FreeBSD.org
COMMENT= Postfix Log Entry Summarizer
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
NO_BUILD= yes
USE_PERL5= yes
diff --git a/mail/pronto/Makefile b/mail/pronto/Makefile
index 6dfd96692984..ca0f6a4206a6 100644
--- a/mail/pronto/Makefile
+++ b/mail/pronto/Makefile
@@ -13,23 +13,23 @@ MAINTAINER= killer@prosalg.no
COMMENT= A Mail Client for Gnome/Gtk written in Perl
BUILD_DEPENDS=\
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/DBD/CSV.pm:${PORTSDIR}/databases/p5-DBD-CSV \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Lingua/Ispell.pm:${PORTSDIR}/textproc/p5-Lingua-Ispell
+ ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
+ ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+ ${SITE_PERL}/DBD/CSV.pm:${PORTSDIR}/databases/p5-DBD-CSV \
+ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
+ ${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement \
+ ${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+ ${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+ ${SITE_PERL}/Lingua/Ispell.pm:${PORTSDIR}/textproc/p5-Lingua-Ispell
.if defined(WITH_HTML)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/XmHTML.pm:${PORTSDIR}/x11-toolkits/p5-GtkXmHTML
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Gtk/XmHTML.pm:${PORTSDIR}/x11-toolkits/p5-GtkXmHTML
.endif
.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
.endif
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/mail/ricochet/Makefile b/mail/ricochet/Makefile
index 335b1a0d4dcc..dc42e8be8a49 100644
--- a/mail/ricochet/Makefile
+++ b/mail/ricochet/Makefile
@@ -14,11 +14,11 @@ MASTER_SITES= http://vipul.net/perl/sources/spamcontrol/ricochet/
MAINTAINER= ache@FreeBSD.org
COMMENT= An automated agent for tracing and reporting internet junk mail
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS= ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
+ ${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
+ ${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois \
+ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
NO_BUILD= yes
PERL_CONFIGURE= yes
diff --git a/mail/rmoldmail/Makefile b/mail/rmoldmail/Makefile
index 88adc0571d6d..e1f57b2077e4 100644
--- a/mail/rmoldmail/Makefile
+++ b/mail/rmoldmail/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://probiers.net/projects/rmoldmail/
MAINTAINER= petef@FreeBSD.org
COMMENT= Prune a mailbox of messages older than a set number of days
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
NO_BUILD= yes
diff --git a/mail/tlb/Makefile b/mail/tlb/Makefile
index d66267b175c5..d6b4bcec7116 100644
--- a/mail/tlb/Makefile
+++ b/mail/tlb/Makefile
@@ -16,9 +16,9 @@ EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
COMMENT= The List Batcher, a general purpose mail list delivery engine
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS= ${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
NO_BUILD= yes
USE_PERL5= yes
diff --git a/math/p5-AI-NeuralNet-BackProp/Makefile b/math/p5-AI-NeuralNet-BackProp/Makefile
index 1cf12959a47a..b8b2f630707b 100644
--- a/math/p5-AI-NeuralNet-BackProp/Makefile
+++ b/math/p5-AI-NeuralNet-BackProp/Makefile
@@ -19,7 +19,6 @@ USE_ZIP= yes
NO_WRKSUBDIR= yes
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AI::NeuralNet::BackProp.3
.include <bsd.port.mk>
diff --git a/math/p5-AI-NeuralNet-BackProp/pkg-plist b/math/p5-AI-NeuralNet-BackProp/pkg-plist
index f52b2ac7d98c..4ad9c8e1fa2f 100644
--- a/math/p5-AI-NeuralNet-BackProp/pkg-plist
+++ b/math/p5-AI-NeuralNet-BackProp/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/AI/NeuralNet/BackProp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet/BackProp/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet/BackProp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/AI/NeuralNet
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AI 2>/dev/null || true
+%%SITE_PERL%%/AI/NeuralNet/BackProp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/BackProp/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/BackProp
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet
+@dirrm %%SITE_PERL%%/AI/NeuralNet
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
diff --git a/math/p5-AI-NeuralNet-Mesh/Makefile b/math/p5-AI-NeuralNet-Mesh/Makefile
index cb1585f68bc4..504b052fc2c4 100644
--- a/math/p5-AI-NeuralNet-Mesh/Makefile
+++ b/math/p5-AI-NeuralNet-Mesh/Makefile
@@ -19,7 +19,6 @@ USE_ZIP= yes
NO_WRKSUBDIR= yes
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AI::NeuralNet::Mesh.3
.include <bsd.port.mk>
diff --git a/math/p5-AI-NeuralNet-Mesh/pkg-plist b/math/p5-AI-NeuralNet-Mesh/pkg-plist
index e77e967d4811..5d0db789c5b5 100644
--- a/math/p5-AI-NeuralNet-Mesh/pkg-plist
+++ b/math/p5-AI-NeuralNet-Mesh/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/AI/NeuralNet/Mesh.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet/Mesh/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet/Mesh
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AI/NeuralNet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AI 2>/dev/null || true
+%%SITE_PERL%%/AI/NeuralNet/Mesh.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/Mesh/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/Mesh
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AI/NeuralNet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
diff --git a/math/p5-AI-Perceptron/Makefile b/math/p5-AI-Perceptron/Makefile
index af6d8fa3c60b..f03a5a4173e2 100644
--- a/math/p5-AI-Perceptron/Makefile
+++ b/math/p5-AI-Perceptron/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module for introducing to internal operations of neural networks
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AI::Perceptron.3
.include <bsd.port.mk>
diff --git a/math/p5-AI-Perceptron/pkg-plist b/math/p5-AI-Perceptron/pkg-plist
index 3244ca0d36a9..26ad10aac3a1 100644
--- a/math/p5-AI-Perceptron/pkg-plist
+++ b/math/p5-AI-Perceptron/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/AI/Perceptron.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/Perceptron/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/Perceptron
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AI 2>/dev/null || true
+%%SITE_PERL%%/AI/Perceptron.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Perceptron/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Perceptron
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
diff --git a/math/p5-Bit-ShiftReg/Makefile b/math/p5-Bit-ShiftReg/Makefile
index 26d998a19cc8..9bc963e99b6b 100644
--- a/math/p5-Bit-ShiftReg/Makefile
+++ b/math/p5-Bit-ShiftReg/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module implementing various bit shifting operations
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Bit::ShiftReg.3
.include <bsd.port.mk>
diff --git a/math/p5-Bit-ShiftReg/pkg-plist b/math/p5-Bit-ShiftReg/pkg-plist
index b403ff1bd8ee..36225f19994d 100644
--- a/math/p5-Bit-ShiftReg/pkg-plist
+++ b/math/p5-Bit-ShiftReg/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit/ShiftReg.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/ShiftReg
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Bit/ShiftReg.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index 4538dfdd9d0d..682b149e2971 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -17,7 +17,6 @@ COMMENT= Library of advanced math functions that includes a Perl OO module
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Bit::Vector.3 Bit::Vector::Overload.3 Carp::Clan.3
.include <bsd.port.mk>
diff --git a/math/p5-Bit-Vector/pkg-plist b/math/p5-Bit-Vector/pkg-plist
index 64bf469aed98..23fee290af41 100644
--- a/math/p5-Bit-Vector/pkg-plist
+++ b/math/p5-Bit-Vector/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit/Vector.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit/Vector.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit/Vector/Overload.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit/Vector/Overload.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Carp/Clan.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Carp/Clan.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit/Vector
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Carp 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector/Overload.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector/Overload.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Carp/Clan.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Carp/Clan.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Carp 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index 63a34f061383..34ef94ccbc47 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Graph, the Perl module for graph operations
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Heap.pm:${PORTSDIR}/devel/p5-Heap
+BUILD_DEPENDS= ${SITE_PERL}/Heap.pm:${PORTSDIR}/devel/p5-Heap
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -28,6 +28,5 @@ MAN3= Graph.3 \
Graph::HeapElem.3 \
Graph::Traversal.3 \
Graph::Undirected.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Graph/pkg-plist b/math/p5-Graph/pkg-plist
index 81b47fc9f068..40423eeb884e 100644
--- a/math/p5-Graph/pkg-plist
+++ b/math/p5-Graph/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Graph/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Graph.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graph/Directed.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graph/HeapElem.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graph/DFS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graph/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graph/Traversal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graph/BFS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Graph/Undirected.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Graph 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Graph 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/.packlist
+%%SITE_PERL%%/Graph.pm
+%%SITE_PERL%%/Graph/Directed.pm
+%%SITE_PERL%%/Graph/HeapElem.pm
+%%SITE_PERL%%/Graph/DFS.pm
+%%SITE_PERL%%/Graph/Base.pm
+%%SITE_PERL%%/Graph/Traversal.pm
+%%SITE_PERL%%/Graph/BFS.pm
+%%SITE_PERL%%/Graph/Undirected.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Graph 2>/dev/null || true
diff --git a/math/p5-Math-BaseCalc/Makefile b/math/p5-Math-BaseCalc/Makefile
index d1705e864171..e32e21514a34 100644
--- a/math/p5-Math-BaseCalc/Makefile
+++ b/math/p5-Math-BaseCalc/Makefile
@@ -18,6 +18,5 @@ COMMENT= Convert numbers between various bases
PERL_CONFIGURE= yes
MAN3= Math::BaseCalc.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Math-BaseCalc/pkg-plist b/math/p5-Math-BaseCalc/pkg-plist
index 4e834213f436..6ce08f343148 100644
--- a/math/p5-Math-BaseCalc/pkg-plist
+++ b/math/p5-Math-BaseCalc/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BaseCalc/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Math/BaseCalc.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BaseCalc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc/.packlist
+%%SITE_PERL%%/Math/BaseCalc.pm
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
diff --git a/math/p5-Math-Bezier/Makefile b/math/p5-Math-Bezier/Makefile
index d5e5641f3618..a8e345349bf0 100644
--- a/math/p5-Math-Bezier/Makefile
+++ b/math/p5-Math-Bezier/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to solve Bezier curves
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::Bezier.3
.include <bsd.port.mk>
diff --git a/math/p5-Math-Bezier/pkg-plist b/math/p5-Math-Bezier/pkg-plist
index ad4dfe4d4401..d9d725054d7b 100644
--- a/math/p5-Math-Bezier/pkg-plist
+++ b/math/p5-Math-Bezier/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Math/Bezier.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Bezier/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Bezier
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
+%%SITE_PERL%%/Math/Bezier.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
diff --git a/math/p5-Math-BigIntFast/Makefile b/math/p5-Math-BigIntFast/Makefile
index 1e86274f6934..0684d2dfe127 100644
--- a/math/p5-Math-BigIntFast/Makefile
+++ b/math/p5-Math-BigIntFast/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module wrapper for Bit::Vector to provide big integer math
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Bit/Vector.pm:${PORTSDIR}/math/p5-Bit-Vector
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= Math::BigIntFast.3
.include <bsd.port.mk>
diff --git a/math/p5-Math-BigIntFast/pkg-plist b/math/p5-Math-BigIntFast/pkg-plist
index ad8a9d0c62ef..fb78d7181e79 100644
--- a/math/p5-Math-BigIntFast/pkg-plist
+++ b/math/p5-Math-BigIntFast/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Math/BigIntFast.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BigIntFast/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BigIntFast
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
+%%SITE_PERL%%/Math/BigIntFast.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigIntFast/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigIntFast
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
diff --git a/math/p5-Math-Calc-Units/Makefile b/math/p5-Math-Calc-Units/Makefile
index 286ab7c2fbd1..e001c039e448 100644
--- a/math/p5-Math-Calc-Units/Makefile
+++ b/math/p5-Math-Calc-Units/Makefile
@@ -18,6 +18,5 @@ COMMENT= Human-readable unit-aware calculator
PERL_CONFIGURE= yes
MAN3= Math::Calc::Units.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Math-Calc-Units/pkg-plist b/math/p5-Math-Calc-Units/pkg-plist
index c63191fc2f46..721dc506009a 100644
--- a/math/p5-Math-Calc-Units/pkg-plist
+++ b/math/p5-Math-Calc-Units/pkg-plist
@@ -1,24 +1,24 @@
bin/ucalc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Calc/Units/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Compute.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Base2Metric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Byte.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Combo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Distance.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Metric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Multi.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert/Time.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Grammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Grammar.y
-lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Rank.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math/Calc/Units 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math/Calc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Calc/Units 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Calc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc/Units/.packlist
+%%SITE_PERL%%/Math/Calc/Units.pm
+%%SITE_PERL%%/Math/Calc/Units/Compute.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Base.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Base2Metric.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Byte.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Combo.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Date.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Distance.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Metric.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Multi.pm
+%%SITE_PERL%%/Math/Calc/Units/Convert/Time.pm
+%%SITE_PERL%%/Math/Calc/Units/Grammar.pm
+%%SITE_PERL%%/Math/Calc/Units/Grammar.y
+%%SITE_PERL%%/Math/Calc/Units/Rank.pm
+@unexec rmdir %D/%%SITE_PERL%%/Math/Calc/Units/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Math/Calc/Units 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Math/Calc 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc/Units 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
diff --git a/math/p5-Math-Currency/Makefile b/math/p5-Math-Currency/Makefile
index 7e11694dd8b7..f2f0cbf774e1 100644
--- a/math/p5-Math-Currency/Makefile
+++ b/math/p5-Math-Currency/Makefile
@@ -26,7 +26,6 @@ IGNORE= "Needs Perl 5.6.0 for Math::BigFloat"
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::Currency.3
.include <bsd.port.post.mk>
diff --git a/math/p5-Math-Expr/Makefile b/math/p5-Math-Expr/Makefile
index 96c19448fcbd..b7b383ed0c0a 100644
--- a/math/p5-Math-Expr/Makefile
+++ b/math/p5-Math-Expr/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module for parsing mathematical expressions into a tree structure
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::Expr.3 Math::Expr::FormulaDB.3 \
Math::Expr::MatchSet.3 Math::Expr::Node.3 \
Math::Expr::Num.3 Math::Expr::Opp.3 \
diff --git a/math/p5-Math-Expr/pkg-plist b/math/p5-Math-Expr/pkg-plist
index ec518c463029..fd70702769fc 100644
--- a/math/p5-Math-Expr/pkg-plist
+++ b/math/p5-Math-Expr/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Expr/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/FormulaDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/MatchSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/Num.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/Opp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/OpperationDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/Rule.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/TypeDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/Var.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/Expr/VarSet.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Math/Expr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Math
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Expr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Expr/.packlist
+%%SITE_PERL%%/Math/Expr.pm
+%%SITE_PERL%%/Math/Expr/FormulaDB.pm
+%%SITE_PERL%%/Math/Expr/MatchSet.pm
+%%SITE_PERL%%/Math/Expr/Node.pm
+%%SITE_PERL%%/Math/Expr/Num.pm
+%%SITE_PERL%%/Math/Expr/Opp.pm
+%%SITE_PERL%%/Math/Expr/OpperationDB.pm
+%%SITE_PERL%%/Math/Expr/Rule.pm
+%%SITE_PERL%%/Math/Expr/TypeDB.pm
+%%SITE_PERL%%/Math/Expr/Var.pm
+%%SITE_PERL%%/Math/Expr/VarSet.pm
+@dirrm %%SITE_PERL%%/Math/Expr
+@dirrm %%SITE_PERL%%/Math
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Expr
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-FFT/Makefile b/math/p5-Math-FFT/Makefile
index f77f117e881a..bb328f5378de 100644
--- a/math/p5-Math-FFT/Makefile
+++ b/math/p5-Math-FFT/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module providing an interface to Fast Fourier Transform routines
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::FFT.3
.include <bsd.port.mk>
diff --git a/math/p5-Math-FFT/pkg-plist b/math/p5-Math-FFT/pkg-plist
index b2e51d8d0226..7165de840006 100644
--- a/math/p5-Math-FFT/pkg-plist
+++ b/math/p5-Math-FFT/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/FFT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/FFT/FFT.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/FFT/FFT.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/FFT.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/FFT
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FFT/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FFT/FFT.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FFT/FFT.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/FFT.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FFT
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-FixedPrecision/pkg-plist b/math/p5-Math-FixedPrecision/pkg-plist
index 380a88a585d3..7139f56d385a 100644
--- a/math/p5-Math-FixedPrecision/pkg-plist
+++ b/math/p5-Math-FixedPrecision/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Math/FixedPrecision.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/FixedPrecision/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/FixedPrecision
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+%%SITE_PERL%%/Math/FixedPrecision.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FixedPrecision/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FixedPrecision
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
diff --git a/math/p5-Math-Interpolate/Makefile b/math/p5-Math-Interpolate/Makefile
index 37826b79ba8f..5976e956c1db 100644
--- a/math/p5-Math-Interpolate/Makefile
+++ b/math/p5-Math-Interpolate/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl routines for data sets interpolation and interval search
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::Interpolate.3 Math::IntervalSearch.3
.include <bsd.port.mk>
diff --git a/math/p5-Math-Interpolate/pkg-plist b/math/p5-Math-Interpolate/pkg-plist
index 4c676d1f8326..7e38ba1384ad 100644
--- a/math/p5-Math-Interpolate/pkg-plist
+++ b/math/p5-Math-Interpolate/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Interpolate/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Math/Interpolate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Math/IntervalSearch.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Math
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Interpolate
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Interpolate/.packlist
+%%SITE_PERL%%/Math/Interpolate.pm
+%%SITE_PERL%%/Math/IntervalSearch.pm
+@dirrm %%SITE_PERL%%/Math
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Interpolate
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-LinearCombination/Makefile b/math/p5-Math-LinearCombination/Makefile
index b87e6a0cb555..7f3d7c7185d2 100644
--- a/math/p5-Math-LinearCombination/Makefile
+++ b/math/p5-Math-LinearCombination/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Sum of variables with a numerical coefficient
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/fields.pm:${PORTSDIR}/devel/p5-Class-Fields \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Math/SimpleVariable.pm:${PORTSDIR}/math/p5-Math-SimpleVariable
+BUILD_DEPENDS= ${SITE_PERL}/fields.pm:${PORTSDIR}/devel/p5-Class-Fields \
+ ${SITE_PERL}/Math/SimpleVariable.pm:${PORTSDIR}/math/p5-Math-SimpleVariable
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::LinearCombination.3
pre-patch:
diff --git a/math/p5-Math-LinearCombination/pkg-plist b/math/p5-Math-LinearCombination/pkg-plist
index d0c1db22281c..b5de37002641 100644
--- a/math/p5-Math-LinearCombination/pkg-plist
+++ b/math/p5-Math-LinearCombination/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/LinearCombination/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Math/LinearCombination.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/LinearCombination
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/LinearCombination/.packlist
+%%SITE_PERL%%/Math/LinearCombination.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/LinearCombination
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
diff --git a/math/p5-Math-Logic/Makefile b/math/p5-Math-Logic/Makefile
index 40954143dfd8..8a6898deca2d 100644
--- a/math/p5-Math-Logic/Makefile
+++ b/math/p5-Math-Logic/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= Perl module providing pure 2, 3 or multi-value logic
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::Logic.3
.include <bsd.port.mk>
diff --git a/math/p5-Math-Logic/pkg-plist b/math/p5-Math-Logic/pkg-plist
index a1e8c9fb0950..03e1101a49ef 100644
--- a/math/p5-Math-Logic/pkg-plist
+++ b/math/p5-Math-Logic/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Logic/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Math/Logic.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Math
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Logic
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Logic/.packlist
+%%SITE_PERL%%/Math/Logic.pm
+@dirrm %%SITE_PERL%%/Math
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Logic
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Random-MT/Makefile b/math/p5-Math-Random-MT/Makefile
index 4e9ad6aa79da..db2bd4301d39 100644
--- a/math/p5-Math-Random-MT/Makefile
+++ b/math/p5-Math-Random-MT/Makefile
@@ -18,6 +18,5 @@ COMMENT= The Mersenne Twister PRNG
PERL_CONFIGURE= yes
MAN3= Math::Random::MT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Math-Random-MT/pkg-plist b/math/p5-Math-Random-MT/pkg-plist
index 6e65d3b65234..d43d866b05b2 100644
--- a/math/p5-Math-Random-MT/pkg-plist
+++ b/math/p5-Math-Random-MT/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Random/MT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/Random/MT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Random/MT/MT.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Random/MT/MT.so
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/Random 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Random/MT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Random 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/MT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/MT.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/MT.so
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
diff --git a/math/p5-Math-SimpleVariable/Makefile b/math/p5-Math-SimpleVariable/Makefile
index 398736431e9b..8562aea22629 100644
--- a/math/p5-Math-SimpleVariable/Makefile
+++ b/math/p5-Math-SimpleVariable/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Simple representation of mathematical variables
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/fields.pm:${PORTSDIR}/devel/p5-Class-Fields
+BUILD_DEPENDS= ${SITE_PERL}/fields.pm:${PORTSDIR}/devel/p5-Class-Fields
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Math::SimpleVariable.3
pre-patch:
diff --git a/math/p5-Math-SimpleVariable/pkg-plist b/math/p5-Math-SimpleVariable/pkg-plist
index 2df96163f514..cc3eecf45c6d 100644
--- a/math/p5-Math-SimpleVariable/pkg-plist
+++ b/math/p5-Math-SimpleVariable/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/SimpleVariable/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Math/SimpleVariable.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/SimpleVariable
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SimpleVariable/.packlist
+%%SITE_PERL%%/Math/SimpleVariable.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SimpleVariable
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
diff --git a/math/p5-Math-TrulyRandom/Makefile b/math/p5-Math-TrulyRandom/Makefile
index 33b3f3b919b5..874f4d54d7cc 100644
--- a/math/p5-Math-TrulyRandom/Makefile
+++ b/math/p5-Math-TrulyRandom/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl interface to a truly random number generator function
PERL_CONFIGURE= yes
MAN3= Math::TrulyRandom.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/math/p5-Math-TrulyRandom/pkg-plist b/math/p5-Math-TrulyRandom/pkg-plist
index 97d979d1a2d7..74dbe376f327 100644
--- a/math/p5-Math-TrulyRandom/pkg-plist
+++ b/math/p5-Math-TrulyRandom/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/TrulyRandom.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/TrulyRandom.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/TrulyRandom.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/TrulyRandom.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.so
%%PORTDOCS%%share/doc/Math-TrulyRandom/COPYRIGHT
%%PORTDOCS%%share/doc/Math-TrulyRandom/truerand.c
%%PORTDOCS%%share/doc/Math-TrulyRandom/truerand.h
%%PORTDOCS%%@dirrm share/doc/Math-TrulyRandom
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/TrulyRandom 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
diff --git a/math/p5-Roman/Makefile b/math/p5-Roman/Makefile
index 18fa333518ee..42dcc0ab0696 100644
--- a/math/p5-Roman/Makefile
+++ b/math/p5-Roman/Makefile
@@ -18,7 +18,7 @@ COMMENT= Perl module to convert between Arabic and Roman numerals
NO_BUILD= yes
USE_PERL5_RUN= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
do-install:
${CP} ${WRKSRC}/Roman.pm ${SITE_PERL}
diff --git a/math/p5-Roman/pkg-plist b/math/p5-Roman/pkg-plist
index 240c3d07da15..21d3888aa706 100644
--- a/math/p5-Roman/pkg-plist
+++ b/math/p5-Roman/pkg-plist
@@ -1 +1 @@
-lib/perl5/site_perl/%%PERL_VER%%/Roman.pm
+%%SITE_PERL%%/Roman.pm
diff --git a/math/p5-Set-IntSpan/Makefile b/math/p5-Set-IntSpan/Makefile
index 510da892fab3..d9db8a570a5b 100644
--- a/math/p5-Set-IntSpan/Makefile
+++ b/math/p5-Set-IntSpan/Makefile
@@ -18,6 +18,5 @@ COMMENT= Manages sets of integers
PERL_CONFIGURE= yes
MAN3= Set::IntSpan.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Set-IntSpan/pkg-plist b/math/p5-Set-IntSpan/pkg-plist
index dfe93c481b2e..044c5e9b4784 100644
--- a/math/p5-Set-IntSpan/pkg-plist
+++ b/math/p5-Set-IntSpan/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Set/IntSpan.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/IntSpan/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/IntSpan
-@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/IntSpan.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan
+@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/math/p5-Set-Window/Makefile b/math/p5-Set-Window/Makefile
index 40d6dc1331b5..d39b1837995b 100644
--- a/math/p5-Set-Window/Makefile
+++ b/math/p5-Set-Window/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl module to manage an interval on the integer line
PERL_CONFIGURE= yes
MAN3= Set::Window.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e '$$_="" if /use 5/;' ${WRKSRC}/Window.pm
diff --git a/math/p5-Set-Window/pkg-plist b/math/p5-Set-Window/pkg-plist
index 24965f303e95..2714bb6fffde 100644
--- a/math/p5-Set-Window/pkg-plist
+++ b/math/p5-Set-Window/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Window/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Set/Window.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/Window
-@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/Window/.packlist
+%%SITE_PERL%%/Set/Window.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Window
+@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/math/p5-Statistics-ChiSquare/Makefile b/math/p5-Statistics-ChiSquare/Makefile
index 5ba8b39f1015..9a0f87f5ac53 100644
--- a/math/p5-Statistics-ChiSquare/Makefile
+++ b/math/p5-Statistics-ChiSquare/Makefile
@@ -20,6 +20,5 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/Statistics/ChiSquare-${PORTVERSION}
MAN3= Statistics::ChiSquare.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Statistics-ChiSquare/pkg-plist b/math/p5-Statistics-ChiSquare/pkg-plist
index d6b305a88a58..76c47af2923d 100644
--- a/math/p5-Statistics-ChiSquare/pkg-plist
+++ b/math/p5-Statistics-ChiSquare/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/auto/Statistics/ChiSquare/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/ChiSquare/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Statistics/ChiSquare.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Statistics/ChiSquare
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/ChiSquare
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Statistics 2>/dev/null || true
+%%SITE_PERL%%/auto/Statistics/ChiSquare/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/ChiSquare/.packlist
+%%SITE_PERL%%/Statistics/ChiSquare.pm
+@dirrm %%SITE_PERL%%/auto/Statistics/ChiSquare
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/ChiSquare
+@unexec rmdir %D/%%SITE_PERL%%/auto/Statistics 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
diff --git a/math/p5-Statistics-Descriptive/Makefile b/math/p5-Statistics-Descriptive/Makefile
index dbcd3c128eb2..e325a3e729cd 100644
--- a/math/p5-Statistics-Descriptive/Makefile
+++ b/math/p5-Statistics-Descriptive/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module that supplies statistical methods for perl5
PERL_CONFIGURE= yes
MAN3= Statistics::Descriptive.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Statistics-Descriptive/pkg-plist b/math/p5-Statistics-Descriptive/pkg-plist
index c3d59c30a674..6269b7f2676c 100644
--- a/math/p5-Statistics-Descriptive/pkg-plist
+++ b/math/p5-Statistics-Descriptive/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/Descriptive/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Statistics/Descriptive.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/Descriptive
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Statistics 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive/.packlist
+%%SITE_PERL%%/Statistics/Descriptive.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
diff --git a/math/p5-Statistics-LTU/Makefile b/math/p5-Statistics-LTU/Makefile
index 0df95dd458e4..58e5f13d6ecb 100644
--- a/math/p5-Statistics-LTU/Makefile
+++ b/math/p5-Statistics-LTU/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl implementation of Linear Threshold Units
PERL_CONFIGURE= yes
MAN3= Statistics::LTU.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Statistics-LTU/pkg-plist b/math/p5-Statistics-LTU/pkg-plist
index 40730e9938e2..25f4d0432ee2 100644
--- a/math/p5-Statistics-LTU/pkg-plist
+++ b/math/p5-Statistics-LTU/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/LTU/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Statistics/LTU.pod
-lib/perl5/site_perl/%%PERL_VER%%/Statistics/weather.pl
-lib/perl5/site_perl/%%PERL_VER%%/Statistics/LTU.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/LTU
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Statistics 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/LTU/.packlist
+%%SITE_PERL%%/Statistics/LTU.pod
+%%SITE_PERL%%/Statistics/weather.pl
+%%SITE_PERL%%/Statistics/LTU.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/LTU
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
diff --git a/math/p5-Statistics-OLS/Makefile b/math/p5-Statistics-OLS/Makefile
index 28a51d0e0321..a6479b9c52d2 100644
--- a/math/p5-Statistics-OLS/Makefile
+++ b/math/p5-Statistics-OLS/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to perform ordinary least squares and other bivariate stati
PERL_CONFIGURE= yes
MAN3= Statistics::OLS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Statistics-OLS/pkg-plist b/math/p5-Statistics-OLS/pkg-plist
index a99f0aaeb9ac..79f2a9b6f5d9 100644
--- a/math/p5-Statistics-OLS/pkg-plist
+++ b/math/p5-Statistics-OLS/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/OLS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Statistics/OLS.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/OLS
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Statistics 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/OLS/.packlist
+%%SITE_PERL%%/Statistics/OLS.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/OLS
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
diff --git a/math/p5-Statistics-Table-F/Makefile b/math/p5-Statistics-Table-F/Makefile
index b3b2e5c7607b..30546c496a1a 100644
--- a/math/p5-Statistics-Table-F/Makefile
+++ b/math/p5-Statistics-Table-F/Makefile
@@ -20,6 +20,5 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/Statistics/Table/F
MAN3= Statistics::Table::F.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/math/p5-Statistics-Table-F/pkg-plist b/math/p5-Statistics-Table-F/pkg-plist
index ff7bb8143d43..1873d9579f85 100644
--- a/math/p5-Statistics-Table-F/pkg-plist
+++ b/math/p5-Statistics-Table-F/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/auto/Statistics/Table/F/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/Table/F/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Statistics/Table/F.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Statistics/Table/F
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/Table/F
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Statistics/Table 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics/Table 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Statistics/Table 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Statistics 2>/dev/null || true
+%%SITE_PERL%%/auto/Statistics/Table/F/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Table/F/.packlist
+%%SITE_PERL%%/Statistics/Table/F.pm
+@dirrm %%SITE_PERL%%/auto/Statistics/Table/F
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Table/F
+@unexec rmdir %D/%%SITE_PERL%%/auto/Statistics/Table 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Statistics 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Table 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Statistics/Table 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
diff --git a/misc/chord2html/Makefile b/misc/chord2html/Makefile
index 68aeb4836879..a19b3bc1df1d 100644
--- a/misc/chord2html/Makefile
+++ b/misc/chord2html/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://helllabs.org/~claudio/chord/
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert CHORD input files to HTML
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
USE_PERL5= yes
NO_BUILD= yes
diff --git a/misc/p5-Array-Compare/Makefile b/misc/p5-Array-Compare/Makefile
index dccad22caa10..52a889bb49ca 100644
--- a/misc/p5-Array-Compare/Makefile
+++ b/misc/p5-Array-Compare/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for comparing arrays
PERL_CONFIGURE= yes
MAN3= Array::Compare.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Array-Compare/pkg-plist b/misc/p5-Array-Compare/pkg-plist
index 2c169362457b..a3fe53ab406a 100644
--- a/misc/p5-Array-Compare/pkg-plist
+++ b/misc/p5-Array-Compare/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Array/Compare.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/Compare/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Array/Compare/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Array/Compare
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Array 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/Compare
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Array 2>/dev/null || true
+%%SITE_PERL%%/Array/Compare.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Compare/.packlist
+%%SITE_PERL%%/auto/Array/Compare/autosplit.ix
+@dirrm %%SITE_PERL%%/auto/Array/Compare
+@unexec rmdir %D/%%SITE_PERL%%/auto/Array 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Compare
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
diff --git a/misc/p5-Array-IntSpan/Makefile b/misc/p5-Array-IntSpan/Makefile
index 7ff3cb4a3cf5..a8203b18d561 100644
--- a/misc/p5-Array-IntSpan/Makefile
+++ b/misc/p5-Array-IntSpan/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Array::Array::IntSpan.3 \
Array::Array::IntSpan::IP.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Array-IntSpan/pkg-plist b/misc/p5-Array-IntSpan/pkg-plist
index 6b3e1b2ffca4..79459a251af8 100644
--- a/misc/p5-Array-IntSpan/pkg-plist
+++ b/misc/p5-Array-IntSpan/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Array/IntSpan.pm
-lib/perl5/site_perl/%%PERL_VER%%/Array/IntSpan/IP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/IntSpan/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/IntSpan
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Array/IntSpan
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Array 2>/dev/null || true
+%%SITE_PERL%%/Array/IntSpan.pm
+%%SITE_PERL%%/Array/IntSpan/IP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/IntSpan/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/IntSpan
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Array/IntSpan
+@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index 9991fc364b6c..e44caa751637 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to print arrays of elements in sorted columns
PERL_CONFIGURE= yes
MAN3= Array::PrintCols.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Array-PrintCols/pkg-plist b/misc/p5-Array-PrintCols/pkg-plist
index 97f24fdbf8d1..b0e1ed2ee54e 100644
--- a/misc/p5-Array-PrintCols/pkg-plist
+++ b/misc/p5-Array-PrintCols/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Array/PrintCols.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/PrintCols/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/PrintCols
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Array 2>/dev/null || true
+%%SITE_PERL%%/Array/PrintCols.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/PrintCols/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/PrintCols
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
diff --git a/misc/p5-Array-RefElem/Makefile b/misc/p5-Array-RefElem/Makefile
index dada3d265858..e0773301ae95 100644
--- a/misc/p5-Array-RefElem/Makefile
+++ b/misc/p5-Array-RefElem/Makefile
@@ -18,6 +18,5 @@ COMMENT= Set up array elements as aliases
PERL_CONFIGURE= yes
MAN3= Array::RefElem.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Array-RefElem/pkg-plist b/misc/p5-Array-RefElem/pkg-plist
index e6c43f84b3ce..f62a7a4a6b1b 100644
--- a/misc/p5-Array-RefElem/pkg-plist
+++ b/misc/p5-Array-RefElem/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Array/RefElem.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/RefElem/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array/RefElem
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Array 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Array/RefElem.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Array 2>/dev/null || true
diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index 4bd40b5e12de..f88c696f664a 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Business::ISBN.3 \
Business::Data.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Business-ISBN/pkg-plist b/misc/p5-Business-ISBN/pkg-plist
index 77a76161c862..2050e7ab1495 100644
--- a/misc/p5-Business-ISBN/pkg-plist
+++ b/misc/p5-Business-ISBN/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/ISBN.pm
-lib/perl5/site_perl/%%PERL_VER%%/Business/ISBN/Data.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/ISBN/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/ISBN
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Business/ISBN
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business 2>/dev/null || true
+%%SITE_PERL%%/Business/ISBN.pm
+%%SITE_PERL%%/Business/ISBN/Data.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Business/ISBN
+@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
diff --git a/misc/p5-Business-ISIN/Makefile b/misc/p5-Business-ISIN/Makefile
index fa9a6e749de9..6f3b30b92e6c 100644
--- a/misc/p5-Business-ISIN/Makefile
+++ b/misc/p5-Business-ISIN/Makefile
@@ -19,10 +19,9 @@ COMMENT= Validate International Securities Identification Numbers
BUILD_DEPENDS= ${SITE_PERL}/Locale/Country.pm:${PORTSDIR}/misc/p5-Locale-Codes
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Business::ISIN.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Business-ISIN/pkg-plist b/misc/p5-Business-ISIN/pkg-plist
index ea88934b00d4..36e91d9130af 100644
--- a/misc/p5-Business-ISIN/pkg-plist
+++ b/misc/p5-Business-ISIN/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/ISIN/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Business/ISIN.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/ISIN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN/.packlist
+%%SITE_PERL%%/Business/ISIN.pm
+@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
diff --git a/misc/p5-Business-ISSN/Makefile b/misc/p5-Business-ISSN/Makefile
index 02d3d54b5dd3..f41561544faa 100644
--- a/misc/p5-Business-ISSN/Makefile
+++ b/misc/p5-Business-ISSN/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for International Standard Serial Numbers
PERL_CONFIGURE= yes
MAN3= Business::ISSN.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Business-ISSN/pkg-plist b/misc/p5-Business-ISSN/pkg-plist
index 440cb108dcbc..f1b8dd227624 100644
--- a/misc/p5-Business-ISSN/pkg-plist
+++ b/misc/p5-Business-ISSN/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/ISSN.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/ISSN/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/ISSN
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business 2>/dev/null || true
+%%SITE_PERL%%/Business/ISSN.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISSN/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISSN
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index d88fa635f738..908a4dcf3dd7 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -18,12 +18,11 @@ COMMENT= A UPS Interface Module
BUILD_DEPENDS= ${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww
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= Business::UPS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/misc/p5-Business-UPS/pkg-plist b/misc/p5-Business-UPS/pkg-plist
index 7d91b25dd558..2b24cebe717c 100644
--- a/misc/p5-Business-UPS/pkg-plist
+++ b/misc/p5-Business-UPS/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/UPS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Business/UPS.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/UPS/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS/.packlist
+%%SITE_PERL%%/Business/UPS.pm
+%%SITE_PERL%%/auto/Business/UPS/autosplit.ix
%%PORTDOCS%%share/examples/Business-UPS/test.pl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Business/UPS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Business 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/UPS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Business/UPS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Business 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/share/examples/Business-UPS 2>/dev/null || true
diff --git a/misc/p5-Chatbot-Eliza/Makefile b/misc/p5-Chatbot-Eliza/Makefile
index 45375c003c79..6badd08a8f42 100644
--- a/misc/p5-Chatbot-Eliza/Makefile
+++ b/misc/p5-Chatbot-Eliza/Makefile
@@ -18,7 +18,6 @@ COMMENT= A clone of the classic Eliza program
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Chatbot::Eliza.3
.include <bsd.port.mk>
diff --git a/misc/p5-Chatbot-Eliza/pkg-plist b/misc/p5-Chatbot-Eliza/pkg-plist
index 8fedbaa0bd93..fa1e6f228b14 100644
--- a/misc/p5-Chatbot-Eliza/pkg-plist
+++ b/misc/p5-Chatbot-Eliza/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Chatbot/Eliza.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chatbot/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Chatbot
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chatbot
+%%SITE_PERL%%/Chatbot/Eliza.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chatbot/.packlist
+@dirrm %%SITE_PERL%%/Chatbot
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chatbot
diff --git a/misc/p5-Data-Buffer/Makefile b/misc/p5-Data-Buffer/Makefile
index c8135f7ea7f0..48096f444dde 100644
--- a/misc/p5-Data-Buffer/Makefile
+++ b/misc/p5-Data-Buffer/Makefile
@@ -17,7 +17,6 @@ COMMENT= Read/write buffer class
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Data::Buffer.3
.include <bsd.port.mk>
diff --git a/misc/p5-Data-Buffer/pkg-plist b/misc/p5-Data-Buffer/pkg-plist
index f0ad119a90f8..c4cf578dcb01 100644
--- a/misc/p5-Data-Buffer/pkg-plist
+++ b/misc/p5-Data-Buffer/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Buffer/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/Buffer.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Buffer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Data
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Buffer/.packlist
+%%SITE_PERL%%/Data/Buffer.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Buffer
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
+@dirrm %%SITE_PERL%%/Data
diff --git a/misc/p5-File-Sort/Makefile b/misc/p5-File-Sort/Makefile
index 1b94c3b311cd..49d9298608fa 100644
--- a/misc/p5-File-Sort/Makefile
+++ b/misc/p5-File-Sort/Makefile
@@ -18,6 +18,5 @@ COMMENT= Sort a file or merge sort multiple files
PERL_CONFIGURE= yes
MAN3= File::Sort.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-File-Sort/pkg-plist b/misc/p5-File-Sort/pkg-plist
index a27894b16bab..b164ce1a8eae 100644
--- a/misc/p5-File-Sort/pkg-plist
+++ b/misc/p5-File-Sort/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/File/Sort.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sort/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sort
-@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/Sort.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sort/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sort
+@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/misc/p5-Finance-Currency-Convert/Makefile b/misc/p5-Finance-Currency-Convert/Makefile
index 4ab058133e71..2c0b78df88c3 100644
--- a/misc/p5-Finance-Currency-Convert/Makefile
+++ b/misc/p5-Finance-Currency-Convert/Makefile
@@ -19,6 +19,5 @@ COMMENT= Convert currencies and fetch their exchange rates
PERL_CONFIGURE= yes
MAN3= Finance::Currency::Convert.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Finance-Currency-Convert/pkg-plist b/misc/p5-Finance-Currency-Convert/pkg-plist
index 73fda488e846..0f529d8b2deb 100644
--- a/misc/p5-Finance-Currency-Convert/pkg-plist
+++ b/misc/p5-Finance-Currency-Convert/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Currency/Convert.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency/Convert/autosplit.ix
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/.packlist
+%%SITE_PERL%%/Finance/Currency/Convert.pm
+%%SITE_PERL%%/auto/Finance/Currency/Convert/autosplit.ix
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance/Currency/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
diff --git a/misc/p5-Finance-Quote/Makefile b/misc/p5-Finance-Quote/Makefile
index e059a4582ad7..286dc2e5c6e6 100644
--- a/misc/p5-Finance-Quote/Makefile
+++ b/misc/p5-Finance-Quote/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Get stock and mutual fund quotes from various exchanges
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
+ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Finance::Quote.3 Finance::Quote::AEX.3 Finance::Quote::ASX.3 \
Finance::Quote::Cdnfundlibrary.3 Finance::Quote::DWS.3 \
Finance::Quote::Fidelity.3 Finance::Quote::Fool.3 \
diff --git a/misc/p5-Finance-Quote/pkg-plist b/misc/p5-Finance-Quote/pkg-plist
index fa2532f90873..14061834195d 100644
--- a/misc/p5-Finance-Quote/pkg-plist
+++ b/misc/p5-Finance-Quote/pkg-plist
@@ -1,24 +1,24 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Quote/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/AEX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/ASX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Cdnfundlibrary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/DWS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Fidelity.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Fool.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Tdwaterhouse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Tiaacref.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Troweprice.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Trustnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/VWD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Asia.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Australia.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/Europe.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo/USA.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote/Yahoo
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Finance/Quote
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance/Quote
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Quote/.packlist
+%%SITE_PERL%%/Finance/Quote.pm
+%%SITE_PERL%%/Finance/Quote/AEX.pm
+%%SITE_PERL%%/Finance/Quote/ASX.pm
+%%SITE_PERL%%/Finance/Quote/Cdnfundlibrary.pm
+%%SITE_PERL%%/Finance/Quote/DWS.pm
+%%SITE_PERL%%/Finance/Quote/Fidelity.pm
+%%SITE_PERL%%/Finance/Quote/Fool.pm
+%%SITE_PERL%%/Finance/Quote/Tdwaterhouse.pm
+%%SITE_PERL%%/Finance/Quote/Tiaacref.pm
+%%SITE_PERL%%/Finance/Quote/Troweprice.pm
+%%SITE_PERL%%/Finance/Quote/Trustnet.pm
+%%SITE_PERL%%/Finance/Quote/UserAgent.pm
+%%SITE_PERL%%/Finance/Quote/VWD.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Asia.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Australia.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Base.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/Europe.pm
+%%SITE_PERL%%/Finance/Quote/Yahoo/USA.pm
+@dirrm %%SITE_PERL%%/Finance/Quote/Yahoo
+@dirrm %%SITE_PERL%%/Finance/Quote
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Quote
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
diff --git a/misc/p5-Finance-QuoteHist/Makefile b/misc/p5-Finance-QuoteHist/Makefile
index bd22ac434806..7dbe3d946be7 100644
--- a/misc/p5-Finance-QuoteHist/Makefile
+++ b/misc/p5-Finance-QuoteHist/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Finance::QuoteHist::Yahoo.3 \
@@ -28,6 +28,5 @@ MAN3= Finance::QuoteHist::Yahoo.3 \
Finance::QuoteHist::WallStreetCity.3 \
Finance::QuoteHist::SiliconInvestor.3 \
Finance::QuoteHist::Generic.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Finance-QuoteHist/pkg-plist b/misc/p5-Finance-QuoteHist/pkg-plist
index 02a621c4500e..b2674a16e66b 100644
--- a/misc/p5-Finance-QuoteHist/pkg-plist
+++ b/misc/p5-Finance-QuoteHist/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance-QuoteHist/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/Generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/SiliconInvestor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/Yahoo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist/WallStreetCity.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance/QuoteHist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Finance 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Finance-QuoteHist 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist/.packlist
+%%SITE_PERL%%/Finance/QuoteHist.pm
+%%SITE_PERL%%/Finance/QuoteHist/Generic.pm
+%%SITE_PERL%%/Finance/QuoteHist/SiliconInvestor.pm
+%%SITE_PERL%%/Finance/QuoteHist/Yahoo.pm
+%%SITE_PERL%%/Finance/QuoteHist/WallStreetCity.pm
+@unexec rmdir %D/%%SITE_PERL%%/Finance/QuoteHist 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist 2>/dev/null || true
diff --git a/misc/p5-Geo-Weather/Makefile b/misc/p5-Geo-Weather/Makefile
index e45319bcf2e8..b7eae576d416 100644
--- a/misc/p5-Geo-Weather/Makefile
+++ b/misc/p5-Geo-Weather/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module to retrieve weather information from weather.com
RUN_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Geo::Weather.3
.include <bsd.port.mk>
diff --git a/misc/p5-Geo-Weather/pkg-plist b/misc/p5-Geo-Weather/pkg-plist
index a1e7bddcacad..a6af6ea5fac6 100644
--- a/misc/p5-Geo-Weather/pkg-plist
+++ b/misc/p5-Geo-Weather/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Geo/Weather.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/Weather/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/Weather
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Geo 2>/dev/null || true
+%%SITE_PERL%%/Geo/Weather.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Weather/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Weather
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Geo 2>/dev/null || true
diff --git a/misc/p5-LEGO-RCX/Makefile b/misc/p5-LEGO-RCX/Makefile
index b0ecfcebe7dd..98abe19aa36f 100644
--- a/misc/p5-LEGO-RCX/Makefile
+++ b/misc/p5-LEGO-RCX/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module for communicating with the Lego RCX brick via the IR tower
PERL_CONFIGURE= yes
MAN3= LEGO::RCX.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-LEGO-RCX/pkg-plist b/misc/p5-LEGO-RCX/pkg-plist
index 106911122d78..b32248e6cce3 100644
--- a/misc/p5-LEGO-RCX/pkg-plist
+++ b/misc/p5-LEGO-RCX/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/LEGO/RCX.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LEGO/RCX/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LEGO/RCX
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LEGO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LEGO
+%%SITE_PERL%%/LEGO/RCX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LEGO/RCX/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LEGO/RCX
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LEGO
+@dirrm %%SITE_PERL%%/LEGO
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index a69d088931d0..b29187906a69 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 module providing access to ISO3166 and ISO639 Country Codes
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Locale::Country.3 Locale::Constants.3 Locale::Currency.3 \
Locale::Language.3 Locale::Script.3
diff --git a/misc/p5-Locale-Codes/pkg-plist b/misc/p5-Locale-Codes/pkg-plist
index 7d36d888ce65..aff324391099 100644
--- a/misc/p5-Locale-Codes/pkg-plist
+++ b/misc/p5-Locale-Codes/pkg-plist
@@ -1,13 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Country.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Country.pod
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Language.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Language.pod
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Constants.pod
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Currency.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Currency.pod
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Script.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Script.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale-Codes/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale-Codes
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Locale
+%%SITE_PERL%%/Locale/Country.pm
+%%SITE_PERL%%/Locale/Country.pod
+%%SITE_PERL%%/Locale/Language.pm
+%%SITE_PERL%%/Locale/Language.pod
+%%SITE_PERL%%/Locale/Constants.pm
+%%SITE_PERL%%/Locale/Constants.pod
+%%SITE_PERL%%/Locale/Currency.pm
+%%SITE_PERL%%/Locale/Currency.pod
+%%SITE_PERL%%/Locale/Script.pm
+%%SITE_PERL%%/Locale/Script.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Codes/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Codes
+@dirrm %%SITE_PERL%%/Locale
diff --git a/misc/p5-Locale-Msgcat/Makefile b/misc/p5-Locale-Msgcat/Makefile
index 35a6ebd53609..c501a4cb5576 100644
--- a/misc/p5-Locale-Msgcat/Makefile
+++ b/misc/p5-Locale-Msgcat/Makefile
@@ -17,6 +17,5 @@ COMMENT= Msgcat, a small Perl module for systems to support the XPG4 message cat
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Locale-SubCountry/Makefile b/misc/p5-Locale-SubCountry/Makefile
index 8058d0d5e7e6..848db304cc35 100644
--- a/misc/p5-Locale-SubCountry/Makefile
+++ b/misc/p5-Locale-SubCountry/Makefile
@@ -18,6 +18,5 @@ COMMENT= Convert state, province, county etc. names to/from code
PERL_CONFIGURE= yes
MAN3= Locale::SubCountry.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Locale-SubCountry/pkg-plist b/misc/p5-Locale-SubCountry/pkg-plist
index e1b3cb9a43ba..89e4168afa57 100644
--- a/misc/p5-Locale-SubCountry/pkg-plist
+++ b/misc/p5-Locale-SubCountry/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Locale/SubCountry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/SubCountry/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/SubCountry
-@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%%/Locale/SubCountry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/SubCountry/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/SubCountry
+@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/misc/p5-Text-FIGlet/Makefile b/misc/p5-Text-FIGlet/Makefile
index 6d880f6e64c1..64b291908c84 100644
--- a/misc/p5-Text-FIGlet/Makefile
+++ b/misc/p5-Text-FIGlet/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/figlet:${PORTSDIR}/misc/figlet
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Text::FIGlet.3 \
Text::charmap.3 \
diff --git a/misc/p5-Text-FIGlet/pkg-plist b/misc/p5-Text-FIGlet/pkg-plist
index 416b5f03cb16..04c2e323d0fd 100644
--- a/misc/p5-Text-FIGlet/pkg-plist
+++ b/misc/p5-Text-FIGlet/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Text/FIGlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/charmap.pl
-lib/perl5/site_perl/%%PERL_VER%%/Text/figlet.pl
-lib/perl5/site_perl/%%PERL_VER%%/Text/minifig.pl
-lib/perl5/site_perl/%%PERL_VER%%/Text/showfigfonts.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FIGlet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FIGlet
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/Text/FIGlet.pm
+%%SITE_PERL%%/Text/charmap.pl
+%%SITE_PERL%%/Text/figlet.pl
+%%SITE_PERL%%/Text/minifig.pl
+%%SITE_PERL%%/Text/showfigfonts.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FIGlet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FIGlet
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/misc/p5-Tie-DxHash/Makefile b/misc/p5-Tie-DxHash/Makefile
index 8506dd8caa30..0fbbf7bd4aa8 100644
--- a/misc/p5-Tie-DxHash/Makefile
+++ b/misc/p5-Tie-DxHash/Makefile
@@ -18,6 +18,5 @@ COMMENT= Keeps insertion order, allows duplicate keys
PERL_CONFIGURE= yes
MAN3= Tie::DxHash.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/misc/p5-Tie-DxHash/pkg-plist b/misc/p5-Tie-DxHash/pkg-plist
index 0f19d547fbd3..e270f94f6e5d 100644
--- a/misc/p5-Tie-DxHash/pkg-plist
+++ b/misc/p5-Tie-DxHash/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/DxHash/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Tie/DxHash.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/DxHash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash/.packlist
+%%SITE_PERL%%/Tie/DxHash.pm
+@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
diff --git a/misc/telbook/Makefile b/misc/telbook/Makefile
index feae7eff7693..a777e5b86ede 100644
--- a/misc/telbook/Makefile
+++ b/misc/telbook/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://home.arcor.de/kaffeetisch/downloads/
MAINTAINER= krion@FreeBSD.org
COMMENT= Simple telephone book
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
NO_BUILD= yes
diff --git a/misc/translate/Makefile b/misc/translate/Makefile
index 4b1be9b29c7d..60556594a11e 100644
--- a/misc/translate/Makefile
+++ b/misc/translate/Makefile
@@ -16,7 +16,7 @@ COMMENT= Translates string using Babelfish
RUN_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
USE_PERL5= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 39cf5953951b..40bb7512efed 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= michaelnottebrock@gmx.net
COMMENT= This is dvd::rip, a Perl Gtk+ based dvd-ripper
.if !defined(WITHOUT_CLUSTER)
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+ ${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \
${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping \
pstree:${PORTSDIR}/sysutils/pstree
.endif
@@ -35,8 +35,8 @@ RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao \
rar:${PORTSDIR}/archivers/rar \
transcode:${PORTSDIR}/multimedia/transcode \
vcdimager:${PORTSDIR}/multimedia/vcdimager
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk/Pixbuf.pm:${PORTSDIR}/x11-toolkits/p5-GdkPixbuf
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
+ ${SITE_PERL}/${PERL_ARCH}/Gtk/Gdk/Pixbuf.pm:${PORTSDIR}/x11-toolkits/p5-GdkPixbuf
PERL_CONFIGURE= yes
USE_PERL5= yes
diff --git a/multimedia/dvdrip/pkg-plist b/multimedia/dvdrip/pkg-plist
index 229c572a70fb..dabfd5edce55 100644
--- a/multimedia/dvdrip/pkg-plist
+++ b/multimedia/dvdrip/pkg-plist
@@ -3,108 +3,108 @@ bin/dr_progress
bin/dr_splitpipe
bin/dvdrip
bin/dvdrip-master
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Audio.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/BitrateCalc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/CPAN/Scanf.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/AddAudioMerge.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/BitrateCalc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/MergePSUs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/MergeVideoAudio.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/RemoveVOBs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/Split.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/TranscodeAudio.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/TranscodeVideo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Master.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/PSU.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Pipe.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Project.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Title.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Webserver.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Content.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Convert.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Depend.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/FilterList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/FilterSettings.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/BitrateCalc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/CheckedEntry.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Cluster/Control.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Cluster/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Cluster/Title.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Component.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Depend.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/ExecuteJobs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Filters.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/ImageClip.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Logger.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Main.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/MinSizeGroup.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Pipe.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Preview.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Progress.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/BurnTab.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/ClipZoomTab.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/LoggingTab.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/StorageTab.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/SubtitleTab.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/TitleTab.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/TranscodeTab.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/TranscodeTabAudio.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Setting.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Setting/Checkbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Setting/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/VisualFrameRange.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Window.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/ZoomCalculator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/InfoFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/BurnCD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/CountFramesInFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/CreateCDImage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/CreateVobsub.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/CreateWav.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/ExtractPS1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/GrabPreviewFrame.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/GrabSubtitleImages.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/MergeAudio.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/Mplex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/Probe.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/ProbeTitleCount.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/Rip.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/ScanVolume.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/Split.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/TranscodeAudio.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/TranscodeVideo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/PSU.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Preset.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Probe.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Project.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/RPC/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/RPC/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/RPC/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Subtitle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Title.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/TranscodeRC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/icon.xpm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/splash.png
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Video/DVDRip/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Video/DVDRip
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Video 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/RPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Setting
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Cluster
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/CPAN
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Video 2>/dev/null || true
+%%SITE_PERL%%/Video/DVDRip.pm
+%%SITE_PERL%%/Video/DVDRip/Audio.pm
+%%SITE_PERL%%/Video/DVDRip/Base.pm
+%%SITE_PERL%%/Video/DVDRip/BitrateCalc.pm
+%%SITE_PERL%%/Video/DVDRip/CPAN/Scanf.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job/AddAudioMerge.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job/BitrateCalc.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job/MergePSUs.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job/MergeVideoAudio.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job/RemoveVOBs.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job/Split.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job/TranscodeAudio.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Job/TranscodeVideo.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Master.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Node.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/PSU.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Pipe.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Project.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Title.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Webserver.pm
+%%SITE_PERL%%/Video/DVDRip/Config.pm
+%%SITE_PERL%%/Video/DVDRip/Content.pm
+%%SITE_PERL%%/Video/DVDRip/Convert.pm
+%%SITE_PERL%%/Video/DVDRip/Depend.pm
+%%SITE_PERL%%/Video/DVDRip/FilterList.pm
+%%SITE_PERL%%/Video/DVDRip/FilterSettings.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Base.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/BitrateCalc.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/CheckedEntry.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Cluster/Control.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Cluster/Node.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Cluster/Title.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Component.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Config.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Depend.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/ExecuteJobs.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Filters.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/ImageClip.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Logger.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Main.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/MinSizeGroup.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Pipe.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Preview.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Progress.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/BurnTab.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/ClipZoomTab.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/LoggingTab.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/StorageTab.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/SubtitleTab.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/TitleTab.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/TranscodeTab.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/TranscodeTabAudio.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Setting.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Setting/Checkbox.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Setting/Text.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/VisualFrameRange.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Window.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/ZoomCalculator.pm
+%%SITE_PERL%%/Video/DVDRip/InfoFile.pm
+%%SITE_PERL%%/Video/DVDRip/Job.pm
+%%SITE_PERL%%/Video/DVDRip/Job/BurnCD.pm
+%%SITE_PERL%%/Video/DVDRip/Job/CountFramesInFile.pm
+%%SITE_PERL%%/Video/DVDRip/Job/CreateCDImage.pm
+%%SITE_PERL%%/Video/DVDRip/Job/CreateVobsub.pm
+%%SITE_PERL%%/Video/DVDRip/Job/CreateWav.pm
+%%SITE_PERL%%/Video/DVDRip/Job/ExtractPS1.pm
+%%SITE_PERL%%/Video/DVDRip/Job/GrabPreviewFrame.pm
+%%SITE_PERL%%/Video/DVDRip/Job/GrabSubtitleImages.pm
+%%SITE_PERL%%/Video/DVDRip/Job/MergeAudio.pm
+%%SITE_PERL%%/Video/DVDRip/Job/Mplex.pm
+%%SITE_PERL%%/Video/DVDRip/Job/Probe.pm
+%%SITE_PERL%%/Video/DVDRip/Job/ProbeTitleCount.pm
+%%SITE_PERL%%/Video/DVDRip/Job/Rip.pm
+%%SITE_PERL%%/Video/DVDRip/Job/ScanVolume.pm
+%%SITE_PERL%%/Video/DVDRip/Job/Split.pm
+%%SITE_PERL%%/Video/DVDRip/Job/TranscodeAudio.pm
+%%SITE_PERL%%/Video/DVDRip/Job/TranscodeVideo.pm
+%%SITE_PERL%%/Video/DVDRip/PSU.pm
+%%SITE_PERL%%/Video/DVDRip/Preset.pm
+%%SITE_PERL%%/Video/DVDRip/Probe.pm
+%%SITE_PERL%%/Video/DVDRip/Project.pm
+%%SITE_PERL%%/Video/DVDRip/RPC/Client.pm
+%%SITE_PERL%%/Video/DVDRip/RPC/Message.pm
+%%SITE_PERL%%/Video/DVDRip/RPC/Server.pm
+%%SITE_PERL%%/Video/DVDRip/Subtitle.pm
+%%SITE_PERL%%/Video/DVDRip/Title.pm
+%%SITE_PERL%%/Video/DVDRip/TranscodeRC.pm
+%%SITE_PERL%%/Video/DVDRip/icon.xpm
+%%SITE_PERL%%/Video/DVDRip/splash.png
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Video/DVDRip/RPC
+@dirrm %%SITE_PERL%%/Video/DVDRip/Job
+@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Setting
+@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Project
+@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Cluster
+@dirrm %%SITE_PERL%%/Video/DVDRip/GUI
+@dirrm %%SITE_PERL%%/Video/DVDRip/Cluster/Job
+@dirrm %%SITE_PERL%%/Video/DVDRip/Cluster
+@dirrm %%SITE_PERL%%/Video/DVDRip/CPAN
+@dirrm %%SITE_PERL%%/Video/DVDRip
+@unexec rmdir %D/%%SITE_PERL%%/Video 2>/dev/null || true
diff --git a/net-im/jarl/Makefile b/net-im/jarl/Makefile
index b107cbc7f607..6a2da5959b1e 100644
--- a/net-im/jarl/Makefile
+++ b/net-im/jarl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Perl/Tk Jabber client
RUN_DEPENDS= ptksh:${PORTSDIR}/x11-toolkits/p5-Tk \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Jabber/IQ.pm:${PORTSDIR}/net/p5-Net-Jabber
+ ${SITE_PERL}/Net/Jabber/IQ.pm:${PORTSDIR}/net/p5-Net-Jabber
NO_BUILD= yes
diff --git a/net-im/p5-Jabber-Connection/Makefile b/net-im/p5-Jabber-Connection/Makefile
index 46bbb62aee01..9ec50086bc62 100644
--- a/net-im/p5-Jabber-Connection/Makefile
+++ b/net-im/p5-Jabber-Connection/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Jabber::Connection.3 Jabber::NS.3 Jabber::NodeFactory.3
.include <bsd.port.mk>
diff --git a/net-im/p5-Net-AIM/pkg-plist b/net-im/p5-Net-AIM/pkg-plist
index 056829109de0..3bb9b194db29 100644
--- a/net-im/p5-Net-AIM/pkg-plist
+++ b/net-im/p5-Net-AIM/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM/Connection.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM/Event.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/AIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/AIM.pm
+%%SITE_PERL%%/Net/AIM/Connection.pm
+%%SITE_PERL%%/Net/AIM/Event.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Net/AIM
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net-im/p5-Net-AOLIM/Makefile b/net-im/p5-Net-AOLIM/Makefile
index 8717d920b9c0..23d7033dd28c 100644
--- a/net-im/p5-Net-AOLIM/Makefile
+++ b/net-im/p5-Net-AOLIM/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN3= Net::AOLIM.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net-im/p5-Net-AOLIM/pkg-plist b/net-im/p5-Net-AOLIM/pkg-plist
index 0fa005304ffe..a77414bb513f 100644
--- a/net-im/p5-Net-AOLIM/pkg-plist
+++ b/net-im/p5-Net-AOLIM/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/AOLIM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/example.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AOLIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/AOLIM.pm
+%%SITE_PERL%%/Net/example.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net-im/p5-Net-ICQ2000/Makefile b/net-im/p5-Net-ICQ2000/Makefile
index 880b7cffddd6..04d0e030febc 100644
--- a/net-im/p5-Net-ICQ2000/Makefile
+++ b/net-im/p5-Net-ICQ2000/Makefile
@@ -16,7 +16,6 @@ COMMENT= A perl5 module for ICQv7 protocol realisation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::ICQ2000.3
.include <bsd.port.mk>
diff --git a/net-im/p5-Net-ICQ2000/pkg-plist b/net-im/p5-Net-ICQ2000/pkg-plist
index ee89d17f1a35..c12fde127c95 100644
--- a/net-im/p5-Net-ICQ2000/pkg-plist
+++ b/net-im/p5-Net-ICQ2000/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/ICQ2000.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ICQ2000
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2> /dev/null || true
+%%SITE_PERL%%/Net/ICQ2000.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true
diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index 2bd47716063e..456a5b8ece8a 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Net::Jabber provide a Perl Developer access to the Jabber protocol
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules
+BUILD_DEPENDS= ${SITE_PERL}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
+ ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
+ ${SITE_PERL}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Jabber.3 Net::Jabber::Client.3 Net::Jabber::Component.3 \
Net::Jabber::Data.3 Net::Jabber::Debug.3 \
Net::Jabber::Dialback.3 Net::Jabber::Dialback::Result.3 \
diff --git a/net-im/p5-Net-Jabber/pkg-plist b/net-im/p5-Net-Jabber/pkg-plist
index 3c91235f8800..4ceae39c3b94 100644
--- a/net-im/p5-Net-Jabber/pkg-plist
+++ b/net-im/p5-Net-Jabber/pkg-plist
@@ -1,26 +1,26 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Component.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Result.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Verify.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/IQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/JID.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Key.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Namespaces.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Presence.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/XDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Jabber.pm
+%%SITE_PERL%%/Net/Jabber/Client.pm
+%%SITE_PERL%%/Net/Jabber/Component.pm
+%%SITE_PERL%%/Net/Jabber/Data.pm
+%%SITE_PERL%%/Net/Jabber/Debug.pm
+%%SITE_PERL%%/Net/Jabber/Dialback.pm
+%%SITE_PERL%%/Net/Jabber/Dialback/Result.pm
+%%SITE_PERL%%/Net/Jabber/Dialback/Verify.pm
+%%SITE_PERL%%/Net/Jabber/IQ.pm
+%%SITE_PERL%%/Net/Jabber/JID.pm
+%%SITE_PERL%%/Net/Jabber/Key.pm
+%%SITE_PERL%%/Net/Jabber/Log.pm
+%%SITE_PERL%%/Net/Jabber/Message.pm
+%%SITE_PERL%%/Net/Jabber/Namespaces.pm
+%%SITE_PERL%%/Net/Jabber/Presence.pm
+%%SITE_PERL%%/Net/Jabber/Protocol.pm
+%%SITE_PERL%%/Net/Jabber/Query.pm
+%%SITE_PERL%%/Net/Jabber/Server.pm
+%%SITE_PERL%%/Net/Jabber/X.pm
+%%SITE_PERL%%/Net/Jabber/XDB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber
+@dirrm %%SITE_PERL%%/Net/Jabber/Dialback
+@dirrm %%SITE_PERL%%/Net/Jabber
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net-im/vicq/Makefile b/net-im/vicq/Makefile
index 5ef7fcfac345..6ba820996d4a 100644
--- a/net-im/vicq/Makefile
+++ b/net-im/vicq/Makefile
@@ -14,13 +14,12 @@ MAINTAINER= kevlo@FreeBSD.org
COMMENT= A text-based ICQ implementation
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
WRKSRC= ${WRKDIR}/${PORTNAME}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-extract:
${MV} ${WRKSRC}/Net/vICQ/* ${WRKSRC}
diff --git a/net-im/vicq/pkg-plist b/net-im/vicq/pkg-plist
index bd1bf6a93db3..b8b31b16b64b 100644
--- a/net-im/vicq/pkg-plist
+++ b/net-im/vicq/pkg-plist
@@ -1,8 +1,8 @@
bin/vicq
-lib/perl5/site_perl/%%PERL_VER%%/Net/vICQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/vICQ/.packlist
+%%SITE_PERL%%/Net/vICQ.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ/.packlist
share/examples/vicq/vicqrc.example
@dirrm share/examples/vicq
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/vICQ
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2> /dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true
diff --git a/net-mgmt/aspathtree/Makefile b/net-mgmt/aspathtree/Makefile
index 6bad5d98f372..90081e8341bc 100644
--- a/net-mgmt/aspathtree/Makefile
+++ b/net-mgmt/aspathtree/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ASpath-tree-v${PORTVERSION}
MAINTAINER= Janos.Mohacsi@bsd.hu
COMMENT= Checks IPv6 routes' stability and correctness on IPv6 internet
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
+RUN_DEPENDS= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
ripewhois:${PORTSDIR}/net/ripetools
WRKSRC= ${WRKDIR}/ASpath-tree-v${PORTVERSION}/
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index 488fa0239f8a..2ed994b0c80b 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session \
${SITE_PERL}/Time/Zone.pm:${PORTSDIR}/devel/p5-TimeDate \
${SITE_PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-SITE_PERL_ARCH= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}
+SITE_PERL_ARCH= ${SITE_PERL}/${PERL_ARCH}
HAS_CONFIGURE= yes
USE_PERL5= yes
diff --git a/net-mgmt/flowscan/Makefile b/net-mgmt/flowscan/Makefile
index d3a8084b8ac0..700951d2bb4d 100644
--- a/net-mgmt/flowscan/Makefile
+++ b/net-mgmt/flowscan/Makefile
@@ -18,11 +18,11 @@ COMMENT= Processes IP flows recorded in cflowd-format raw flow files
BUILD_DEPENDS= ksh:${PORTSDIR}/shells/pdksh \
rrdtool:${PORTSDIR}/net/rrdtool \
${LOCALBASE}/sbin/cflowd:${PORTSDIR}/net/cflowd \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Boulder/Stream.pm:${PORTSDIR}/converters/p5-Boulder \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ConfigReader/DirectiveStyle.pm:${PORTSDIR}/devel/p5-ConfigReader \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Table.pm:${PORTSDIR}/www/p5-HTML-Table \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Cflow.pm:${PORTSDIR}/net/p5-Cflow \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/Patricia.pm:${PORTSDIR}/net/p5-Net-Patricia
+ ${SITE_PERL}/Boulder/Stream.pm:${PORTSDIR}/converters/p5-Boulder \
+ ${SITE_PERL}/ConfigReader/DirectiveStyle.pm:${PORTSDIR}/devel/p5-ConfigReader \
+ ${SITE_PERL}/HTML/Table.pm:${PORTSDIR}/www/p5-HTML-Table \
+ ${SITE_PERL}/${PERL_ARCH}/Cflow.pm:${PORTSDIR}/net/p5-Cflow \
+ ${SITE_PERL}/${PERL_ARCH}/Net/Patricia.pm:${PORTSDIR}/net/p5-Net-Patricia
RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake
CFLOWD_FLOWSCAN_PATCH= yes
diff --git a/net-mgmt/junipoll/Makefile b/net-mgmt/junipoll/Makefile
index b0675b4d157c..2fc2c20d73c5 100644
--- a/net-mgmt/junipoll/Makefile
+++ b/net-mgmt/junipoll/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org
COMMENT= JUNIper router snmp POLLer for firewall filter counters
RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Altoids.pm:${PORTSDIR}/net/p5-Altoids
+ ${SITE_PERL}/Altoids.pm:${PORTSDIR}/net/p5-Altoids
PERL_CONFIGURE= yes
diff --git a/net-mgmt/junipoll/pkg-plist b/net-mgmt/junipoll/pkg-plist
index 83ccc1238da3..b2014994c599 100644
--- a/net-mgmt/junipoll/pkg-plist
+++ b/net-mgmt/junipoll/pkg-plist
@@ -1,3 +1,3 @@
bin/junipoll
-lib/perl5/site_perl/%%PERL_VER%%/HCInterfaceTemplate.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/junipoll/.packlist
+%%SITE_PERL%%/HCInterfaceTemplate.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/junipoll/.packlist
diff --git a/net-mgmt/mrtg/pkg-plist b/net-mgmt/mrtg/pkg-plist
index 259b0b713149..949875428795 100644
--- a/net-mgmt/mrtg/pkg-plist
+++ b/net-mgmt/mrtg/pkg-plist
@@ -3,13 +3,13 @@ bin/indexmaker
bin/mrtg
bin/rateup
etc/mrtg/mrtg.cfg.sample
-lib/perl5/site_perl/%%PERL_VER%%/MRTG_lib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/InputObjects.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/PlainText.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Select.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Usage.pm
-lib/perl5/site_perl/%%PERL_VER%%/locales_mrtg.pm
+%%SITE_PERL%%/MRTG_lib.pm
+%%SITE_PERL%%/Pod/InputObjects.pm
+%%SITE_PERL%%/Pod/Parser.pm
+%%SITE_PERL%%/Pod/PlainText.pm
+%%SITE_PERL%%/Pod/Select.pm
+%%SITE_PERL%%/Pod/Usage.pm
+%%SITE_PERL%%/locales_mrtg.pm
%%PORTDOCS%%share/doc/mrtg/ANNOUNCE
%%PORTDOCS%%share/doc/mrtg/CHANGES
%%PORTDOCS%%share/doc/mrtg/COPYRIGHT
@@ -80,6 +80,6 @@ share/mrtg/mrtg-r.png
share/mrtg/mrtg-ti.gif
share/mrtg/mrtg-ti.png
@dirrm etc/mrtg
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod
+@dirrm %%SITE_PERL%%/Pod
%%PORTDOCS%%@dirrm share/doc/mrtg
@dirrm share/mrtg
diff --git a/net-mgmt/net-snmp-tkmib/Makefile b/net-mgmt/net-snmp-tkmib/Makefile
index 11fbf73acba1..c7716fb32ab1 100644
--- a/net-mgmt/net-snmp-tkmib/Makefile
+++ b/net-mgmt/net-snmp-tkmib/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${SITE_PERL}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
WRKSRC= ${WRKDIR}/ucd-snmp-${PORTVERSION}
NO_BUILD= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}/${PERL_ARCH}
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/local/tkmib ${PREFIX}/bin
diff --git a/net-mgmt/nrpep/Makefile b/net-mgmt/nrpep/Makefile
index 1e28d35e33bf..c6f65fab0575 100644
--- a/net-mgmt/nrpep/Makefile
+++ b/net-mgmt/nrpep/Makefile
@@ -14,7 +14,7 @@ COMMENT= A netsaint addon for running plugins on remote hosts
# Note that this port depends on neither netsaint-plugins OR netsaint, because it
# installs both a client and a server, and so could need EITHER. Bummer.
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Crypt/TripleDES.pm:${PORTSDIR}/security/p5-Crypt-TripleDES
+RUN_DEPENDS= ${SITE_PERL}/Crypt/TripleDES.pm:${PORTSDIR}/security/p5-Crypt-TripleDES
USE_PERL5_RUN= yes
diff --git a/net-mgmt/nsc/Makefile b/net-mgmt/nsc/Makefile
index 597411d2f587..5284c92a46de 100644
--- a/net-mgmt/nsc/Makefile
+++ b/net-mgmt/nsc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= dirk
MAINTAINER= dirk@FreeBSD.org
COMMENT= Netsaint Console monitor
-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
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/net-mgmt/p5-Altoids/Makefile b/net-mgmt/p5-Altoids/Makefile
index 4278a53e9e95..942bba982e66 100644
--- a/net-mgmt/p5-Altoids/Makefile
+++ b/net-mgmt/p5-Altoids/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= billf@FreeBSD.org
COMMENT= SNMP get/walk functionality with built-in name to OID translation
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
+RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
GNU_CONFIGURE= yes
diff --git a/net-mgmt/p5-Altoids/pkg-plist b/net-mgmt/p5-Altoids/pkg-plist
index a0872517cd92..940269ace681 100644
--- a/net-mgmt/p5-Altoids/pkg-plist
+++ b/net-mgmt/p5-Altoids/pkg-plist
@@ -1,7 +1,7 @@
bin/altget
bin/altwalk
-lib/perl5/site_perl/%%PERL_VER%%/Altoids.pm
-lib/perl5/site_perl/%%PERL_VER%%/altoids.pl
+%%SITE_PERL%%/Altoids.pm
+%%SITE_PERL%%/altoids.pl
share/altoids/CISCO-ATM-IF-MIB.oid
share/altoids/CISCO-LECS-MIB.oid
share/altoids/CISCO-LES-MIB.oid
diff --git a/net-mgmt/p5-Cflow/pkg-plist b/net-mgmt/p5-Cflow/pkg-plist
index b6979f86cd3e..57c85d3587fc 100644
--- a/net-mgmt/p5-Cflow/pkg-plist
+++ b/net-mgmt/p5-Cflow/pkg-plist
@@ -1,7 +1,7 @@
bin/flowdumper
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/Cflow.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/Cflow.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cflow.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/Cflow.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow
diff --git a/net-mgmt/p5-JUNOScript/Makefile b/net-mgmt/p5-JUNOScript/Makefile
index e25502cd08d2..ba2f8c24f81f 100644
--- a/net-mgmt/p5-JUNOScript/Makefile
+++ b/net-mgmt/p5-JUNOScript/Makefile
@@ -18,7 +18,7 @@ DISTNAME= junoscript-perl-${PORTVERSION}-domestic
MAINTAINER= jesper@FreeBSD.org
COMMENT= API to exchange information with Juniper Networks routers
-PERL_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_BASE= ${SITE_PERL}
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 \
xml2:${PORTSDIR}/textproc/libxml2 \
xslt:${PORTSDIR}/textproc/libxslt
@@ -69,7 +69,6 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/junoscript-perl-${PORTVERSION}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= JUNOS::Access.3 \
JUNOS::Access::stubs.3 \
JUNOS::Access::ssl.3 \
diff --git a/net-mgmt/p5-JUNOScript/pkg-plist b/net-mgmt/p5-JUNOScript/pkg-plist
index 4dd8d09e06a4..0bdc37ffe4cc 100644
--- a/net-mgmt/p5-JUNOScript/pkg-plist
+++ b/net-mgmt/p5-JUNOScript/pkg-plist
@@ -1,21 +1,21 @@
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/stubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/ssl.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/xnm.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/clear_text.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/telnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/rsh.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/ssh.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jroute_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jcrypto_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jkernel_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Methods.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/DOM/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/version.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Response.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Trace.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Device.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/DOM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS
+%%SITE_PERL%%/JUNOS/Access/stubs.pm
+%%SITE_PERL%%/JUNOS/Access/ssl.pm
+%%SITE_PERL%%/JUNOS/Access/xnm.pm
+%%SITE_PERL%%/JUNOS/Access/clear_text.pm
+%%SITE_PERL%%/JUNOS/Access/telnet.pm
+%%SITE_PERL%%/JUNOS/Access/rsh.pm
+%%SITE_PERL%%/JUNOS/Access/ssh.pm
+%%SITE_PERL%%/JUNOS/Access.pm
+%%SITE_PERL%%/JUNOS/5.3R2/jroute_methods.pl
+%%SITE_PERL%%/JUNOS/5.3R2/jcrypto_methods.pl
+%%SITE_PERL%%/JUNOS/5.3R2/jkernel_methods.pl
+%%SITE_PERL%%/JUNOS/Methods.pm
+%%SITE_PERL%%/JUNOS/DOM/Parser.pm
+%%SITE_PERL%%/JUNOS/version.pm
+%%SITE_PERL%%/JUNOS/Response.pm
+%%SITE_PERL%%/JUNOS/Trace.pm
+%%SITE_PERL%%/JUNOS/Device.pm
+@dirrm %%SITE_PERL%%/JUNOS/5.3R2
+@dirrm %%SITE_PERL%%/JUNOS/Access
+@dirrm %%SITE_PERL%%/JUNOS/DOM
+@dirrm %%SITE_PERL%%/JUNOS
diff --git a/net-mgmt/p5-Mon/Makefile b/net-mgmt/p5-Mon/Makefile
index 6c894c62f4ee..08fd4f743ca2 100644
--- a/net-mgmt/p5-Mon/Makefile
+++ b/net-mgmt/p5-Mon/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl module that supports mon, a network and system monitoring daemon
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mon::SNMP.3 \
Mon::Client.3 \
Mon::Protocol.3
diff --git a/net-mgmt/p5-Mon/pkg-plist b/net-mgmt/p5-Mon/pkg-plist
index 2ecd0782ab22..1e891925646e 100644
--- a/net-mgmt/p5-Mon/pkg-plist
+++ b/net-mgmt/p5-Mon/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mon/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mon/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mon/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mon/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mon
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mon
+%%SITE_PERL%%/Mon/SNMP.pm
+%%SITE_PERL%%/Mon/Client.pm
+%%SITE_PERL%%/Mon/Protocol.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon
+@dirrm %%SITE_PERL%%/Mon
diff --git a/net-mgmt/p5-Net-CIDR/Makefile b/net-mgmt/p5-Net-CIDR/Makefile
index 0b15ece4220a..343b90023a03 100644
--- a/net-mgmt/p5-Net-CIDR/Makefile
+++ b/net-mgmt/p5-Net-CIDR/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to manipulate IPv4/IPv6 netblocks in CIDR notation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::CIDR.3
.include <bsd.port.mk>
diff --git a/net-mgmt/p5-Net-CIDR/pkg-plist b/net-mgmt/p5-Net-CIDR/pkg-plist
index 63df1a085536..cb70ad77e5a0 100644
--- a/net-mgmt/p5-Net-CIDR/pkg-plist
+++ b/net-mgmt/p5-Net-CIDR/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/CIDR.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/CIDR
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/CIDR.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net-mgmt/p5-Net-IPv4Addr/pkg-plist b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
index 0a3f254d4f64..44e353284e09 100644
--- a/net-mgmt/p5-Net-IPv4Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
@@ -1,9 +1,9 @@
bin/ipv4calc
-lib/perl5/site_perl/%%PERL_VER%%/Net/IPv4Addr.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/IPv4Addr.pm
+%%SITE_PERL%%/auto/Net/IPv4Addr/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
+@dirrm %%SITE_PERL%%/auto/Net/IPv4Addr
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net-mgmt/p5-Net-IPv6Addr/Makefile b/net-mgmt/p5-Net-IPv6Addr/Makefile
index 4fcf1c77ddce..5e3d57a5d4f3 100644
--- a/net-mgmt/p5-Net-IPv6Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv6Addr/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jj@nttmcl.com
COMMENT= Perl extension for manipulating IPv6 addresses
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/IPv4Addr.pm:${PORTSDIR}/net/p5-Net-IPv4Addr \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Math/Base85.pm:${PORTSDIR}/math/p5-Math-Base85
+BUILD_DEPENDS= ${SITE_PERL}/Net/IPv4Addr.pm:${PORTSDIR}/net/p5-Net-IPv4Addr \
+ ${SITE_PERL}/Math/Base85.pm:${PORTSDIR}/math/p5-Math-Base85
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/net-mgmt/p5-Net-IPv6Addr/pkg-plist b/net-mgmt/p5-Net-IPv6Addr/pkg-plist
index 43f6d919b7a7..a572beffdd37 100644
--- a/net-mgmt/p5-Net-IPv6Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv6Addr/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/IPv6Addr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/IPv6Addr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net-mgmt/p5-Net-Netmask/Makefile b/net-mgmt/p5-Net-Netmask/Makefile
index ca105125cdcb..e3d4b16f9414 100644
--- a/net-mgmt/p5-Net-Netmask/Makefile
+++ b/net-mgmt/p5-Net-Netmask/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to parse, manipulate and lookup IP network blocks
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Netmask.3
.include <bsd.port.mk>
diff --git a/net-mgmt/p5-Net-Netmask/pkg-plist b/net-mgmt/p5-Net-Netmask/pkg-plist
index 6a04e9c5fa62..99bfc80a6892 100644
--- a/net-mgmt/p5-Net-Netmask/pkg-plist
+++ b/net-mgmt/p5-Net-Netmask/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Netmask.pod
+%%SITE_PERL%%/Net/Netmask.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net-mgmt/p5-NetAddr-IP/Makefile b/net-mgmt/p5-NetAddr-IP/Makefile
index a9f654cf2744..bd2fae0e00e8 100644
--- a/net-mgmt/p5-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-NetAddr-IP/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl module for working with IP addresses and blocks thereof
-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
diff --git a/net-mgmt/p5-NetAddr-IP/pkg-plist b/net-mgmt/p5-NetAddr-IP/pkg-plist
index 06ce8b14fa22..3b5b565fb485 100644
--- a/net-mgmt/p5-NetAddr-IP/pkg-plist
+++ b/net-mgmt/p5-NetAddr-IP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/NetAddr
+%%SITE_PERL%%/NetAddr/IP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
+@dirrm %%SITE_PERL%%/NetAddr
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
index f5a01f0cb517..8999b8efdd50 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= marcus@FreeBSD.org
COMMENT= A Perl MIB compiler supporting both SMIv1 and SMIv2
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/Compare.pm:${PORTSDIR}/devel/p5-Data-Compare
+BUILD_DEPENDS= ${SITE_PERL}/Data/Compare.pm:${PORTSDIR}/devel/p5-Data-Compare
PERL_CONFIGURE= yes
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist b/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
index 1dc69ce8baba..d5743b0f21f8 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
@@ -1,13 +1,13 @@
bin/mibbrowser
bin/mibcompiler
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/MIB/Compiler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP/MIB/Compiler.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+%%SITE_PERL%%/SNMP/MIB/Compiler.pm
+%%SITE_PERL%%/Bundle/SNMP/MIB/Compiler.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
+@dirrm %%SITE_PERL%%/SNMP/MIB
+@dirrm %%SITE_PERL%%/SNMP
+@dirrm %%SITE_PERL%%/Bundle/SNMP/MIB
+@dirrm %%SITE_PERL%%/Bundle/SNMP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
diff --git a/net-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index 4072c6530360..bfe7997ff7a3 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/p5-SNMP-Util/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= fenner@FreeBSD.org
COMMENT= Perl modules to perform SNMP set,get,walk,next,walk_hash etc
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
PERL_CONFIGURE= yes
MAN3= SNMP::Util.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net-mgmt/p5-SNMP-Util/pkg-plist b/net-mgmt/p5-SNMP-Util/pkg-plist
index 8d1bb8e92c43..45bd43f00781 100644
--- a/net-mgmt/p5-SNMP-Util/pkg-plist
+++ b/net-mgmt/p5-SNMP-Util/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/Util_env.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/Util/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP
+%%SITE_PERL%%/SNMP/Util.pm
+%%SITE_PERL%%/SNMP/Util_env.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util
+@dirrm %%SITE_PERL%%/SNMP
diff --git a/net-mgmt/p5-SNMP/pkg-plist b/net-mgmt/p5-SNMP/pkg-plist
index ab35e7ecaf97..44aead515a4d 100644
--- a/net-mgmt/p5-SNMP/pkg-plist
+++ b/net-mgmt/p5-SNMP/pkg-plist
@@ -1,7 +1,7 @@
lib/perl5/site_perl/README.SNMP
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP
+%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
diff --git a/net-mgmt/p5-SNMP_Session/pkg-plist b/net-mgmt/p5-SNMP_Session/pkg-plist
index 427fdd615c02..f2271d1b39be 100644
--- a/net-mgmt/p5-SNMP_Session/pkg-plist
+++ b/net-mgmt/p5-SNMP_Session/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/BER.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP_Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP_util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP_Session/.packlist
+%%SITE_PERL%%/BER.pm
+%%SITE_PERL%%/SNMP_Session.pm
+%%SITE_PERL%%/SNMP_util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session/.packlist
%%PORTDOCS%%share/doc/SNMP_Session/README
%%PORTDOCS%%share/doc/SNMP_Session/README.SNMP_util
%%PORTDOCS%%share/doc/SNMP_Session/index.html
%%PORTDOCS%%@dirrm share/doc/SNMP_Session
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP_Session
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session
diff --git a/net-mgmt/p5-Telnet-Cisco/Makefile b/net-mgmt/p5-Telnet-Cisco/Makefile
index 8d939273774e..b085d858b2b6 100644
--- a/net-mgmt/p5-Telnet-Cisco/Makefile
+++ b/net-mgmt/p5-Telnet-Cisco/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lyngbol@wheel.dk
COMMENT= Perl5 module to telnet to Cisco routers
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
+ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
+ ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Net::Telnet::Cisco.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net-mgmt/p5-Telnet-Cisco/pkg-plist b/net-mgmt/p5-Telnet-Cisco/pkg-plist
index 9c5819955ccc..a47cbba36307 100644
--- a/net-mgmt/p5-Telnet-Cisco/pkg-plist
+++ b/net-mgmt/p5-Telnet-Cisco/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Telnet/Cisco.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet/Cisco/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet/Cisco 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Telnet/Cisco.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
+%%SITE_PERL%%/auto/Net/Telnet/Cisco/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet/Cisco 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile
index ec6d4faf7a67..4b0bd395c706 100644
--- a/net-mgmt/rancid-devel/Makefile
+++ b/net-mgmt/rancid-devel/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= expect:${PORTSDIR}/lang/expect \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
${SITE_PERL}/LockFile/Simple.pm:${PORTSDIR}/devel/p5-LockFile-Simple
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
USE_PERL5= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_GMAKE= yes
@@ -27,7 +27,6 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX}/rancid
-MANPREFIX= ${PREFIX}/rancid
MAN1= lg_intro.1 par.1 do-diffs.1 alogin.1 blogin.1 clogin.1 \
control_rancid.1 create_cvs.1 rancid.1 rancid_intro.1 \
diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile
index ec6d4faf7a67..4b0bd395c706 100644
--- a/net-mgmt/rancid/Makefile
+++ b/net-mgmt/rancid/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= expect:${PORTSDIR}/lang/expect \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
${SITE_PERL}/LockFile/Simple.pm:${PORTSDIR}/devel/p5-LockFile-Simple
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
USE_PERL5= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_GMAKE= yes
@@ -27,7 +27,6 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX}/rancid
-MANPREFIX= ${PREFIX}/rancid
MAN1= lg_intro.1 par.1 do-diffs.1 alogin.1 blogin.1 clogin.1 \
control_rancid.1 create_cvs.1 rancid.1 rancid_intro.1 \
diff --git a/net-mgmt/remarp/pkg-plist b/net-mgmt/remarp/pkg-plist
index 7b1cdbf0912a..ca539473cd5d 100644
--- a/net-mgmt/remarp/pkg-plist
+++ b/net-mgmt/remarp/pkg-plist
@@ -1,5 +1,5 @@
sbin/remarp
etc/remarp.conf.sample
-lib/perl5/site_perl/%%PERL_VER%%/remarp/config.pm
-lib/perl5/site_perl/%%PERL_VER%%/remarp/configure.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/remarp
+%%SITE_PERL%%/remarp/config.pm
+%%SITE_PERL%%/remarp/configure.pm
+@dirrm %%SITE_PERL%%/remarp
diff --git a/net-p2p/edonkey-gui-gtk-urlslave/Makefile b/net-p2p/edonkey-gui-gtk-urlslave/Makefile
index f1950c59bc03..21326a1d9f89 100644
--- a/net-p2p/edonkey-gui-gtk-urlslave/Makefile
+++ b/net-p2p/edonkey-gui-gtk-urlslave/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ed2k_urlslave-v2
MAINTAINER= lioux@FreeBSD.org
COMMENT= GTK+ enabled Perl script for adding ed2k:// links to ed2k GTK+ GUI
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
RUN_DEPENDS= ed2k_gui:${PORTSDIR}/net/edonkey-gui-gtk
USE_PERL5= yes
diff --git a/net-p2p/mldonkey-perlreactor/Makefile b/net-p2p/mldonkey-perlreactor/Makefile
index 979d961acf26..c50b60fecc77 100644
--- a/net-p2p/mldonkey-perlreactor/Makefile
+++ b/net-p2p/mldonkey-perlreactor/Makefile
@@ -16,7 +16,7 @@ DISTNAME= perlreactor_${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= Automatically add links found in web pages to MLDonkey queue
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net-p2p/mldonkey-serverspy/Makefile b/net-p2p/mldonkey-serverspy/Makefile
index 3cd340789f14..bb6905a89395 100644
--- a/net-p2p/mldonkey-serverspy/Makefile
+++ b/net-p2p/mldonkey-serverspy/Makefile
@@ -16,10 +16,10 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= MLDonkey Server Spy broadcasts your whereabouts on the eDonkey network
RUN_DEPENDS= \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/auto/TimeDate:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+ ${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
+ ${SITE_PERL}/${PERL_ARCH}/auto/TimeDate:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
+ ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net-p2p/mldonkey-urlslave/Makefile b/net-p2p/mldonkey-urlslave/Makefile
index 839cf78539c0..d6a0371d9cb8 100644
--- a/net-p2p/mldonkey-urlslave/Makefile
+++ b/net-p2p/mldonkey-urlslave/Makefile
@@ -16,7 +16,7 @@ DISTNAME= mlurlslave-v${PORTVERSION:S/^0.0.//}
MAINTAINER= lioux@FreeBSD.org
COMMENT= GTK+ enabled Perl script for adding ed2k:// links to MLDonkey
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net/aspathtree/Makefile b/net/aspathtree/Makefile
index 6bad5d98f372..90081e8341bc 100644
--- a/net/aspathtree/Makefile
+++ b/net/aspathtree/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ASpath-tree-v${PORTVERSION}
MAINTAINER= Janos.Mohacsi@bsd.hu
COMMENT= Checks IPv6 routes' stability and correctness on IPv6 internet
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
+RUN_DEPENDS= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
ripewhois:${PORTSDIR}/net/ripetools
WRKSRC= ${WRKDIR}/ASpath-tree-v${PORTVERSION}/
diff --git a/net/cricket/Makefile b/net/cricket/Makefile
index 488fa0239f8a..2ed994b0c80b 100644
--- a/net/cricket/Makefile
+++ b/net/cricket/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session \
${SITE_PERL}/Time/Zone.pm:${PORTSDIR}/devel/p5-TimeDate \
${SITE_PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-SITE_PERL_ARCH= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}
+SITE_PERL_ARCH= ${SITE_PERL}/${PERL_ARCH}
HAS_CONFIGURE= yes
USE_PERL5= yes
diff --git a/net/ctrace/Makefile b/net/ctrace/Makefile
index f8f4b6ffc80b..0c95f1f7f53b 100644
--- a/net/ctrace/Makefile
+++ b/net/ctrace/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES= http://www.pratyeka.org/ctrace/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiprotocol traceroute tool
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP \
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
NO_BUILD= yes
USE_BZIP2= yes
diff --git a/net/edonkey-gui-gtk-urlslave/Makefile b/net/edonkey-gui-gtk-urlslave/Makefile
index f1950c59bc03..21326a1d9f89 100644
--- a/net/edonkey-gui-gtk-urlslave/Makefile
+++ b/net/edonkey-gui-gtk-urlslave/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ed2k_urlslave-v2
MAINTAINER= lioux@FreeBSD.org
COMMENT= GTK+ enabled Perl script for adding ed2k:// links to ed2k GTK+ GUI
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
RUN_DEPENDS= ed2k_gui:${PORTSDIR}/net/edonkey-gui-gtk
USE_PERL5= yes
diff --git a/net/flowscan/Makefile b/net/flowscan/Makefile
index d3a8084b8ac0..700951d2bb4d 100644
--- a/net/flowscan/Makefile
+++ b/net/flowscan/Makefile
@@ -18,11 +18,11 @@ COMMENT= Processes IP flows recorded in cflowd-format raw flow files
BUILD_DEPENDS= ksh:${PORTSDIR}/shells/pdksh \
rrdtool:${PORTSDIR}/net/rrdtool \
${LOCALBASE}/sbin/cflowd:${PORTSDIR}/net/cflowd \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Boulder/Stream.pm:${PORTSDIR}/converters/p5-Boulder \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ConfigReader/DirectiveStyle.pm:${PORTSDIR}/devel/p5-ConfigReader \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Table.pm:${PORTSDIR}/www/p5-HTML-Table \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Cflow.pm:${PORTSDIR}/net/p5-Cflow \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/Patricia.pm:${PORTSDIR}/net/p5-Net-Patricia
+ ${SITE_PERL}/Boulder/Stream.pm:${PORTSDIR}/converters/p5-Boulder \
+ ${SITE_PERL}/ConfigReader/DirectiveStyle.pm:${PORTSDIR}/devel/p5-ConfigReader \
+ ${SITE_PERL}/HTML/Table.pm:${PORTSDIR}/www/p5-HTML-Table \
+ ${SITE_PERL}/${PERL_ARCH}/Cflow.pm:${PORTSDIR}/net/p5-Cflow \
+ ${SITE_PERL}/${PERL_ARCH}/Net/Patricia.pm:${PORTSDIR}/net/p5-Net-Patricia
RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake
CFLOWD_FLOWSCAN_PATCH= yes
diff --git a/net/hawk/Makefile b/net/hawk/Makefile
index 74c0974a54b2..6563d0643d03 100644
--- a/net/hawk/Makefile
+++ b/net/hawk/Makefile
@@ -16,7 +16,7 @@ COMMENT= Track uptime and DNS status for machines on your networks
RUN_DEPENDS= php-config:${PORTSDIR}/www/mod_php4 \
safe_mysqld:${PORTSDIR}/databases/mysql323-server \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask
+ ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask
do-patch:
@${SED} -e 's#dirname.*"/hawk#"${PREFIX}/etc/hawk/daemon#' \
diff --git a/net/jarl/Makefile b/net/jarl/Makefile
index b107cbc7f607..6a2da5959b1e 100644
--- a/net/jarl/Makefile
+++ b/net/jarl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Perl/Tk Jabber client
RUN_DEPENDS= ptksh:${PORTSDIR}/x11-toolkits/p5-Tk \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Jabber/IQ.pm:${PORTSDIR}/net/p5-Net-Jabber
+ ${SITE_PERL}/Net/Jabber/IQ.pm:${PORTSDIR}/net/p5-Net-Jabber
NO_BUILD= yes
diff --git a/net/junipoll/Makefile b/net/junipoll/Makefile
index b0675b4d157c..2fc2c20d73c5 100644
--- a/net/junipoll/Makefile
+++ b/net/junipoll/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org
COMMENT= JUNIper router snmp POLLer for firewall filter counters
RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Altoids.pm:${PORTSDIR}/net/p5-Altoids
+ ${SITE_PERL}/Altoids.pm:${PORTSDIR}/net/p5-Altoids
PERL_CONFIGURE= yes
diff --git a/net/junipoll/pkg-plist b/net/junipoll/pkg-plist
index 83ccc1238da3..b2014994c599 100644
--- a/net/junipoll/pkg-plist
+++ b/net/junipoll/pkg-plist
@@ -1,3 +1,3 @@
bin/junipoll
-lib/perl5/site_perl/%%PERL_VER%%/HCInterfaceTemplate.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/junipoll/.packlist
+%%SITE_PERL%%/HCInterfaceTemplate.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/junipoll/.packlist
diff --git a/net/lla/Makefile b/net/lla/Makefile
index 549add94f9c4..ac24ef3ad4a0 100644
--- a/net/lla/Makefile
+++ b/net/lla/Makefile
@@ -27,8 +27,8 @@ EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= ./${PORTNAME}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-SITE_ARCH_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}
+SITE_ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
diff --git a/net/mldonkey-perlreactor/Makefile b/net/mldonkey-perlreactor/Makefile
index 979d961acf26..c50b60fecc77 100644
--- a/net/mldonkey-perlreactor/Makefile
+++ b/net/mldonkey-perlreactor/Makefile
@@ -16,7 +16,7 @@ DISTNAME= perlreactor_${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= Automatically add links found in web pages to MLDonkey queue
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net/mldonkey-serverspy/Makefile b/net/mldonkey-serverspy/Makefile
index 3cd340789f14..bb6905a89395 100644
--- a/net/mldonkey-serverspy/Makefile
+++ b/net/mldonkey-serverspy/Makefile
@@ -16,10 +16,10 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= MLDonkey Server Spy broadcasts your whereabouts on the eDonkey network
RUN_DEPENDS= \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/auto/TimeDate:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+ ${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
+ ${SITE_PERL}/${PERL_ARCH}/auto/TimeDate:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
+ ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net/mldonkey-urlslave/Makefile b/net/mldonkey-urlslave/Makefile
index 839cf78539c0..d6a0371d9cb8 100644
--- a/net/mldonkey-urlslave/Makefile
+++ b/net/mldonkey-urlslave/Makefile
@@ -16,7 +16,7 @@ DISTNAME= mlurlslave-v${PORTVERSION:S/^0.0.//}
MAINTAINER= lioux@FreeBSD.org
COMMENT= GTK+ enabled Perl script for adding ed2k:// links to MLDonkey
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net/mrtg/pkg-plist b/net/mrtg/pkg-plist
index 259b0b713149..949875428795 100644
--- a/net/mrtg/pkg-plist
+++ b/net/mrtg/pkg-plist
@@ -3,13 +3,13 @@ bin/indexmaker
bin/mrtg
bin/rateup
etc/mrtg/mrtg.cfg.sample
-lib/perl5/site_perl/%%PERL_VER%%/MRTG_lib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/InputObjects.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/PlainText.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Select.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Usage.pm
-lib/perl5/site_perl/%%PERL_VER%%/locales_mrtg.pm
+%%SITE_PERL%%/MRTG_lib.pm
+%%SITE_PERL%%/Pod/InputObjects.pm
+%%SITE_PERL%%/Pod/Parser.pm
+%%SITE_PERL%%/Pod/PlainText.pm
+%%SITE_PERL%%/Pod/Select.pm
+%%SITE_PERL%%/Pod/Usage.pm
+%%SITE_PERL%%/locales_mrtg.pm
%%PORTDOCS%%share/doc/mrtg/ANNOUNCE
%%PORTDOCS%%share/doc/mrtg/CHANGES
%%PORTDOCS%%share/doc/mrtg/COPYRIGHT
@@ -80,6 +80,6 @@ share/mrtg/mrtg-r.png
share/mrtg/mrtg-ti.gif
share/mrtg/mrtg-ti.png
@dirrm etc/mrtg
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod
+@dirrm %%SITE_PERL%%/Pod
%%PORTDOCS%%@dirrm share/doc/mrtg
@dirrm share/mrtg
diff --git a/net/net-snmp-tkmib/Makefile b/net/net-snmp-tkmib/Makefile
index 11fbf73acba1..c7716fb32ab1 100644
--- a/net/net-snmp-tkmib/Makefile
+++ b/net/net-snmp-tkmib/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${SITE_PERL}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
WRKSRC= ${WRKDIR}/ucd-snmp-${PORTVERSION}
NO_BUILD= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}/${PERL_ARCH}
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/local/tkmib ${PREFIX}/bin
diff --git a/net/nrpep/Makefile b/net/nrpep/Makefile
index 1e28d35e33bf..c6f65fab0575 100644
--- a/net/nrpep/Makefile
+++ b/net/nrpep/Makefile
@@ -14,7 +14,7 @@ COMMENT= A netsaint addon for running plugins on remote hosts
# Note that this port depends on neither netsaint-plugins OR netsaint, because it
# installs both a client and a server, and so could need EITHER. Bummer.
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Crypt/TripleDES.pm:${PORTSDIR}/security/p5-Crypt-TripleDES
+RUN_DEPENDS= ${SITE_PERL}/Crypt/TripleDES.pm:${PORTSDIR}/security/p5-Crypt-TripleDES
USE_PERL5_RUN= yes
diff --git a/net/nsc/Makefile b/net/nsc/Makefile
index 597411d2f587..5284c92a46de 100644
--- a/net/nsc/Makefile
+++ b/net/nsc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= dirk
MAINTAINER= dirk@FreeBSD.org
COMMENT= Netsaint Console monitor
-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
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/net/openreg/Makefile b/net/openreg/Makefile
index f0b89f157c8f..da9f6730f520 100644
--- a/net/openreg/Makefile
+++ b/net/openreg/Makefile
@@ -17,7 +17,7 @@ COMMENT= Domain Registry software
RUN_DEPENDS= ${LOCALBASE}/sbin/stunnel:${PORTSDIR}/security/stunnel \
${LOCALBASE}/sbin/named:${PORTSDIR}/dns/bind9 \
${LOCALBASE}/bin/postgres:${PORTSDIR}/${POSTGRESQL_PORT} \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
BUILD_DEPENDS= ${LOCALBASE}/include/isc/buffer.h:${PORTSDIR}/dns/bind9
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
diff --git a/net/openreg/pkg-plist b/net/openreg/pkg-plist
index f053b5cbea11..08182756780e 100644
--- a/net/openreg/pkg-plist
+++ b/net/openreg/pkg-plist
@@ -9,43 +9,43 @@ lib/perl5/%%PERL_VER%%/man/man3/ISC::Random.3
lib/perl5/%%PERL_VER%%/man/man3/ISC::SRS::DB.3
lib/perl5/%%PERL_VER%%/man/man3/ISC::SRS::Version.3
lib/perl5/%%PERL_VER%%/man/man3/ISC::Stats::Report.3
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Direct.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Direct/Connect.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Direct/Listen.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Group.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Group/Connect.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/DB/ReplicationMaster.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/DB/ReplicationSlave.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/NameVerify.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Net/CRLF.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Net/Connect.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Net/LengthPrefix.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Net/Listen.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Random.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/DB.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPConnection.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPRegistrar.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPResultCode.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPWriter.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/SAX/EPPHandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/Version.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Stats/Report.pm
-lib/perl5/site_perl/%%PERL_VER%%/mach/auto/ISC/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/ISC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Direct
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Group
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/CC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/DB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/Net
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/SAX
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/Stats
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC
+%%SITE_PERL%%/ISC/CC/Direct.pm
+%%SITE_PERL%%/ISC/CC/Direct/Connect.pm
+%%SITE_PERL%%/ISC/CC/Direct/Listen.pm
+%%SITE_PERL%%/ISC/CC/Group.pm
+%%SITE_PERL%%/ISC/CC/Group/Connect.pm
+%%SITE_PERL%%/ISC/CC/Message.pm
+%%SITE_PERL%%/ISC/DB/ReplicationMaster.pm
+%%SITE_PERL%%/ISC/DB/ReplicationSlave.pm
+%%SITE_PERL%%/ISC/DBI.pm
+%%SITE_PERL%%/ISC/Date.pm
+%%SITE_PERL%%/ISC/Log.pm
+%%SITE_PERL%%/ISC/NameVerify.pm
+%%SITE_PERL%%/ISC/Net/CRLF.pm
+%%SITE_PERL%%/ISC/Net/Connect.pm
+%%SITE_PERL%%/ISC/Net/LengthPrefix.pm
+%%SITE_PERL%%/ISC/Net/Listen.pm
+%%SITE_PERL%%/ISC/Random.pm
+%%SITE_PERL%%/ISC/SRS/DB.pm
+%%SITE_PERL%%/ISC/SRS/EPPConnection.pm
+%%SITE_PERL%%/ISC/SRS/EPPParser.pm
+%%SITE_PERL%%/ISC/SRS/EPPRegistrar.pm
+%%SITE_PERL%%/ISC/SRS/EPPResultCode.pm
+%%SITE_PERL%%/ISC/SRS/EPPWriter.pm
+%%SITE_PERL%%/ISC/SRS/SAX/EPPHandler.pm
+%%SITE_PERL%%/ISC/SRS/Version.pm
+%%SITE_PERL%%/ISC/Stats/Report.pm
+%%SITE_PERL%%/mach/auto/ISC/.packlist
+@dirrm %%SITE_PERL%%/mach/auto/ISC
+@dirrm %%SITE_PERL%%/ISC/CC/Direct
+@dirrm %%SITE_PERL%%/ISC/CC/Group
+@dirrm %%SITE_PERL%%/ISC/CC
+@dirrm %%SITE_PERL%%/ISC/DB
+@dirrm %%SITE_PERL%%/ISC/Net
+@dirrm %%SITE_PERL%%/ISC/SRS/SAX
+@dirrm %%SITE_PERL%%/ISC/SRS
+@dirrm %%SITE_PERL%%/ISC/Stats
+@dirrm %%SITE_PERL%%/ISC
bin/group-sniff
bin/epp-from-file
sbin/msgq
diff --git a/net/p5-Altoids/Makefile b/net/p5-Altoids/Makefile
index 4278a53e9e95..942bba982e66 100644
--- a/net/p5-Altoids/Makefile
+++ b/net/p5-Altoids/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= billf@FreeBSD.org
COMMENT= SNMP get/walk functionality with built-in name to OID translation
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
+RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
GNU_CONFIGURE= yes
diff --git a/net/p5-Altoids/pkg-plist b/net/p5-Altoids/pkg-plist
index a0872517cd92..940269ace681 100644
--- a/net/p5-Altoids/pkg-plist
+++ b/net/p5-Altoids/pkg-plist
@@ -1,7 +1,7 @@
bin/altget
bin/altwalk
-lib/perl5/site_perl/%%PERL_VER%%/Altoids.pm
-lib/perl5/site_perl/%%PERL_VER%%/altoids.pl
+%%SITE_PERL%%/Altoids.pm
+%%SITE_PERL%%/altoids.pl
share/altoids/CISCO-ATM-IF-MIB.oid
share/altoids/CISCO-LECS-MIB.oid
share/altoids/CISCO-LES-MIB.oid
diff --git a/net/p5-Archie/pkg-plist b/net/p5-Archie/pkg-plist
index 942fec8f2776..16ef7bed1ddb 100644
--- a/net/p5-Archie/pkg-plist
+++ b/net/p5-Archie/pkg-plist
@@ -1,2 +1,2 @@
-lib/perl5/site_perl/%%PERL_VER%%/Archie.pm
+%%SITE_PERL%%/Archie.pm
bin/archie_gateway
diff --git a/net/p5-Cflow/pkg-plist b/net/p5-Cflow/pkg-plist
index b6979f86cd3e..57c85d3587fc 100644
--- a/net/p5-Cflow/pkg-plist
+++ b/net/p5-Cflow/pkg-plist
@@ -1,7 +1,7 @@
bin/flowdumper
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/Cflow.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/Cflow.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cflow.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/Cflow.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow
diff --git a/net/p5-Frontier-RPC/Makefile b/net/p5-Frontier-RPC/Makefile
index bc541c6169b8..d47e78a82277 100644
--- a/net/p5-Frontier-RPC/Makefile
+++ b/net/p5-Frontier-RPC/Makefile
@@ -17,8 +17,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ijliao@FreeBSD.org
COMMENT= Frontier::RPC implements UserLand Software's XML RPC
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
PERL_CONFIGURE= yes
diff --git a/net/p5-Frontier-RPC/pkg-plist b/net/p5-Frontier-RPC/pkg-plist
index d802816a7fc9..cd7f59f2e05a 100644
--- a/net/p5-Frontier-RPC/pkg-plist
+++ b/net/p5-Frontier-RPC/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Frontier/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Frontier/Daemon.pm
-lib/perl5/site_perl/%%PERL_VER%%/Frontier/RPC2.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Frontier
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Frontier/RPC/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Frontier/RPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Frontier
+%%SITE_PERL%%/Frontier/Client.pm
+%%SITE_PERL%%/Frontier/Daemon.pm
+%%SITE_PERL%%/Frontier/RPC2.pm
+@dirrm %%SITE_PERL%%/Frontier
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier/RPC/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier/RPC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier
diff --git a/net/p5-IO-INET6/Makefile b/net/p5-IO-INET6/Makefile
index b2bad846c7af..fa80567e33a9 100644
--- a/net/p5-IO-INET6/Makefile
+++ b/net/p5-IO-INET6/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-IO-
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Perl module with object interface to AF_INET6 domain sockets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
RUN_DEPENDS= ${BUILD_DEPENDS}
MAN3= IO::Socket::INET6.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERL_CONFIGURE= yes
diff --git a/net/p5-IO-INET6/pkg-plist b/net/p5-IO-INET6/pkg-plist
index 5fd1608e1a71..c55dad737f54 100644
--- a/net/p5-IO-INET6/pkg-plist
+++ b/net/p5-IO-INET6/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/IO/Socket/INET6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
+%%SITE_PERL%%/IO/Socket/INET6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
diff --git a/net/p5-IO-Interface/Makefile b/net/p5-IO-Interface/Makefile
index 981b4f427ead..de827b579665 100644
--- a/net/p5-IO-Interface/Makefile
+++ b/net/p5-IO-Interface/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for access to network card configuration information
PERL_CONFIGURE= yes
MAN3= IO::Interface.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-IO-Interface/pkg-plist b/net/p5-IO-Interface/pkg-plist
index 57a092cf7714..26670440e552 100644
--- a/net/p5-IO-Interface/pkg-plist
+++ b/net/p5-IO-Interface/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Interface.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface
-@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
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Interface.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface
+@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
diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile
index b2bad846c7af..fa80567e33a9 100644
--- a/net/p5-IO-Socket-INET6/Makefile
+++ b/net/p5-IO-Socket-INET6/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-IO-
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Perl module with object interface to AF_INET6 domain sockets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
RUN_DEPENDS= ${BUILD_DEPENDS}
MAN3= IO::Socket::INET6.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERL_CONFIGURE= yes
diff --git a/net/p5-IO-Socket-INET6/pkg-plist b/net/p5-IO-Socket-INET6/pkg-plist
index 5fd1608e1a71..c55dad737f54 100644
--- a/net/p5-IO-Socket-INET6/pkg-plist
+++ b/net/p5-IO-Socket-INET6/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/IO/Socket/INET6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
+%%SITE_PERL%%/IO/Socket/INET6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index f4d096ea8db4..37fb1ed4f15e 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= janos.mohacsi@dante.org.uk
COMMENT= Perl module to send and receive multicast messages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO/Interface.pm:${PORTSDIR}/net/p5-IO-Interface
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO/Interface.pm:${PORTSDIR}/net/p5-IO-Interface
RUN_DEPENDS= ${BUILD_DEPENDS}
MAN3= IO::Socket::Multicast.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERL_CONFIGURE= yes
diff --git a/net/p5-IO-Socket-Multicast/pkg-plist b/net/p5-IO-Socket-Multicast/pkg-plist
index 3fb905b3f4dd..af311518a705 100644
--- a/net/p5-IO-Socket-Multicast/pkg-plist
+++ b/net/p5-IO-Socket-Multicast/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket/Multicast.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket/Multicast.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
diff --git a/net/p5-JUNOScript/Makefile b/net/p5-JUNOScript/Makefile
index e25502cd08d2..ba2f8c24f81f 100644
--- a/net/p5-JUNOScript/Makefile
+++ b/net/p5-JUNOScript/Makefile
@@ -18,7 +18,7 @@ DISTNAME= junoscript-perl-${PORTVERSION}-domestic
MAINTAINER= jesper@FreeBSD.org
COMMENT= API to exchange information with Juniper Networks routers
-PERL_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_BASE= ${SITE_PERL}
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 \
xml2:${PORTSDIR}/textproc/libxml2 \
xslt:${PORTSDIR}/textproc/libxslt
@@ -69,7 +69,6 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/junoscript-perl-${PORTVERSION}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= JUNOS::Access.3 \
JUNOS::Access::stubs.3 \
JUNOS::Access::ssl.3 \
diff --git a/net/p5-JUNOScript/pkg-plist b/net/p5-JUNOScript/pkg-plist
index 4dd8d09e06a4..0bdc37ffe4cc 100644
--- a/net/p5-JUNOScript/pkg-plist
+++ b/net/p5-JUNOScript/pkg-plist
@@ -1,21 +1,21 @@
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/stubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/ssl.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/xnm.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/clear_text.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/telnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/rsh.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/ssh.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jroute_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jcrypto_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jkernel_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Methods.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/DOM/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/version.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Response.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Trace.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Device.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/DOM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS
+%%SITE_PERL%%/JUNOS/Access/stubs.pm
+%%SITE_PERL%%/JUNOS/Access/ssl.pm
+%%SITE_PERL%%/JUNOS/Access/xnm.pm
+%%SITE_PERL%%/JUNOS/Access/clear_text.pm
+%%SITE_PERL%%/JUNOS/Access/telnet.pm
+%%SITE_PERL%%/JUNOS/Access/rsh.pm
+%%SITE_PERL%%/JUNOS/Access/ssh.pm
+%%SITE_PERL%%/JUNOS/Access.pm
+%%SITE_PERL%%/JUNOS/5.3R2/jroute_methods.pl
+%%SITE_PERL%%/JUNOS/5.3R2/jcrypto_methods.pl
+%%SITE_PERL%%/JUNOS/5.3R2/jkernel_methods.pl
+%%SITE_PERL%%/JUNOS/Methods.pm
+%%SITE_PERL%%/JUNOS/DOM/Parser.pm
+%%SITE_PERL%%/JUNOS/version.pm
+%%SITE_PERL%%/JUNOS/Response.pm
+%%SITE_PERL%%/JUNOS/Trace.pm
+%%SITE_PERL%%/JUNOS/Device.pm
+@dirrm %%SITE_PERL%%/JUNOS/5.3R2
+@dirrm %%SITE_PERL%%/JUNOS/Access
+@dirrm %%SITE_PERL%%/JUNOS/DOM
+@dirrm %%SITE_PERL%%/JUNOS
diff --git a/net/p5-Jabber-Connection/Makefile b/net/p5-Jabber-Connection/Makefile
index 46bbb62aee01..9ec50086bc62 100644
--- a/net/p5-Jabber-Connection/Makefile
+++ b/net/p5-Jabber-Connection/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Jabber::Connection.3 Jabber::NS.3 Jabber::NodeFactory.3
.include <bsd.port.mk>
diff --git a/net/p5-Mon/Makefile b/net/p5-Mon/Makefile
index 6c894c62f4ee..08fd4f743ca2 100644
--- a/net/p5-Mon/Makefile
+++ b/net/p5-Mon/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl module that supports mon, a network and system monitoring daemon
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mon::SNMP.3 \
Mon::Client.3 \
Mon::Protocol.3
diff --git a/net/p5-Mon/pkg-plist b/net/p5-Mon/pkg-plist
index 2ecd0782ab22..1e891925646e 100644
--- a/net/p5-Mon/pkg-plist
+++ b/net/p5-Mon/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mon/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mon/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mon/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mon/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mon
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mon
+%%SITE_PERL%%/Mon/SNMP.pm
+%%SITE_PERL%%/Mon/Client.pm
+%%SITE_PERL%%/Mon/Protocol.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon
+@dirrm %%SITE_PERL%%/Mon
diff --git a/net/p5-Net-AIM/pkg-plist b/net/p5-Net-AIM/pkg-plist
index 056829109de0..3bb9b194db29 100644
--- a/net/p5-Net-AIM/pkg-plist
+++ b/net/p5-Net-AIM/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM/Connection.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM/Event.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/AIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/AIM.pm
+%%SITE_PERL%%/Net/AIM/Connection.pm
+%%SITE_PERL%%/Net/AIM/Event.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Net/AIM
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-AOLIM/Makefile b/net/p5-Net-AOLIM/Makefile
index 8717d920b9c0..23d7033dd28c 100644
--- a/net/p5-Net-AOLIM/Makefile
+++ b/net/p5-Net-AOLIM/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN3= Net::AOLIM.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-AOLIM/pkg-plist b/net/p5-Net-AOLIM/pkg-plist
index 0fa005304ffe..a77414bb513f 100644
--- a/net/p5-Net-AOLIM/pkg-plist
+++ b/net/p5-Net-AOLIM/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/AOLIM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/example.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AOLIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/AOLIM.pm
+%%SITE_PERL%%/Net/example.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-CIDR/Makefile b/net/p5-Net-CIDR/Makefile
index 0b15ece4220a..343b90023a03 100644
--- a/net/p5-Net-CIDR/Makefile
+++ b/net/p5-Net-CIDR/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to manipulate IPv4/IPv6 netblocks in CIDR notation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::CIDR.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-CIDR/pkg-plist b/net/p5-Net-CIDR/pkg-plist
index 63df1a085536..cb70ad77e5a0 100644
--- a/net/p5-Net-CIDR/pkg-plist
+++ b/net/p5-Net-CIDR/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/CIDR.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/CIDR
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/CIDR.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-DLookup/Makefile b/net/p5-Net-DLookup/Makefile
index 98b948a27787..9e1ba19d305f 100644
--- a/net/p5-Net-DLookup/Makefile
+++ b/net/p5-Net-DLookup/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perform domain lookups on 2-letter and 3-letter TLDs
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::DLookup.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-DLookup/pkg-plist b/net/p5-Net-DLookup/pkg-plist
index b405599834c4..b8c7bbff12c2 100644
--- a/net/p5-Net-DLookup/pkg-plist
+++ b/net/p5-Net-DLookup/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/DLookup.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/DLookup/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/DLookup 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/DLookup.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index 1cce82651fa8..3d1bdcbfdbac 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 extension for portable daemons
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Daemon.3 \
Net::Daemon::Log.3 \
Net::Daemon::Test.3
diff --git a/net/p5-Net-Divert/Makefile b/net/p5-Net-Divert/Makefile
index 19a9d4c30bdd..61c433b28660 100644
--- a/net/p5-Net-Divert/Makefile
+++ b/net/p5-Net-Divert/Makefile
@@ -17,7 +17,6 @@ COMMENT= A module to deal with divert(4) sockets
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Divert.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Divert/pkg-plist b/net/p5-Net-Divert/pkg-plist
index 59b8ffc44dec..2c12b2593ad8 100644
--- a/net/p5-Net-Divert/pkg-plist
+++ b/net/p5-Net-Divert/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Divert.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Divert/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Divert/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Divert
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Divert
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Divert.pm
+%%SITE_PERL%%/auto/Net/Divert/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Divert/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Divert
+@dirrm %%SITE_PERL%%/auto/Net/Divert
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-ICQ2000/Makefile b/net/p5-Net-ICQ2000/Makefile
index 880b7cffddd6..04d0e030febc 100644
--- a/net/p5-Net-ICQ2000/Makefile
+++ b/net/p5-Net-ICQ2000/Makefile
@@ -16,7 +16,6 @@ COMMENT= A perl5 module for ICQv7 protocol realisation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::ICQ2000.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-ICQ2000/pkg-plist b/net/p5-Net-ICQ2000/pkg-plist
index ee89d17f1a35..c12fde127c95 100644
--- a/net/p5-Net-ICQ2000/pkg-plist
+++ b/net/p5-Net-ICQ2000/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/ICQ2000.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ICQ2000
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2> /dev/null || true
+%%SITE_PERL%%/Net/ICQ2000.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true
diff --git a/net/p5-Net-IPv4Addr/pkg-plist b/net/p5-Net-IPv4Addr/pkg-plist
index 0a3f254d4f64..44e353284e09 100644
--- a/net/p5-Net-IPv4Addr/pkg-plist
+++ b/net/p5-Net-IPv4Addr/pkg-plist
@@ -1,9 +1,9 @@
bin/ipv4calc
-lib/perl5/site_perl/%%PERL_VER%%/Net/IPv4Addr.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/IPv4Addr.pm
+%%SITE_PERL%%/auto/Net/IPv4Addr/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
+@dirrm %%SITE_PERL%%/auto/Net/IPv4Addr
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-IPv6Addr/Makefile b/net/p5-Net-IPv6Addr/Makefile
index 4fcf1c77ddce..5e3d57a5d4f3 100644
--- a/net/p5-Net-IPv6Addr/Makefile
+++ b/net/p5-Net-IPv6Addr/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jj@nttmcl.com
COMMENT= Perl extension for manipulating IPv6 addresses
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/IPv4Addr.pm:${PORTSDIR}/net/p5-Net-IPv4Addr \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Math/Base85.pm:${PORTSDIR}/math/p5-Math-Base85
+BUILD_DEPENDS= ${SITE_PERL}/Net/IPv4Addr.pm:${PORTSDIR}/net/p5-Net-IPv4Addr \
+ ${SITE_PERL}/Math/Base85.pm:${PORTSDIR}/math/p5-Math-Base85
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/net/p5-Net-IPv6Addr/pkg-plist b/net/p5-Net-IPv6Addr/pkg-plist
index 43f6d919b7a7..a572beffdd37 100644
--- a/net/p5-Net-IPv6Addr/pkg-plist
+++ b/net/p5-Net-IPv6Addr/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/IPv6Addr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/IPv6Addr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Jabber/Makefile b/net/p5-Net-Jabber/Makefile
index 2bd47716063e..456a5b8ece8a 100644
--- a/net/p5-Net-Jabber/Makefile
+++ b/net/p5-Net-Jabber/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Net::Jabber provide a Perl Developer access to the Jabber protocol
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules
+BUILD_DEPENDS= ${SITE_PERL}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
+ ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
+ ${SITE_PERL}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Jabber.3 Net::Jabber::Client.3 Net::Jabber::Component.3 \
Net::Jabber::Data.3 Net::Jabber::Debug.3 \
Net::Jabber::Dialback.3 Net::Jabber::Dialback::Result.3 \
diff --git a/net/p5-Net-Jabber/pkg-plist b/net/p5-Net-Jabber/pkg-plist
index 3c91235f8800..4ceae39c3b94 100644
--- a/net/p5-Net-Jabber/pkg-plist
+++ b/net/p5-Net-Jabber/pkg-plist
@@ -1,26 +1,26 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Component.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Result.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Verify.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/IQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/JID.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Key.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Namespaces.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Presence.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/XDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Jabber.pm
+%%SITE_PERL%%/Net/Jabber/Client.pm
+%%SITE_PERL%%/Net/Jabber/Component.pm
+%%SITE_PERL%%/Net/Jabber/Data.pm
+%%SITE_PERL%%/Net/Jabber/Debug.pm
+%%SITE_PERL%%/Net/Jabber/Dialback.pm
+%%SITE_PERL%%/Net/Jabber/Dialback/Result.pm
+%%SITE_PERL%%/Net/Jabber/Dialback/Verify.pm
+%%SITE_PERL%%/Net/Jabber/IQ.pm
+%%SITE_PERL%%/Net/Jabber/JID.pm
+%%SITE_PERL%%/Net/Jabber/Key.pm
+%%SITE_PERL%%/Net/Jabber/Log.pm
+%%SITE_PERL%%/Net/Jabber/Message.pm
+%%SITE_PERL%%/Net/Jabber/Namespaces.pm
+%%SITE_PERL%%/Net/Jabber/Presence.pm
+%%SITE_PERL%%/Net/Jabber/Protocol.pm
+%%SITE_PERL%%/Net/Jabber/Query.pm
+%%SITE_PERL%%/Net/Jabber/Server.pm
+%%SITE_PERL%%/Net/Jabber/X.pm
+%%SITE_PERL%%/Net/Jabber/XDB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber
+@dirrm %%SITE_PERL%%/Net/Jabber/Dialback
+@dirrm %%SITE_PERL%%/Net/Jabber
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Netmask/Makefile b/net/p5-Net-Netmask/Makefile
index ca105125cdcb..e3d4b16f9414 100644
--- a/net/p5-Net-Netmask/Makefile
+++ b/net/p5-Net-Netmask/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to parse, manipulate and lookup IP network blocks
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Netmask.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Netmask/pkg-plist b/net/p5-Net-Netmask/pkg-plist
index 6a04e9c5fa62..99bfc80a6892 100644
--- a/net/p5-Net-Netmask/pkg-plist
+++ b/net/p5-Net-Netmask/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Netmask.pod
+%%SITE_PERL%%/Net/Netmask.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-ParseWhois/Makefile b/net/p5-Net-ParseWhois/Makefile
index b7e023b9cec4..8b1a755f67e2 100644
--- a/net/p5-Net-ParseWhois/Makefile
+++ b/net/p5-Net-ParseWhois/Makefile
@@ -17,7 +17,6 @@ COMMENT= Extendable perl5 module for parsing whois information
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::ParseWhois.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-ParseWhois/pkg-plist b/net/p5-Net-ParseWhois/pkg-plist
index 043b973fbf7a..263a943d2e11 100644
--- a/net/p5-Net-ParseWhois/pkg-plist
+++ b/net/p5-Net-ParseWhois/pkg-plist
@@ -1,22 +1,22 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/BulkRegister.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/CoreNic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/DomainBank.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/DomainDiscover.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Dotster.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Easyspace.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/INameWW.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Netsol.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/OpenSRS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Register.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Registrars.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Unknown.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ParseWhois/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ParseWhois
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/ParseWhois.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/BulkRegister.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/CoreNic.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/DomainBank.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/DomainDiscover.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Dotster.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Easyspace.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/INameWW.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Netsol.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/OpenSRS.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Register.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Registrars.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Unknown.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar
+@dirrm %%SITE_PERL%%/Net/ParseWhois/Domain
+@dirrm %%SITE_PERL%%/Net/ParseWhois
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Patricia/pkg-plist b/net/p5-Net-Patricia/pkg-plist
index 890c195a76a6..2b97bb53b1a8 100644
--- a/net/p5-Net-Patricia/pkg-plist
+++ b/net/p5-Net-Patricia/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Patricia.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Patricia.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index 7f94a4fc1344..f26a7fa63362 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -17,7 +17,6 @@ COMMENT= Interface to pcap(3) LBL packet capture library
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Pcap.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Pcap/pkg-plist b/net/p5-Net-Pcap/pkg-plist
index b3783c3972d6..42a04751efcf 100644
--- a/net/p5-Net-Pcap/pkg-plist
+++ b/net/p5-Net-Pcap/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Pcap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Pcap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Pcap
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Pcap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile
index 16688a073f2a..65d4405c655d 100644
--- a/net/p5-Net-Radius/Makefile
+++ b/net/p5-Net-Radius/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kbyanc@FreeBSD.org
COMMENT= A perl module to manipulate RADIUS packets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Net::Radius::Dictionary.3 Net::Radius::Packet.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-extract:
find ${WRKDIR} -type f | xargs perl -pi -e "s:\r::g"
diff --git a/net/p5-Net-Radius/pkg-plist b/net/p5-Net-Radius/pkg-plist
index 3ffb5da26ba6..0312e0a35440 100644
--- a/net/p5-Net-Radius/pkg-plist
+++ b/net/p5-Net-Radius/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Radius/Dictionary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Radius/Packet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Radius/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Radius
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Radius
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Radius/Dictionary.pm
+%%SITE_PERL%%/Net/Radius/Packet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius/.packlist
+@dirrm %%SITE_PERL%%/Net/Radius
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-RawIP/Makefile b/net/p5-Net-RawIP/Makefile
index 044b86844b25..45103526c433 100644
--- a/net/p5-Net-RawIP/Makefile
+++ b/net/p5-Net-RawIP/Makefile
@@ -19,6 +19,5 @@ COMMENT= A perl module to manipulate raw IP packets
PERL_CONFIGURE= yes
MAN3= Net::RawIP.3 Net::RawIP::libpcap.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-RawIP/pkg-plist b/net/p5-Net-RawIP/pkg-plist
index 788fc61c2d50..4e9ecf499d10 100644
--- a/net/p5-Net-RawIP/pkg-plist
+++ b/net/p5-Net-RawIP/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/RawIP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/RawIP/libpcap.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/RawIP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/libpcap.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-RawSock/Makefile b/net/p5-Net-RawSock/Makefile
index c844d2c50804..12da0db3c598 100644
--- a/net/p5-Net-RawSock/Makefile
+++ b/net/p5-Net-RawSock/Makefile
@@ -15,7 +15,6 @@ COMMENT= Net::RawSock provides a base function to send raw IP packets from Perl
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::RawSock.3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net/p5-Net-RawSock/pkg-plist b/net/p5-Net-RawSock/pkg-plist
index 1ef91ba6d77e..a3aec16ca2f4 100644
--- a/net/p5-Net-RawSock/pkg-plist
+++ b/net/p5-Net-RawSock/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/RawSock.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawSock/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.bs
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawSock/ 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawSock.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.bs
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/ 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
%%PORTDOCS%%share/doc/p5-Net-RawSock/README
diff --git a/net/p5-Net-SCP/Makefile b/net/p5-Net-SCP/Makefile
index 4f5915d4c65c..677136898bba 100644
--- a/net/p5-Net-SCP/Makefile
+++ b/net/p5-Net-SCP/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erich@tacni.net
COMMENT= Perl5 module to access and use scp protocol
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SSH.pm:${PORTSDIR}/net/p5-Net-SSH \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS= ${SITE_PERL}/Net/SSH.pm:${PORTSDIR}/net/p5-Net-SSH \
+ ${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Net::SCP.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-SCP/pkg-plist b/net/p5-Net-SCP/pkg-plist
index a51250e56234..2b1aeb85092a 100644
--- a/net/p5-Net-SCP/pkg-plist
+++ b/net/p5-Net-SCP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SCP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SCP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/SCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-SMPP/Makefile b/net/p5-Net-SMPP/Makefile
index 0acf83217e0d..5b3c9498d7e8 100644
--- a/net/p5-Net-SMPP/Makefile
+++ b/net/p5-Net-SMPP/Makefile
@@ -17,7 +17,6 @@ COMMENT= Net::SMPP - pure Perl implementation of SMPP 3.4 over TCP
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::SMPP.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-SMPP/pkg-plist b/net/p5-Net-SMPP/pkg-plist
index 31e26f6e6cad..e58ebb46e4c1 100644
--- a/net/p5-Net-SMPP/pkg-plist
+++ b/net/p5-Net-SMPP/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMPP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/smsc.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/sendmessage.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/esme-rec.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/esme-hammer.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/SMPP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/esme.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/bind-hammer.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMPP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMPP/.packlist
+%%SITE_PERL%%/Net/smsc.pl
+%%SITE_PERL%%/Net/sendmessage.pl
+%%SITE_PERL%%/Net/esme-rec.pl
+%%SITE_PERL%%/Net/esme-hammer.pl
+%%SITE_PERL%%/Net/SMPP.pm
+%%SITE_PERL%%/Net/esme.pl
+%%SITE_PERL%%/Net/bind-hammer.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMPP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-SNPP/Makefile b/net/p5-Net-SNPP/Makefile
index 31cd5e1decbe..44caffa5cbd4 100644
--- a/net/p5-Net-SNPP/Makefile
+++ b/net/p5-Net-SNPP/Makefile
@@ -29,7 +29,7 @@ post-patch:
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS= ${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net
RUN_DEPENDS= ${BUILD_DEPENDS}
.endif
diff --git a/net/p5-Net-SNPP/pkg-plist b/net/p5-Net-SNPP/pkg-plist
index 88a726efca91..1895e2aa4057 100644
--- a/net/p5-Net-SNPP/pkg-plist
+++ b/net/p5-Net-SNPP/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SNPP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP/HylaFAX.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SNPP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNPP/.packlist
+%%SITE_PERL%%/Net/SNPP.pm
+%%SITE_PERL%%/Net/SNPP/Server.pm
+%%SITE_PERL%%/Net/SNPP/HylaFAX.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNPP
+@dirrm %%SITE_PERL%%/Net/SNPP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index cf1ea6564333..fe184e1bc43a 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -17,7 +17,7 @@ COMMENT= Perl5 module implements both the SSH1 and SSH2 protocols
NO_PACKAGE= "Runaway package build"
-PERL_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_BASE= ${SITE_PERL}
BUILD_DEPENDS= ${PERL_BASE}/Crypt/DSA.pm:${PORTSDIR}/security/p5-Crypt-DSA \
${PERL_BASE}/Crypt/DH.pm:${PORTSDIR}/security/p5-Crypt-DH \
${PERL_BASE}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
@@ -38,7 +38,6 @@ FETCH_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::SSH::Perl::Constants.3 \
Net::SSH::Perl::Util.3 \
Net::SSH::Perl::ChannelMgr.3 \
diff --git a/net/p5-Net-SSH-Perl/pkg-plist b/net/p5-Net-SSH-Perl/pkg-plist
index 3425a9e3cf1a..4191f1c6cdd2 100644
--- a/net/p5-Net-SSH-Perl/pkg-plist
+++ b/net/p5-Net-SSH-Perl/pkg-plist
@@ -1,55 +1,55 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle/SSH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle/SSH2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Hosts.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Authfile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Term.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH2MP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH1Misc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH1MP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/SSH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/ChannelMgr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Rhosts.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/KeyboardInt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/PublicKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Rhosts_RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/ChallengeResponse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Password.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/DES.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/RC4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/IDEA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/Blowfish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/CFB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/DES3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/RSA1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/DSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex/DH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Buffer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/SSH2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp/Zlib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/AuthMgr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Packet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Channel.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH
+%%SITE_PERL%%/Net/SSH/Perl/Handle/SSH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Handle/SSH2.pm
+%%SITE_PERL%%/Net/SSH/Perl/Constants.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Hosts.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Authfile.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Term.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH2MP.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH1Misc.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH1MP.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util.pm
+%%SITE_PERL%%/Net/SSH/Perl/SSH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/ChannelMgr.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Rhosts.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/KeyboardInt.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/PublicKey.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Rhosts_RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/ChallengeResponse.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Password.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/DES.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/CBC.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/RC4.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/IDEA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/Blowfish.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/CFB.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/DES3.pm
+%%SITE_PERL%%/Net/SSH/Perl/Kex.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/RSA1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/DSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Comp.pm
+%%SITE_PERL%%/Net/SSH/Perl/Mac.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth.pm
+%%SITE_PERL%%/Net/SSH/Perl/Kex/DH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Buffer.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher.pm
+%%SITE_PERL%%/Net/SSH/Perl/SSH2.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key.pm
+%%SITE_PERL%%/Net/SSH/Perl/Comp/Zlib.pm
+%%SITE_PERL%%/Net/SSH/Perl/Agent.pm
+%%SITE_PERL%%/Net/SSH/Perl/Config.pm
+%%SITE_PERL%%/Net/SSH/Perl/AuthMgr.pm
+%%SITE_PERL%%/Net/SSH/Perl/Packet.pm
+%%SITE_PERL%%/Net/SSH/Perl/Channel.pm
+%%SITE_PERL%%/Net/SSH/Perl.pm
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Handle
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Util
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Auth
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Cipher
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Key
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Kex
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Comp
+@dirrm %%SITE_PERL%%/Net/SSH/Perl
+@dirrm %%SITE_PERL%%/Net/SSH
diff --git a/net/p5-Net-SSH/Makefile b/net/p5-Net-SSH/Makefile
index 179967b31e8e..a7de46ae9cdd 100644
--- a/net/p5-Net-SSH/Makefile
+++ b/net/p5-Net-SSH/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to access and use ssh protocol
PERL_CONFIGURE= yes
MAN3= Net::SSH.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-SSH/pkg-plist b/net/p5-Net-SSH/pkg-plist
index c5ada57b9b57..c7494f0c65e6 100644
--- a/net/p5-Net-SSH/pkg-plist
+++ b/net/p5-Net-SSH/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSH/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSH
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/SSH.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 7de5dce499ce..1667c5aab7cd 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -18,7 +18,6 @@ COMMENT= A configurable base class for writing internet servers in Perl
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Server.3 \
Net::Server::Daemonize.3\
Net::Server::Fork.3 \
diff --git a/net/p5-Net-Server/pkg-plist b/net/p5-Net-Server/pkg-plist
index 3c8ed0c280a4..222e9f284fdd 100644
--- a/net/p5-Net-Server/pkg-plist
+++ b/net/p5-Net-Server/pkg-plist
@@ -1,21 +1,21 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Daemonize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Fork.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/INET.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/MultiType.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Multiplex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/PreFork.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/PreForkSimple.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto/SSL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto/UDP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto/UNIX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/SIG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Single.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Server/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Server.pm
+%%SITE_PERL%%/Net/Server/Daemonize.pm
+%%SITE_PERL%%/Net/Server/Fork.pm
+%%SITE_PERL%%/Net/Server/INET.pm
+%%SITE_PERL%%/Net/Server/MultiType.pm
+%%SITE_PERL%%/Net/Server/Multiplex.pm
+%%SITE_PERL%%/Net/Server/PreFork.pm
+%%SITE_PERL%%/Net/Server/PreForkSimple.pm
+%%SITE_PERL%%/Net/Server/Proto.pm
+%%SITE_PERL%%/Net/Server/Proto/SSL.pm
+%%SITE_PERL%%/Net/Server/Proto/TCP.pm
+%%SITE_PERL%%/Net/Server/Proto/UDP.pm
+%%SITE_PERL%%/Net/Server/Proto/UNIX.pm
+%%SITE_PERL%%/Net/Server/SIG.pm
+%%SITE_PERL%%/Net/Server/Single.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Net/Server/Proto
+@dirrm %%SITE_PERL%%/Net/Server
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Services/Makefile b/net/p5-Net-Services/Makefile
index 0e7e32310d89..4425e08b80e4 100644
--- a/net/p5-Net-Services/Makefile
+++ b/net/p5-Net-Services/Makefile
@@ -17,7 +17,6 @@ COMMENT= Provides a tied interface to the /etc/services file
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Services.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Services/pkg-plist b/net/p5-Net-Services/pkg-plist
index c2f7c61b1957..f868261143b3 100644
--- a/net/p5-Net-Services/pkg-plist
+++ b/net/p5-Net-Services/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Services.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Services/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Services
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Services.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Services/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Services
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index e691e26fbd3c..3682df84807b 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to access and use telnet protocol
PERL_CONFIGURE= yes
MAN3= Net::Telnet.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-Telnet/pkg-plist b/net/p5-Net-Telnet/pkg-plist
index 2d2c8b096731..6dd1cfd55f80 100644
--- a/net/p5-Net-Telnet/pkg-plist
+++ b/net/p5-Net-Telnet/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Telnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Telnet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Traceroute/Makefile b/net/p5-Net-Traceroute/Makefile
index feff71b27fec..42f658cfdd5b 100644
--- a/net/p5-Net-Traceroute/Makefile
+++ b/net/p5-Net-Traceroute/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to parse traceroute(8)
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Traceroute.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Traceroute/pkg-plist b/net/p5-Net-Traceroute/pkg-plist
index 39a27befc5f5..16b451b78c4e 100644
--- a/net/p5-Net-Traceroute/pkg-plist
+++ b/net/p5-Net-Traceroute/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Traceroute.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Traceroute/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Traceroute
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Traceroute.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Traceroute6/Makefile b/net/p5-Net-Traceroute6/Makefile
index d309c18bac09..7c590eaf47ab 100644
--- a/net/p5-Net-Traceroute6/Makefile
+++ b/net/p5-Net-Traceroute6/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to parse traceroute6(8) output
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Traceroute6.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Traceroute6/pkg-plist b/net/p5-Net-Traceroute6/pkg-plist
index 3b71151261df..2c1eac3fcbe4 100644
--- a/net/p5-Net-Traceroute6/pkg-plist
+++ b/net/p5-Net-Traceroute6/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Traceroute6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Traceroute6/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Traceroute6
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Traceroute6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Wake/Makefile b/net/p5-Net-Wake/Makefile
index f5ba7f5812e5..8f095f0b8959 100644
--- a/net/p5-Net-Wake/Makefile
+++ b/net/p5-Net-Wake/Makefile
@@ -17,7 +17,6 @@ COMMENT= Send Wake On Lan (WOL) packets to power on computers
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Wake.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Wake/pkg-plist b/net/p5-Net-Wake/pkg-plist
index f7a2486892f7..16b211c5a758 100644
--- a/net/p5-Net-Wake/pkg-plist
+++ b/net/p5-Net-Wake/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Wake.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Wake/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Wake
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Wake.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index 278409923eb3..214f7854567c 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -16,11 +16,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mich@FreeBSD.org
COMMENT= Implementation of RIPE Whois
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Whois::RIPE::Iterator.3 \
Net::Whois::RIPE::Object.3 \
Net::Whois::RIPE.3
diff --git a/net/p5-Net-Whois-RIPE/pkg-plist b/net/p5-Net-Whois-RIPE/pkg-plist
index 76fc74303a2c..75ebfdd6d44e 100644
--- a/net/p5-Net-Whois-RIPE/pkg-plist
+++ b/net/p5-Net-Whois-RIPE/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Iterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Iterator.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Object.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Object/Template.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Object
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Whois/RIPE.pm
+%%SITE_PERL%%/Net/Whois/RIPE.pod
+%%SITE_PERL%%/Net/Whois/RIPE/Iterator.pm
+%%SITE_PERL%%/Net/Whois/RIPE/Iterator.pod
+%%SITE_PERL%%/Net/Whois/RIPE/Object.pm
+%%SITE_PERL%%/Net/Whois/RIPE/Object.pod
+%%SITE_PERL%%/Net/Whois/RIPE/Object/Template.pm
+@dirrm %%SITE_PERL%%/Net/Whois/RIPE/Object
+@dirrm %%SITE_PERL%%/Net/Whois/RIPE
+@unexec rmdir %D/%%SITE_PERL%%/Net/Whois 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Whois-Raw/pkg-plist b/net/p5-Net-Whois-Raw/pkg-plist
index 18bd79350b4d..91c8e0b802c5 100644
--- a/net/p5-Net-Whois-Raw/pkg-plist
+++ b/net/p5-Net-Whois-Raw/pkg-plist
@@ -1,8 +1,8 @@
bin/pwhois
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/Raw.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/Raw/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/Raw
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Whois/Raw.pm
+@unexec rmdir %D/%%SITE_PERL%%/Net/Whois 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index f751423b5966..4c7f7f0567ae 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= A perl5 module to get information using the Whois protocol
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Locale/Country.pm:${PORTSDIR}/misc/p5-Locale-Codes
+RUN_DEPENDS= ${SITE_PERL}/Locale/Country.pm:${PORTSDIR}/misc/p5-Locale-Codes
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Whois.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Whois/pkg-plist b/net/p5-Net-Whois/pkg-plist
index c2ce7c9d5ef3..508cac6a217a 100644
--- a/net/p5-Net-Whois/pkg-plist
+++ b/net/p5-Net-Whois/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Whois.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-XWhois/Makefile b/net/p5-Net-XWhois/Makefile
index bdb32f30e981..23870ceca27e 100644
--- a/net/p5-Net-XWhois/Makefile
+++ b/net/p5-Net-XWhois/Makefile
@@ -18,7 +18,6 @@ COMMENT= Whois Client Interface for Perl5
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::XWhois.3
post-patch:
diff --git a/net/p5-Net-Z3950-SimpleServer/Makefile b/net/p5-Net-Z3950-SimpleServer/Makefile
index d29b3087f59a..7131e55328f3 100644
--- a/net/p5-Net-Z3950-SimpleServer/Makefile
+++ b/net/p5-Net-Z3950-SimpleServer/Makefile
@@ -20,6 +20,5 @@ PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
MAN3= Net::Z3950::GRS1.3 Net::Z3950::SimpleServer.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-Z3950-SimpleServer/pkg-plist b/net/p5-Net-Z3950-SimpleServer/pkg-plist
index c1e2b7b9f1c1..863b7f202857 100644
--- a/net/p5-Net-Z3950-SimpleServer/pkg-plist
+++ b/net/p5-Net-Z3950-SimpleServer/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/GRS1.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/OID.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/SimpleServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/grs_test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/ztest.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/GRS1.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/OID.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/SimpleServer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/grs_test.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/ztest.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950
diff --git a/net/p5-Net-Z3950/Makefile b/net/p5-Net-Z3950/Makefile
index f1225e619f7f..e345c3aa3722 100644
--- a/net/p5-Net-Z3950/Makefile
+++ b/net/p5-Net-Z3950/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= A perl interface to the Z39.50 information retrieval protocol
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event
LIB_DEPENDS= yaz.2:${PORTSDIR}/net/yaz
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MARC.pm:${PORTSDIR}/textproc/p5-MARC \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event
+RUN_DEPENDS= ${SITE_PERL}/MARC.pm:${PORTSDIR}/textproc/p5-MARC \
+ ${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event
PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
@@ -25,6 +25,5 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
MAN3= Net::Z3950::ResultSet.3 Net::Z3950::Manager.3 \
Net::Z3950::Tutorial.3 Net::Z3950::Record.3 \
Net::Z3950::Connection.3 Net::Z3950::APDU.3 Net::Z3950.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-Z3950/pkg-plist b/net/p5-Net-Z3950/pkg-plist
index 121608361bf5..c3adeb614121 100644
--- a/net/p5-Net-Z3950/pkg-plist
+++ b/net/p5-Net-Z3950/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/Z3950.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/Z3950.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/APDU.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/Connection.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/Manager.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/Record.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/ResultSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/Tutorial.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/Z3950.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/Z3950.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/APDU.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/Connection.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/Manager.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/Record.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/ResultSet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/Tutorial.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-ext/Makefile b/net/p5-Net-ext/Makefile
index 770beb57f01b..2925f99f48c5 100644
--- a/net/p5-Net-ext/Makefile
+++ b/net/p5-Net-ext/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl modules for using sockets
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Gen.3 \
Net::Inet.3 \
Net::TCP.3 \
diff --git a/net/p5-Net-ext/pkg-plist b/net/p5-Net-ext/pkg-plist
index 83e157f66b21..a39dcbafd6f9 100644
--- a/net/p5-Net-ext/pkg-plist
+++ b/net/p5-Net-ext/pkg-plist
@@ -1,73 +1,73 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Gen.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Inet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UDP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/BINMODE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/EOF.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/FETCH.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/FILENO.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/GETC.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/PRINTF.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/READ.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/RECV.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/STORE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/TIEHANDLE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/TIESCALAR.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/WRITE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_findxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_getxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_setxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/accept.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/delparam.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/didlisten.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fcntl.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fhvec.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fileno.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_local_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_remote_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getfh.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getlines.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getropt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getsopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/ioctl.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/listen.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/new_from_fh.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/select.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/sendto.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setdebug.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setparam.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setropt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setsopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/unbind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/setdebug.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/unbind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/PRINT.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/_setbuf_unbuf.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/PRINT.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/_setbuf_unbuf.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Gen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Inet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UDP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/BINMODE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/EOF.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/FETCH.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/FILENO.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/GETC.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/PRINTF.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/READ.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/RECV.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/STORE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/TIEHANDLE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/TIESCALAR.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/WRITE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_findxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_getxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_setxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/accept.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/delparam.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/didlisten.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fcntl.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fhvec.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fileno.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_local_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_remote_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getfh.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getlines.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getropt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getsopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/ioctl.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/listen.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/new_from_fh.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/select.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/sendto.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setdebug.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setparam.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setropt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setsopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/unbind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/setdebug.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/unbind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/PRINT.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/_setbuf_unbuf.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/PRINT.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/_setbuf_unbuf.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index d8006e19dbc1..26d7f52f378b 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= NetAddr::IP::Count - Count hosts in named subnets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
+BUILD_DEPENDS= ${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= NetAddr::IP::Count.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-NetAddr-IP-Count/pkg-plist b/net/p5-NetAddr-IP-Count/pkg-plist
index 2fad3dc4890f..22e5c2b9bb50 100644
--- a/net/p5-NetAddr-IP-Count/pkg-plist
+++ b/net/p5-NetAddr-IP-Count/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP/sample.pl
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP/Count.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count/.packlist
+%%SITE_PERL%%/NetAddr/IP/sample.pl
+%%SITE_PERL%%/NetAddr/IP/Count.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count
+@unexec rmdir %D/%%SITE_PERL%%/NetAddr/IP 2>/dev/null || true
diff --git a/net/p5-NetAddr-IP/Makefile b/net/p5-NetAddr-IP/Makefile
index a9f654cf2744..bd2fae0e00e8 100644
--- a/net/p5-NetAddr-IP/Makefile
+++ b/net/p5-NetAddr-IP/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl module for working with IP addresses and blocks thereof
-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
diff --git a/net/p5-NetAddr-IP/pkg-plist b/net/p5-NetAddr-IP/pkg-plist
index 06ce8b14fa22..3b5b565fb485 100644
--- a/net/p5-NetAddr-IP/pkg-plist
+++ b/net/p5-NetAddr-IP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/NetAddr
+%%SITE_PERL%%/NetAddr/IP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
+@dirrm %%SITE_PERL%%/NetAddr
diff --git a/net/p5-NetPacket/Makefile b/net/p5-NetPacket/Makefile
index c79b7a95e892..5ef3bcad5b57 100644
--- a/net/p5-NetPacket/Makefile
+++ b/net/p5-NetPacket/Makefile
@@ -17,7 +17,6 @@ COMMENT= Modules to assemble/disassemble network packets at the protocol level
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= NetPacket::LACP.3 NetPacket::IGMP.3 NetPacket::IP.3 \
NetPacket::SpanningTree.3 NetPacket::LLC.3 NetPacket::ARP.3 \
NetPacket.3 NetPacket::UDP.3 NetPacket::Ethernet.3 \
diff --git a/net/p5-POE-Component-RRDTool/Makefile b/net/p5-POE-Component-RRDTool/Makefile
index 837deba5e469..a2f593ccdeb9 100644
--- a/net/p5-POE-Component-RRDTool/Makefile
+++ b/net/p5-POE-Component-RRDTool/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= POE interface to Round Robin Database Tools
-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 \
${LOCALBASE}/bin/rrdtool:${PORTSDIR}/net/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net/p5-POE-Component-RRDTool/pkg-plist b/net/p5-POE-Component-RRDTool/pkg-plist
index 975c5b42eda6..ae6853c7d35f 100644
--- a/net/p5-POE-Component-RRDTool/pkg-plist
+++ b/net/p5-POE-Component-RRDTool/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/RRDTool.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool
-@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
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist
+%%SITE_PERL%%/POE/Component/RRDTool.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool
+@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/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 0bbf0e053f3d..a8e5f46ad5cf 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
COMMENT= Perl module for writing RPC servers and clients
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Daemon.pm:${PORTSDIR}/net/p5-Net-Daemon
+BUILD_DEPENDS= ${SITE_PERL}/Net/Daemon.pm:${PORTSDIR}/net/p5-Net-Daemon
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -28,7 +28,7 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.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
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.endif
.include <bsd.port.post.mk>
diff --git a/net/p5-PlRPC/pkg-plist b/net/p5-PlRPC/pkg-plist
index 6dc4af700582..8dc629cd2e0d 100644
--- a/net/p5-PlRPC/pkg-plist
+++ b/net/p5-PlRPC/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/PlRPC.pm
-lib/perl5/site_perl/%%PERL_VER%%/RPC/PlClient.pm
-lib/perl5/site_perl/%%PERL_VER%%/RPC/PlServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/RPC/PlServer/Comm.pm
-lib/perl5/site_perl/%%PERL_VER%%/RPC/PlServer/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RPC/PlServer/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RPC/PlServer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RPC/PlServer
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/RPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RPC 2>/dev/null || true
+%%SITE_PERL%%/Bundle/PlRPC.pm
+%%SITE_PERL%%/RPC/PlClient.pm
+%%SITE_PERL%%/RPC/PlServer.pm
+%%SITE_PERL%%/RPC/PlServer/Comm.pm
+%%SITE_PERL%%/RPC/PlServer/Test.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/PlServer/.packlist
+@dirrm %%SITE_PERL%%/RPC/PlServer
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/PlServer
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/RPC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC 2>/dev/null || true
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
index bf53ac830809..ade5849823a7 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
@@ -16,13 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= A ResourcePool wrapper for Net::LDAP
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS= ${SITE_PERL}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool \
+ ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= ResourcePool::Resource::Net::LDAP.3 ResourcePool::Factory::Net::LDAP.3
.include <bsd.port.mk>
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
index c3b684b760b8..ea041a51d096 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net/LDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net/LDAP.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net/LDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net/LDAP.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP/.packlist
+%%SITE_PERL%%/ResourcePool/Resource/Net/LDAP.pm
+%%SITE_PERL%%/ResourcePool/Resource/Net/LDAP.pod
+%%SITE_PERL%%/ResourcePool/Factory/Net/LDAP.pm
+%%SITE_PERL%%/ResourcePool/Factory/Net/LDAP.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
+@dirrm %%SITE_PERL%%/ResourcePool/Resource/Net
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true
+@dirrm %%SITE_PERL%%/ResourcePool/Factory/Net
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
index ad9d5171e4a1..ea6c3f18473f 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
@@ -16,13 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= A ResourcePool wrapper for SOAP::Lite
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS= ${SITE_PERL}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool \
+ ${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= ResourcePool::Factory::SOAP::Lite.3 \
ResourcePool::Command::SOAP::Lite::Call.3
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
index de451c096ce2..9f8f9dda7819 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/SOAP/Lite/Call.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/SOAP/Lite/Call.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/SOAP/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/SOAP/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/SOAP/Lite.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/SOAP/Lite
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/SOAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/SOAP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/SOAP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite/.packlist
+%%SITE_PERL%%/ResourcePool/Command/SOAP/Lite/Call.pod
+%%SITE_PERL%%/ResourcePool/Command/SOAP/Lite/Call.pm
+%%SITE_PERL%%/ResourcePool/Resource/SOAP/Lite.pm
+%%SITE_PERL%%/ResourcePool/Factory/SOAP/Lite.pm
+%%SITE_PERL%%/ResourcePool/Factory/SOAP/Lite.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
+@dirrm %%SITE_PERL%%/ResourcePool/Command/SOAP/Lite
+@dirrm %%SITE_PERL%%/ResourcePool/Command/SOAP
+@dirrm %%SITE_PERL%%/ResourcePool/Resource/SOAP
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true
+@dirrm %%SITE_PERL%%/ResourcePool/Factory/SOAP
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true
diff --git a/net/p5-SNMP-MIB-Compiler/Makefile b/net/p5-SNMP-MIB-Compiler/Makefile
index f5a01f0cb517..8999b8efdd50 100644
--- a/net/p5-SNMP-MIB-Compiler/Makefile
+++ b/net/p5-SNMP-MIB-Compiler/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= marcus@FreeBSD.org
COMMENT= A Perl MIB compiler supporting both SMIv1 and SMIv2
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/Compare.pm:${PORTSDIR}/devel/p5-Data-Compare
+BUILD_DEPENDS= ${SITE_PERL}/Data/Compare.pm:${PORTSDIR}/devel/p5-Data-Compare
PERL_CONFIGURE= yes
diff --git a/net/p5-SNMP-MIB-Compiler/pkg-plist b/net/p5-SNMP-MIB-Compiler/pkg-plist
index 1dc69ce8baba..d5743b0f21f8 100644
--- a/net/p5-SNMP-MIB-Compiler/pkg-plist
+++ b/net/p5-SNMP-MIB-Compiler/pkg-plist
@@ -1,13 +1,13 @@
bin/mibbrowser
bin/mibcompiler
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/MIB/Compiler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP/MIB/Compiler.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+%%SITE_PERL%%/SNMP/MIB/Compiler.pm
+%%SITE_PERL%%/Bundle/SNMP/MIB/Compiler.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
+@dirrm %%SITE_PERL%%/SNMP/MIB
+@dirrm %%SITE_PERL%%/SNMP
+@dirrm %%SITE_PERL%%/Bundle/SNMP/MIB
+@dirrm %%SITE_PERL%%/Bundle/SNMP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
diff --git a/net/p5-SNMP-Util/Makefile b/net/p5-SNMP-Util/Makefile
index 4072c6530360..bfe7997ff7a3 100644
--- a/net/p5-SNMP-Util/Makefile
+++ b/net/p5-SNMP-Util/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= fenner@FreeBSD.org
COMMENT= Perl modules to perform SNMP set,get,walk,next,walk_hash etc
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
PERL_CONFIGURE= yes
MAN3= SNMP::Util.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-SNMP-Util/pkg-plist b/net/p5-SNMP-Util/pkg-plist
index 8d1bb8e92c43..45bd43f00781 100644
--- a/net/p5-SNMP-Util/pkg-plist
+++ b/net/p5-SNMP-Util/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/Util_env.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/Util/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP
+%%SITE_PERL%%/SNMP/Util.pm
+%%SITE_PERL%%/SNMP/Util_env.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util
+@dirrm %%SITE_PERL%%/SNMP
diff --git a/net/p5-SNMP/pkg-plist b/net/p5-SNMP/pkg-plist
index ab35e7ecaf97..44aead515a4d 100644
--- a/net/p5-SNMP/pkg-plist
+++ b/net/p5-SNMP/pkg-plist
@@ -1,7 +1,7 @@
lib/perl5/site_perl/README.SNMP
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP
+%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
diff --git a/net/p5-SNMP_Session/pkg-plist b/net/p5-SNMP_Session/pkg-plist
index 427fdd615c02..f2271d1b39be 100644
--- a/net/p5-SNMP_Session/pkg-plist
+++ b/net/p5-SNMP_Session/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/BER.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP_Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP_util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP_Session/.packlist
+%%SITE_PERL%%/BER.pm
+%%SITE_PERL%%/SNMP_Session.pm
+%%SITE_PERL%%/SNMP_util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session/.packlist
%%PORTDOCS%%share/doc/SNMP_Session/README
%%PORTDOCS%%share/doc/SNMP_Session/README.SNMP_util
%%PORTDOCS%%share/doc/SNMP_Session/index.html
%%PORTDOCS%%@dirrm share/doc/SNMP_Session
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP_Session
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index b49ce9229f28..6b05a8418973 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -15,12 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
COMMENT= SOAP::Lite - Client and server side SOAP implementation
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
+ ${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+ ${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/net/p5-SOAP-Lite/pkg-plist b/net/p5-SOAP-Lite/pkg-plist
index 20c83c82ab28..d537be594310 100644
--- a/net/p5-SOAP-Lite/pkg-plist
+++ b/net/p5-SOAP-Lite/pkg-plist
@@ -1,38 +1,38 @@
bin/SOAPsh.pl
bin/XMLRPCsh.pl
bin/stubmaker.pl
-lib/perl5/site_perl/%%PERL_VER%%/Apache/SOAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/XMLRPC/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/SessionData.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/SessionSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/FTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/IO.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/JABBER.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/LOCAL.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/MAILTO.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/MQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/POP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/UDDI/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Parser/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Transport/HTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Transport/POP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Transport/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP/Lite/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP/Lite
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/XMLRPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/UDDI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Transport
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XMLRPC
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SOAP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/Apache/SOAP.pm
+%%SITE_PERL%%/Apache/XMLRPC/Lite.pm
+%%SITE_PERL%%/IO/SessionData.pm
+%%SITE_PERL%%/IO/SessionSet.pm
+%%SITE_PERL%%/SOAP/Lite.pm
+%%SITE_PERL%%/SOAP/Test.pm
+%%SITE_PERL%%/SOAP/Transport/FTP.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP.pm
+%%SITE_PERL%%/SOAP/Transport/IO.pm
+%%SITE_PERL%%/SOAP/Transport/JABBER.pm
+%%SITE_PERL%%/SOAP/Transport/LOCAL.pm
+%%SITE_PERL%%/SOAP/Transport/MAILTO.pm
+%%SITE_PERL%%/SOAP/Transport/MQ.pm
+%%SITE_PERL%%/SOAP/Transport/POP3.pm
+%%SITE_PERL%%/SOAP/Transport/TCP.pm
+%%SITE_PERL%%/UDDI/Lite.pm
+%%SITE_PERL%%/XML/Parser/Lite.pm
+%%SITE_PERL%%/XMLRPC/Lite.pm
+%%SITE_PERL%%/XMLRPC/Test.pm
+%%SITE_PERL%%/XMLRPC/Transport/HTTP.pm
+%%SITE_PERL%%/XMLRPC/Transport/POP3.pm
+%%SITE_PERL%%/XMLRPC/Transport/TCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Apache/XMLRPC
+@dirrm %%SITE_PERL%%/SOAP/Transport
+@dirrm %%SITE_PERL%%/UDDI
+@dirrm %%SITE_PERL%%/XMLRPC/Transport
+@dirrm %%SITE_PERL%%/XMLRPC
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index 478b4ab968f8..998d6aeefcc9 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X
${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
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= SOAP.3 SOAP::SimpleTypeWrapper.3 SOAP::Parser.3 \
SOAP::EnvelopeMaker.3 SOAP::GenericScalarSerializer.3 \
SOAP::Transport::HTTP::Apache.3 SOAP::TypedPrimitiveSerializer.3 \
diff --git a/net/p5-SOAP/pkg-plist b/net/p5-SOAP/pkg-plist
index c6abac241524..65422beedb8b 100644
--- a/net/p5-SOAP/pkg-plist
+++ b/net/p5-SOAP/pkg-plist
@@ -1,27 +1,27 @@
-lib/perl5/site_perl/%%PERL_VER%%/SOAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Defs.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Envelope.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/EnvelopeMaker.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/GenericHashSerializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/GenericInputStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/GenericScalarSerializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/OutputStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Packager.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Serializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/SimpleTypeWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Struct.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/StructSerializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP/CGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/TypeMapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/TypedPrimitive.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/TypedPrimitiveSerializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SOAP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
+%%SITE_PERL%%/SOAP.pm
+%%SITE_PERL%%/SOAP/Defs.pm
+%%SITE_PERL%%/SOAP/Envelope.pm
+%%SITE_PERL%%/SOAP/EnvelopeMaker.pm
+%%SITE_PERL%%/SOAP/GenericHashSerializer.pm
+%%SITE_PERL%%/SOAP/GenericInputStream.pm
+%%SITE_PERL%%/SOAP/GenericScalarSerializer.pm
+%%SITE_PERL%%/SOAP/OutputStream.pm
+%%SITE_PERL%%/SOAP/Packager.pm
+%%SITE_PERL%%/SOAP/Parser.pm
+%%SITE_PERL%%/SOAP/Serializer.pm
+%%SITE_PERL%%/SOAP/SimpleTypeWrapper.pm
+%%SITE_PERL%%/SOAP/Struct.pm
+%%SITE_PERL%%/SOAP/StructSerializer.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP/Apache.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP/CGI.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP/Client.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP/Server.pm
+%%SITE_PERL%%/SOAP/TypeMapper.pm
+%%SITE_PERL%%/SOAP/TypedPrimitive.pm
+%%SITE_PERL%%/SOAP/TypedPrimitiveSerializer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
+@dirrm %%SITE_PERL%%/SOAP/Transport/HTTP
+@dirrm %%SITE_PERL%%/SOAP/Transport
+@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
diff --git a/net/p5-Socket6/pkg-plist b/net/p5-Socket6/pkg-plist
index 51cd5e3f22d9..01f8440ef22d 100644
--- a/net/p5-Socket6/pkg-plist
+++ b/net/p5-Socket6/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Socket6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket6/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket6/Socket6.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket6/Socket6.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket6
+%%SITE_PERL%%/%%PERL_ARCH%%/Socket6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6/Socket6.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6/Socket6.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 3b4162bb6076..6f5915aedc6b 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to communicate with socks v4 and v5 servers
PERL_CONFIGURE= yes
MAN3= Net::SOCKS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Socks/pkg-plist b/net/p5-Socks/pkg-plist
index 9989db8a57c4..b1c97b391aba 100644
--- a/net/p5-Socks/pkg-plist
+++ b/net/p5-Socks/pkg-plist
@@ -1,25 +1,25 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SOCKS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/SOCKS.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/accept.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/close.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/connect.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/new.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/param.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_connect.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_get_resp5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_get_response.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_import_args.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_method_request5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_method_response5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_request5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_request.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_user_request5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_user_response5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_validate.al
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SOCKS
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SOCKS/.packlist
+%%SITE_PERL%%/Net/SOCKS.pm
+%%SITE_PERL%%/auto/Net/SOCKS/accept.al
+%%SITE_PERL%%/auto/Net/SOCKS/autosplit.ix
+%%SITE_PERL%%/auto/Net/SOCKS/bind.al
+%%SITE_PERL%%/auto/Net/SOCKS/close.al
+%%SITE_PERL%%/auto/Net/SOCKS/connect.al
+%%SITE_PERL%%/auto/Net/SOCKS/new.al
+%%SITE_PERL%%/auto/Net/SOCKS/param.al
+%%SITE_PERL%%/auto/Net/SOCKS/_connect.al
+%%SITE_PERL%%/auto/Net/SOCKS/_get_resp5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_get_response.al
+%%SITE_PERL%%/auto/Net/SOCKS/_import_args.al
+%%SITE_PERL%%/auto/Net/SOCKS/_method_request5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_method_response5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_request5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_request.al
+%%SITE_PERL%%/auto/Net/SOCKS/_user_request5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_user_response5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_validate.al
+@dirrm %%SITE_PERL%%/auto/Net/SOCKS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SOCKS
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Spread-Session/Makefile b/net/p5-Spread-Session/Makefile
index 6a94d347b693..18206d151d1a 100644
--- a/net/p5-Spread-Session/Makefile
+++ b/net/p5-Spread-Session/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= joshua@roughtrade.net
COMMENT= Perl OO wrapper for Spread messaging toolkit
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Spread.pm:${PORTSDIR}/net/spread
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Spread.pm:${PORTSDIR}/net/spread
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Spread::Session.3
.include <bsd.port.mk>
diff --git a/net/p5-Spread-Session/pkg-plist b/net/p5-Spread-Session/pkg-plist
index 6fd057a70d8f..acb5bc782b78 100644
--- a/net/p5-Spread-Session/pkg-plist
+++ b/net/p5-Spread-Session/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Spread/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Session/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Session
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Spread 2>/dev/null || true
+%%SITE_PERL%%/Spread/Session.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Session/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Session
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Spread 2>/dev/null || true
diff --git a/net/p5-Telnet-Cisco/Makefile b/net/p5-Telnet-Cisco/Makefile
index 8d939273774e..b085d858b2b6 100644
--- a/net/p5-Telnet-Cisco/Makefile
+++ b/net/p5-Telnet-Cisco/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lyngbol@wheel.dk
COMMENT= Perl5 module to telnet to Cisco routers
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
+ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
+ ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Net::Telnet::Cisco.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Telnet-Cisco/pkg-plist b/net/p5-Telnet-Cisco/pkg-plist
index 9c5819955ccc..a47cbba36307 100644
--- a/net/p5-Telnet-Cisco/pkg-plist
+++ b/net/p5-Telnet-Cisco/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Telnet/Cisco.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet/Cisco/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet/Cisco 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Telnet/Cisco.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
+%%SITE_PERL%%/auto/Net/Telnet/Cisco/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet/Cisco 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index a85640a0254d..3b4f264932ca 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 interface to Uniform Resource Identifier (URI) references
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= URI.3 \
URI::Escape.3 \
URI::Heuristic.3 \
diff --git a/net/p5-XPC/Makefile b/net/p5-XPC/Makefile
index f85d54a4a1e6..d7c908f69424 100644
--- a/net/p5-XPC/Makefile
+++ b/net/p5-XPC/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= XML Procedure Call (XPC)
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/Daemon.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/HTTP/Daemon.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XPC.3 XPC::Agent.3 XPC::Daemon.3
.include <bsd.port.mk>
diff --git a/net/p5-XPC/pkg-plist b/net/p5-XPC/pkg-plist
index 1e69c4622f03..0a33a152cb82 100644
--- a/net/p5-XPC/pkg-plist
+++ b/net/p5-XPC/pkg-plist
@@ -1,9 +1,9 @@
bin/xpcc
bin/xpcd
-lib/perl5/site_perl/%%PERL_VER%%/XPC.pm
-lib/perl5/site_perl/%%PERL_VER%%/XPC/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/XPC/Daemon.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XPC
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XPC/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto
+%%SITE_PERL%%/XPC.pm
+%%SITE_PERL%%/XPC/Agent.pm
+%%SITE_PERL%%/XPC/Daemon.pm
+@dirrm %%SITE_PERL%%/XPC
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XPC/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XPC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto
diff --git a/net/perldap/Makefile b/net/perldap/Makefile
index 91c458430f19..7c31fb0afd82 100644
--- a/net/perldap/Makefile
+++ b/net/perldap/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl interface to LDAP
LIB_DEPENDS= mozldap.1:${PORTSDIR}/net/ldapsdk
WRKSRC= ${WRKDIR}/$(PORTNAME)-$(PORTVERSION)
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mozilla::LDAP::Conn.3 \
Mozilla::LDAP::LDIF.3 \
Mozilla::LDAP::Utils.3 \
diff --git a/net/perldap/pkg-plist b/net/perldap/pkg-plist
index 978b2fe5206c..4e9177b93c09 100644
--- a/net/perldap/pkg-plist
+++ b/net/perldap/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/API.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/API.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/Conn.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/LDIF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/Utils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/API.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/Entry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/API.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/API.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/Conn.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/LDIF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/Utils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/API.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/Entry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Mozilla
diff --git a/net/radiator/pkg-plist b/net/radiator/pkg-plist
index 7c333e63203c..80e9e14dacd9 100644
--- a/net/radiator/pkg-plist
+++ b/net/radiator/pkg-plist
@@ -2,134 +2,134 @@ bin/builddbm
bin/buildsql
bin/radiusd
bin/radpwtst
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AddressAllocatorDHCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AddressAllocatorGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AddressAllocatorSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AttrVal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthACE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthADSI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthCDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthDBFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthDYNADDRESS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthEMERALD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthEMERALD4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthEXTERNAL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthGROUP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthHTGROUP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthIMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthINTERNAL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthIPASS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLDAP2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLDAPSDK.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLOADBALANCE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLogFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLogGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLogSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLogSYSLOG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthMOBILEIP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthNISPLUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthNT.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthOPIE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthPAM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthPLATYPUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthPOP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthPORTLIMITCHECK.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthRADIUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthRADKEY.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthRADMIN.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthRODOPI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthROUNDROBIN.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthSQLRADIUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthSYSTEM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthTACACSPLUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthTEST.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthUNIX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthURL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthVOLUMEBALANCE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/ClientListSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Configurable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Context.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/DES.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/DHCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_13.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_21.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_25.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_26.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_5.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Finger.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Handler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogEMERALD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogSYSLOG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/MSCHAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Mib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Monitor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Ascend.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/AscendSNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Bay.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Bay4000SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Bay5399SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Bay8000SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/BayFinger.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Cisco.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/CiscoVPDN.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Computone.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Cyclades.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Hiper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Livingston.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/NortelCVX1800.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Patton.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Ping.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Portmaster3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Portmaster4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Portslave.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/PortslaveLinux.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/PortslaveMoxa.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Shiva.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Tigris.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/TigrisNew.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/TigrisOld.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/TotalControl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/TotalControlSNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Xyplex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/ignore.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/unknown.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/RDict.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Radius.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/RadpwtstGui.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Rcrypt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Realm.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SNMPAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Select.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/ServerConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessDBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessINTERNAL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessNULL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SimpleClient.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SqlDb.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/StatsLogFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/StatsLogGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/StatsLogSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/TLS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/User.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Win32Service.pm
-lib/perl5/site_perl/%%PERL_VER%%/radhostname.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Radius/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Radius
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Radius
+%%SITE_PERL%%/Radius/AddressAllocatorDHCP.pm
+%%SITE_PERL%%/Radius/AddressAllocatorGeneric.pm
+%%SITE_PERL%%/Radius/AddressAllocatorSQL.pm
+%%SITE_PERL%%/Radius/AttrVal.pm
+%%SITE_PERL%%/Radius/AuthACE.pm
+%%SITE_PERL%%/Radius/AuthADSI.pm
+%%SITE_PERL%%/Radius/AuthCDB.pm
+%%SITE_PERL%%/Radius/AuthDBFILE.pm
+%%SITE_PERL%%/Radius/AuthDYNADDRESS.pm
+%%SITE_PERL%%/Radius/AuthEMERALD.pm
+%%SITE_PERL%%/Radius/AuthEMERALD4.pm
+%%SITE_PERL%%/Radius/AuthEXTERNAL.pm
+%%SITE_PERL%%/Radius/AuthFILE.pm
+%%SITE_PERL%%/Radius/AuthGROUP.pm
+%%SITE_PERL%%/Radius/AuthGeneric.pm
+%%SITE_PERL%%/Radius/AuthHTGROUP.pm
+%%SITE_PERL%%/Radius/AuthIMAP.pm
+%%SITE_PERL%%/Radius/AuthINTERNAL.pm
+%%SITE_PERL%%/Radius/AuthIPASS.pm
+%%SITE_PERL%%/Radius/AuthLDAP.pm
+%%SITE_PERL%%/Radius/AuthLDAP2.pm
+%%SITE_PERL%%/Radius/AuthLDAPSDK.pm
+%%SITE_PERL%%/Radius/AuthLOADBALANCE.pm
+%%SITE_PERL%%/Radius/AuthLogFILE.pm
+%%SITE_PERL%%/Radius/AuthLogGeneric.pm
+%%SITE_PERL%%/Radius/AuthLogSQL.pm
+%%SITE_PERL%%/Radius/AuthLogSYSLOG.pm
+%%SITE_PERL%%/Radius/AuthMOBILEIP.pm
+%%SITE_PERL%%/Radius/AuthNISPLUS.pm
+%%SITE_PERL%%/Radius/AuthNT.pm
+%%SITE_PERL%%/Radius/AuthOPIE.pm
+%%SITE_PERL%%/Radius/AuthPAM.pm
+%%SITE_PERL%%/Radius/AuthPLATYPUS.pm
+%%SITE_PERL%%/Radius/AuthPOP3.pm
+%%SITE_PERL%%/Radius/AuthPORTLIMITCHECK.pm
+%%SITE_PERL%%/Radius/AuthRADIUS.pm
+%%SITE_PERL%%/Radius/AuthRADKEY.pm
+%%SITE_PERL%%/Radius/AuthRADMIN.pm
+%%SITE_PERL%%/Radius/AuthRODOPI.pm
+%%SITE_PERL%%/Radius/AuthROUNDROBIN.pm
+%%SITE_PERL%%/Radius/AuthSQL.pm
+%%SITE_PERL%%/Radius/AuthSQLRADIUS.pm
+%%SITE_PERL%%/Radius/AuthSYSTEM.pm
+%%SITE_PERL%%/Radius/AuthTACACSPLUS.pm
+%%SITE_PERL%%/Radius/AuthTEST.pm
+%%SITE_PERL%%/Radius/AuthUNIX.pm
+%%SITE_PERL%%/Radius/AuthURL.pm
+%%SITE_PERL%%/Radius/AuthVOLUMEBALANCE.pm
+%%SITE_PERL%%/Radius/Client.pm
+%%SITE_PERL%%/Radius/ClientListSQL.pm
+%%SITE_PERL%%/Radius/Configurable.pm
+%%SITE_PERL%%/Radius/Context.pm
+%%SITE_PERL%%/Radius/DES.pm
+%%SITE_PERL%%/Radius/DHCP.pm
+%%SITE_PERL%%/Radius/EAP.pm
+%%SITE_PERL%%/Radius/EAP_13.pm
+%%SITE_PERL%%/Radius/EAP_21.pm
+%%SITE_PERL%%/Radius/EAP_25.pm
+%%SITE_PERL%%/Radius/EAP_26.pm
+%%SITE_PERL%%/Radius/EAP_4.pm
+%%SITE_PERL%%/Radius/EAP_5.pm
+%%SITE_PERL%%/Radius/Finger.pm
+%%SITE_PERL%%/Radius/Handler.pm
+%%SITE_PERL%%/Radius/Log.pm
+%%SITE_PERL%%/Radius/LogEMERALD.pm
+%%SITE_PERL%%/Radius/LogFILE.pm
+%%SITE_PERL%%/Radius/LogGeneric.pm
+%%SITE_PERL%%/Radius/LogSQL.pm
+%%SITE_PERL%%/Radius/LogSYSLOG.pm
+%%SITE_PERL%%/Radius/MSCHAP.pm
+%%SITE_PERL%%/Radius/Mib.pm
+%%SITE_PERL%%/Radius/Monitor.pm
+%%SITE_PERL%%/Radius/Nas.pm
+%%SITE_PERL%%/Radius/Nas/Ascend.pm
+%%SITE_PERL%%/Radius/Nas/AscendSNMP.pm
+%%SITE_PERL%%/Radius/Nas/Bay.pm
+%%SITE_PERL%%/Radius/Nas/Bay4000SNMP.pm
+%%SITE_PERL%%/Radius/Nas/Bay5399SNMP.pm
+%%SITE_PERL%%/Radius/Nas/Bay8000SNMP.pm
+%%SITE_PERL%%/Radius/Nas/BayFinger.pm
+%%SITE_PERL%%/Radius/Nas/Cisco.pm
+%%SITE_PERL%%/Radius/Nas/CiscoVPDN.pm
+%%SITE_PERL%%/Radius/Nas/Computone.pm
+%%SITE_PERL%%/Radius/Nas/Cyclades.pm
+%%SITE_PERL%%/Radius/Nas/Hiper.pm
+%%SITE_PERL%%/Radius/Nas/Livingston.pm
+%%SITE_PERL%%/Radius/Nas/NortelCVX1800.pm
+%%SITE_PERL%%/Radius/Nas/Patton.pm
+%%SITE_PERL%%/Radius/Nas/Ping.pm
+%%SITE_PERL%%/Radius/Nas/Portmaster3.pm
+%%SITE_PERL%%/Radius/Nas/Portmaster4.pm
+%%SITE_PERL%%/Radius/Nas/Portslave.pm
+%%SITE_PERL%%/Radius/Nas/PortslaveLinux.pm
+%%SITE_PERL%%/Radius/Nas/PortslaveMoxa.pm
+%%SITE_PERL%%/Radius/Nas/Shiva.pm
+%%SITE_PERL%%/Radius/Nas/Tigris.pm
+%%SITE_PERL%%/Radius/Nas/TigrisNew.pm
+%%SITE_PERL%%/Radius/Nas/TigrisOld.pm
+%%SITE_PERL%%/Radius/Nas/TotalControl.pm
+%%SITE_PERL%%/Radius/Nas/TotalControlSNMP.pm
+%%SITE_PERL%%/Radius/Nas/Xyplex.pm
+%%SITE_PERL%%/Radius/Nas/ignore.pm
+%%SITE_PERL%%/Radius/Nas/unknown.pm
+%%SITE_PERL%%/Radius/RDict.pm
+%%SITE_PERL%%/Radius/Radius.pm
+%%SITE_PERL%%/Radius/RadpwtstGui.pm
+%%SITE_PERL%%/Radius/Rcrypt.pm
+%%SITE_PERL%%/Radius/Realm.pm
+%%SITE_PERL%%/Radius/SNMP.pm
+%%SITE_PERL%%/Radius/SNMPAgent.pm
+%%SITE_PERL%%/Radius/Select.pm
+%%SITE_PERL%%/Radius/ServerConfig.pm
+%%SITE_PERL%%/Radius/SessDBM.pm
+%%SITE_PERL%%/Radius/SessGeneric.pm
+%%SITE_PERL%%/Radius/SessINTERNAL.pm
+%%SITE_PERL%%/Radius/SessNULL.pm
+%%SITE_PERL%%/Radius/SessSQL.pm
+%%SITE_PERL%%/Radius/SimpleClient.pm
+%%SITE_PERL%%/Radius/SqlDb.pm
+%%SITE_PERL%%/Radius/StatsLogFILE.pm
+%%SITE_PERL%%/Radius/StatsLogGeneric.pm
+%%SITE_PERL%%/Radius/StatsLogSQL.pm
+%%SITE_PERL%%/Radius/TLS.pm
+%%SITE_PERL%%/Radius/User.pm
+%%SITE_PERL%%/Radius/Util.pm
+%%SITE_PERL%%/Radius/Win32Service.pm
+%%SITE_PERL%%/radhostname.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Radius/.packlist
+@dirrm %%SITE_PERL%%/Radius/Nas
+@dirrm %%SITE_PERL%%/Radius
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Radius
diff --git a/net/rancid/Makefile b/net/rancid/Makefile
index ec6d4faf7a67..4b0bd395c706 100644
--- a/net/rancid/Makefile
+++ b/net/rancid/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= expect:${PORTSDIR}/lang/expect \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
${SITE_PERL}/LockFile/Simple.pm:${PORTSDIR}/devel/p5-LockFile-Simple
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
USE_PERL5= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_GMAKE= yes
@@ -27,7 +27,6 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX}/rancid
-MANPREFIX= ${PREFIX}/rancid
MAN1= lg_intro.1 par.1 do-diffs.1 alogin.1 blogin.1 clogin.1 \
control_rancid.1 create_cvs.1 rancid.1 rancid_intro.1 \
diff --git a/net/remarp/pkg-plist b/net/remarp/pkg-plist
index 7b1cdbf0912a..ca539473cd5d 100644
--- a/net/remarp/pkg-plist
+++ b/net/remarp/pkg-plist
@@ -1,5 +1,5 @@
sbin/remarp
etc/remarp.conf.sample
-lib/perl5/site_perl/%%PERL_VER%%/remarp/config.pm
-lib/perl5/site_perl/%%PERL_VER%%/remarp/configure.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/remarp
+%%SITE_PERL%%/remarp/config.pm
+%%SITE_PERL%%/remarp/configure.pm
+@dirrm %%SITE_PERL%%/remarp
diff --git a/net/rrdtool/pkg-plist b/net/rrdtool/pkg-plist
index 579be8a0753f..a84a6d29e72e 100644
--- a/net/rrdtool/pkg-plist
+++ b/net/rrdtool/pkg-plist
@@ -73,16 +73,16 @@ share/doc/rrdtool/html/rrdtutorial.es.html
share/doc/rrdtool/html/RRDs.html
share/doc/rrdtool/html/RRDp.html
share/doc/rrdtool/html/rrdxport.html
-lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/RRDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+%%SITE_PERL%%/RRDp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
@dirrm share/examples/rrdtool/trytime
@dirrm share/examples/rrdtool
@dirrm share/doc/rrdtool/html
@dirrm share/doc/rrdtool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/net/rrdtool10/pkg-plist b/net/rrdtool10/pkg-plist
index 579be8a0753f..a84a6d29e72e 100644
--- a/net/rrdtool10/pkg-plist
+++ b/net/rrdtool10/pkg-plist
@@ -73,16 +73,16 @@ share/doc/rrdtool/html/rrdtutorial.es.html
share/doc/rrdtool/html/RRDs.html
share/doc/rrdtool/html/RRDp.html
share/doc/rrdtool/html/rrdxport.html
-lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/RRDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+%%SITE_PERL%%/RRDp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
@dirrm share/examples/rrdtool/trytime
@dirrm share/examples/rrdtool
@dirrm share/doc/rrdtool/html
@dirrm share/doc/rrdtool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist
index b7ea631d841f..9401c691bfc1 100644
--- a/net/spread/pkg-plist
+++ b/net/spread/pkg-plist
@@ -15,17 +15,17 @@ lib/libtspread.a
lib/libtspread.so
lib/libtspread.so.1
lib/perl5/%%PERL_VERSION%%/man/man3/Spread.3.gz
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Spread.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
sbin/spread
%%PORTDOCS%%share/doc/spread/perl/README
%%PORTDOCS%%share/doc/spread/perl/test.pl
%%PORTDOCS%%share/doc/spread/LICENSE
%%PORTDOCS%%share/doc/spread/Readme.txt
@unexec rmdir /var/run/spread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
%%PORTDOCS%%@dirrm share/doc/spread/perl
%%PORTDOCS%%@dirrm share/doc/spread
diff --git a/net/spread4/pkg-plist b/net/spread4/pkg-plist
index b7ea631d841f..9401c691bfc1 100644
--- a/net/spread4/pkg-plist
+++ b/net/spread4/pkg-plist
@@ -15,17 +15,17 @@ lib/libtspread.a
lib/libtspread.so
lib/libtspread.so.1
lib/perl5/%%PERL_VERSION%%/man/man3/Spread.3.gz
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Spread.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
sbin/spread
%%PORTDOCS%%share/doc/spread/perl/README
%%PORTDOCS%%share/doc/spread/perl/test.pl
%%PORTDOCS%%share/doc/spread/LICENSE
%%PORTDOCS%%share/doc/spread/Readme.txt
@unexec rmdir /var/run/spread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
%%PORTDOCS%%@dirrm share/doc/spread/perl
%%PORTDOCS%%@dirrm share/doc/spread
diff --git a/net/v6eval/pkg-plist b/net/v6eval/pkg-plist
index e99edb6c1262..a33543afe0bb 100644
--- a/net/v6eval/pkg-plist
+++ b/net/v6eval/pkg-plist
@@ -499,6 +499,6 @@ v6eval/man/man1/pktsend.1.gz
@unexec rmdir %D/v6eval/etc 2>/dev/null || true
@dirrm v6eval/include
@dirrm v6eval
-lib/perl5/site_perl/%%PERL_VER%%/V6evalTool.pm
-lib/perl5/site_perl/%%PERL_VER%%/V6evalCommon.pm
-lib/perl5/site_perl/%%PERL_VER%%/V6evalRemote.pm
+%%SITE_PERL%%/V6evalTool.pm
+%%SITE_PERL%%/V6evalCommon.pm
+%%SITE_PERL%%/V6evalRemote.pm
diff --git a/net/vicq/Makefile b/net/vicq/Makefile
index 5ef7fcfac345..6ba820996d4a 100644
--- a/net/vicq/Makefile
+++ b/net/vicq/Makefile
@@ -14,13 +14,12 @@ MAINTAINER= kevlo@FreeBSD.org
COMMENT= A text-based ICQ implementation
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
WRKSRC= ${WRKDIR}/${PORTNAME}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-extract:
${MV} ${WRKSRC}/Net/vICQ/* ${WRKSRC}
diff --git a/net/vicq/pkg-plist b/net/vicq/pkg-plist
index bd1bf6a93db3..b8b31b16b64b 100644
--- a/net/vicq/pkg-plist
+++ b/net/vicq/pkg-plist
@@ -1,8 +1,8 @@
bin/vicq
-lib/perl5/site_perl/%%PERL_VER%%/Net/vICQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/vICQ/.packlist
+%%SITE_PERL%%/Net/vICQ.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ/.packlist
share/examples/vicq/vicqrc.example
@dirrm share/examples/vicq
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/vICQ
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2> /dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true
diff --git a/net/wakeonlan/pkg-plist b/net/wakeonlan/pkg-plist
index 0ea3783ed223..54f74c5e4dc9 100644
--- a/net/wakeonlan/pkg-plist
+++ b/net/wakeonlan/pkg-plist
@@ -1,5 +1,5 @@
bin/wakeonlan
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/wakeonlan/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan/.packlist
share/examples/wakeonlan/lab001.wol
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/wakeonlan
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan
@dirrm share/examples/wakeonlan
diff --git a/net/wping/Makefile b/net/wping/Makefile
index 48b42c0e7a59..91c4f350adb3 100644
--- a/net/wping/Makefile
+++ b/net/wping/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= http://www.x-router.com/files/
MAINTAINER= mich@FreeBSD.org
COMMENT= A Web-based graphical ping log
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
USE_BZIP2= yes
NO_BUILD= yes
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index afb44306fdc2..672d3067400f 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= XML-RPC library for C and C++
LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
+RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
USE_REINPLACE= yes
USE_LIBTOOL= yes
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index afb44306fdc2..672d3067400f 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= XML-RPC library for C and C++
LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
+RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
USE_REINPLACE= yes
USE_LIBTOOL= yes
diff --git a/news/ija/Makefile b/news/ija/Makefile
index dfb929a49014..0f91c431f0ec 100644
--- a/news/ija/Makefile
+++ b/news/ija/Makefile
@@ -15,8 +15,8 @@ EXTRACT_SUFX= .gz
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive command line frontend of Deja
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS= ${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
USE_PERL5= yes
diff --git a/news/newsgrab/Makefile b/news/newsgrab/Makefile
index 0f1eb12ce0fa..6d4640bb4013 100644
--- a/news/newsgrab/Makefile
+++ b/news/newsgrab/Makefile
@@ -15,10 +15,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= petef@FreeBSD.org
COMMENT= Download and uudecode binary files from USENET using regexps
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/NNTPClient.pm:${PORTSDIR}/news/p5-NNTPClient \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Newsrc.pm:${PORTSDIR}/news/p5-News-Newsrc \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS= ${SITE_PERL}/News/NNTPClient.pm:${PORTSDIR}/news/p5-NNTPClient \
+ ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
+ ${SITE_PERL}/News/Newsrc.pm:${PORTSDIR}/news/p5-News-Newsrc \
+ ${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules
NO_BUILD= yes
USE_PERL5= yes
diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile
index 94b3ff7690bd..8af43942872c 100644
--- a/news/p5-Gateway/Makefile
+++ b/news/p5-Gateway/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= croyle@gelemna.org
COMMENT= Robomoderation and mail to news gatewaying toolkit
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
+BUILD_DEPENDS= ${SITE_PERL}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
+RUN_DEPENDS= ${SITE_PERL}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
PERL_CONFIGURE= yes
MAN3= News::Gateway.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/news/p5-Gateway/pkg-plist b/news/p5-Gateway/pkg-plist
index 590f7541905d..3d0a8a6b5d47 100644
--- a/news/p5-Gateway/pkg-plist
+++ b/news/p5-Gateway/pkg-plist
@@ -1,26 +1,26 @@
-lib/perl5/site_perl/%%PERL_VER%%/News/Gateway.pm
-lib/perl5/site_perl/%%PERL_VER%%/News/Gateway.pod
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/anykeyword.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/bodyheaders.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/cleanbody.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/config.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/crosspost.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/hash.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/headers.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/keywords.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/mail.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/mailpath.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/mailtonews.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/moosesign.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/mungeids.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/newsgroups.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/newstomail.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/nobinaries.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/post.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/previoushop.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/whitelist.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Gateway/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Gateway
+%%SITE_PERL%%/News/Gateway.pm
+%%SITE_PERL%%/News/Gateway.pod
+%%SITE_PERL%%/auto/News/Gateway/anykeyword.al
+%%SITE_PERL%%/auto/News/Gateway/bodyheaders.al
+%%SITE_PERL%%/auto/News/Gateway/cleanbody.al
+%%SITE_PERL%%/auto/News/Gateway/config.al
+%%SITE_PERL%%/auto/News/Gateway/crosspost.al
+%%SITE_PERL%%/auto/News/Gateway/hash.al
+%%SITE_PERL%%/auto/News/Gateway/headers.al
+%%SITE_PERL%%/auto/News/Gateway/keywords.al
+%%SITE_PERL%%/auto/News/Gateway/mail.al
+%%SITE_PERL%%/auto/News/Gateway/mailpath.al
+%%SITE_PERL%%/auto/News/Gateway/mailtonews.al
+%%SITE_PERL%%/auto/News/Gateway/moosesign.al
+%%SITE_PERL%%/auto/News/Gateway/mungeids.al
+%%SITE_PERL%%/auto/News/Gateway/newsgroups.al
+%%SITE_PERL%%/auto/News/Gateway/newstomail.al
+%%SITE_PERL%%/auto/News/Gateway/nobinaries.al
+%%SITE_PERL%%/auto/News/Gateway/post.al
+%%SITE_PERL%%/auto/News/Gateway/previoushop.al
+%%SITE_PERL%%/auto/News/Gateway/whitelist.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway
share/examples/Gateway/listgate
share/examples/Gateway/listgate.m4
share/examples/Gateway/listgate.readme
diff --git a/news/p5-NNTPClient/pkg-plist b/news/p5-NNTPClient/pkg-plist
index 716e33be8a8d..30f5bb0f3c8b 100644
--- a/news/p5-NNTPClient/pkg-plist
+++ b/news/p5-NNTPClient/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/News/NNTPClient.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/NNTPClient/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/NNTPClient
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/News 2>/dev/null || true
+%%SITE_PERL%%/News/NNTPClient.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/NNTPClient/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/NNTPClient
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index 805b2ccc064f..2205b021394b 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@freebsd.org
COMMENT= Object for handling Usenet articles in mail or news form
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/NNTP.pm:${PORTSDIR}/net/p5-Net \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/PGP/Sign.pm:${PORTSDIR}/security/p5-PGP-Sign
+RUN_DEPENDS= ${SITE_PERL}/Net/NNTP.pm:${PORTSDIR}/net/p5-Net \
+ ${SITE_PERL}/PGP/Sign.pm:${PORTSDIR}/security/p5-PGP-Sign
PERL_CONFIGURE= yes
MAN3= News::Article.3 News::AutoReply.3 News::FormArticle.3 \
News::FormReply.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/news/p5-News-Article/pkg-plist b/news/p5-News-Article/pkg-plist
index dc1393795b21..6825491b9154 100644
--- a/news/p5-News-Article/pkg-plist
+++ b/news/p5-News-Article/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/News/Article.pm
-lib/perl5/site_perl/%%PERL_VER%%/News/AutoReply.pm
-lib/perl5/site_perl/%%PERL_VER%%/News/FormArticle.pm
-lib/perl5/site_perl/%%PERL_VER%%/News/FormReply.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Article/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Article
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/News 2>/dev/null || true
+%%SITE_PERL%%/News/Article.pm
+%%SITE_PERL%%/News/AutoReply.pm
+%%SITE_PERL%%/News/FormArticle.pm
+%%SITE_PERL%%/News/FormReply.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index a54ebf5836ac..8c0a39c3de27 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Manage newsrc files
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Set/IntSpan.pm:${PORTSDIR}/math/p5-Set-IntSpan
+BUILD_DEPENDS= ${SITE_PERL}/Set/IntSpan.pm:${PORTSDIR}/math/p5-Set-IntSpan
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= News::Newsrc.3
pre-patch:
diff --git a/news/p5-News-Newsrc/pkg-plist b/news/p5-News-Newsrc/pkg-plist
index 3e498ad729d1..2366b1d0c678 100644
--- a/news/p5-News-Newsrc/pkg-plist
+++ b/news/p5-News-Newsrc/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/News/Newsrc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Newsrc/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Newsrc
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/News 2>/dev/null || true
+%%SITE_PERL%%/News/Newsrc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Newsrc/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Newsrc
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true
diff --git a/news/ubh/Makefile b/news/ubh/Makefile
index f3570b97eb9e..6c437f5a2713 100644
--- a/news/ubh/Makefile
+++ b/news/ubh/Makefile
@@ -14,13 +14,13 @@ MAINTAINER= john@zoner.org
COMMENT= Perl script to download and decode binaries posted to Usenet
RUN_DEPENDS= \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Newsrc.pm:${PORTSDIR}/news/p5-News-Newsrc \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/NNTP.pm:${PORTSDIR}/net/p5-Net \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Decoder.pm:${PORTSDIR}/mail/p5-MIME-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/String/CRC32.pm:${PORTSDIR}/devel/p5-String-CRC32
+ ${SITE_PERL}/News/Newsrc.pm:${PORTSDIR}/news/p5-News-Newsrc \
+ ${SITE_PERL}/Net/NNTP.pm:${PORTSDIR}/net/p5-Net \
+ ${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
+ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+ ${SITE_PERL}/MIME/Decoder.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+ ${SITE_PERL}/${PERL_ARCH}/String/CRC32.pm:${PORTSDIR}/devel/p5-String-CRC32
NO_BUILD= YES
diff --git a/palm/p5-Palm/pkg-plist b/palm/p5-Palm/pkg-plist
index 8fc59d86cda5..1600f213b171 100644
--- a/palm/p5-Palm/pkg-plist
+++ b/palm/p5-Palm/pkg-plist
@@ -1,12 +1,12 @@
bin/pdbdump
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Palm/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Palm/Address.pm
-lib/perl5/site_perl/%%PERL_VER%%/Palm/Datebook.pm
-lib/perl5/site_perl/%%PERL_VER%%/Palm/Mail.pm
-lib/perl5/site_perl/%%PERL_VER%%/Palm/Memo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Palm/PDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Palm/Raw.pm
-lib/perl5/site_perl/%%PERL_VER%%/Palm/StdAppInfo.pm
-lib/perl5/site_perl/%%PERL_VER%%/Palm/ToDo.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Palm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Palm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm/.packlist
+%%SITE_PERL%%/Palm/Address.pm
+%%SITE_PERL%%/Palm/Datebook.pm
+%%SITE_PERL%%/Palm/Mail.pm
+%%SITE_PERL%%/Palm/Memo.pm
+%%SITE_PERL%%/Palm/PDB.pm
+%%SITE_PERL%%/Palm/Raw.pm
+%%SITE_PERL%%/Palm/StdAppInfo.pm
+%%SITE_PERL%%/Palm/ToDo.pm
+@dirrm %%SITE_PERL%%/Palm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm
diff --git a/palm/sitescooper/Makefile b/palm/sitescooper/Makefile
index 8a0bafa039a8..72d4d830a425 100644
--- a/palm/sitescooper/Makefile
+++ b/palm/sitescooper/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Pa
USE_PERL5= yes
NO_BUILD= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN1= rss-to-site.1 sitescooper.1 subs-to-site.1
post-patch:
diff --git a/palm/sitescooper/pkg-plist b/palm/sitescooper/pkg-plist
index 3f08412e0f7b..f7de8c5837f5 100644
--- a/palm/sitescooper/pkg-plist
+++ b/palm/sitescooper/pkg-plist
@@ -2,36 +2,36 @@ bin/rss-to-site
bin/sitescooper
bin/subs-to-site
etc/sitescooper.cf.sample
-lib/perl5/site_perl/%%PERL_VER%%/Exten/README
-lib/perl5/site_perl/%%PERL_VER%%/Exten/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDA/PilotInstall.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/CacheFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/CacheObject.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/CacheSingleton.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/ConsolePasswordAsker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/DirCacheFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/ForkHTTPClient.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/ForkedPasswordAsker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/HTMLFindNew.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/HTMLLobotomize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/HTTPClient.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/ImageURLProcessor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/LWPHTTPClient.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/LinksURLProcessor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/Main.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/NewsHound.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/PasswordAsker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/PerSiteCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/PerSiteDirCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/PreloadURLProcessor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/Robot.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/SCF.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/StoryURLProcessor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/StripTablesFilter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/UI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/URLProcessor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sitescooper/Util.pm
+%%SITE_PERL%%/Exten/README
+%%SITE_PERL%%/Exten/Table.pm
+%%SITE_PERL%%/PDA/PilotInstall.pm
+%%SITE_PERL%%/Sitescooper/CacheFactory.pm
+%%SITE_PERL%%/Sitescooper/CacheObject.pm
+%%SITE_PERL%%/Sitescooper/CacheSingleton.pm
+%%SITE_PERL%%/Sitescooper/ConsolePasswordAsker.pm
+%%SITE_PERL%%/Sitescooper/DirCacheFactory.pm
+%%SITE_PERL%%/Sitescooper/ForkHTTPClient.pm
+%%SITE_PERL%%/Sitescooper/ForkedPasswordAsker.pm
+%%SITE_PERL%%/Sitescooper/HTMLFindNew.pm
+%%SITE_PERL%%/Sitescooper/HTMLLobotomize.pm
+%%SITE_PERL%%/Sitescooper/HTTPClient.pm
+%%SITE_PERL%%/Sitescooper/ImageURLProcessor.pm
+%%SITE_PERL%%/Sitescooper/LWPHTTPClient.pm
+%%SITE_PERL%%/Sitescooper/LinksURLProcessor.pm
+%%SITE_PERL%%/Sitescooper/Main.pm
+%%SITE_PERL%%/Sitescooper/NewsHound.pm
+%%SITE_PERL%%/Sitescooper/PasswordAsker.pm
+%%SITE_PERL%%/Sitescooper/PerSiteCache.pm
+%%SITE_PERL%%/Sitescooper/PerSiteDirCache.pm
+%%SITE_PERL%%/Sitescooper/PreloadURLProcessor.pm
+%%SITE_PERL%%/Sitescooper/Robot.pm
+%%SITE_PERL%%/Sitescooper/SCF.pm
+%%SITE_PERL%%/Sitescooper/StoryURLProcessor.pm
+%%SITE_PERL%%/Sitescooper/StripTablesFilter.pm
+%%SITE_PERL%%/Sitescooper/UI.pm
+%%SITE_PERL%%/Sitescooper/URLProcessor.pm
+%%SITE_PERL%%/Sitescooper/UserAgent.pm
+%%SITE_PERL%%/Sitescooper/Util.pm
%%PORTDOCS%%share/doc/sitescooper/contributing.html
%%PORTDOCS%%share/doc/sitescooper/running.html
%%PORTDOCS%%share/doc/sitescooper/site_params.html
@@ -531,9 +531,9 @@ share/sitescooper/site_samples/windows/betanews.site
share/sitescooper/site_samples/windows/cewire.site
share/sitescooper/site_samples/windows/fileforum.site
share/sitescooper/site_samples/windows/ntfaq.site
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Exten
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDA
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sitescooper
+@dirrm %%SITE_PERL%%/Exten
+@dirrm %%SITE_PERL%%/PDA
+@dirrm %%SITE_PERL%%/Sitescooper
@dirrm share/sitescooper/profile_samples
@dirrm share/sitescooper/site_samples/admin
@dirrm share/sitescooper/site_samples/books
diff --git a/ports-mgmt/p5-FreeBSD-Ports/pkg-plist b/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
index 9e63253110c6..a6ecd11c12cf 100644
--- a/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports/Port.pm
-lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/FreeBSD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD
+%%SITE_PERL%%/FreeBSD/Ports/Port.pm
+%%SITE_PERL%%/FreeBSD/Ports.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/.packlist
+@dirrm %%SITE_PERL%%/FreeBSD/Ports
+@dirrm %%SITE_PERL%%/FreeBSD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
diff --git a/print/axpoint/Makefile b/print/axpoint/Makefile
index f6bb7f7a2472..09cdd8ea9708 100644
--- a/print/axpoint/Makefile
+++ b/print/axpoint/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${PERL_SITELIBDIR}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
${PERL_SITELIBDIR}/PDFLib.pm:${PORTSDIR}/print/p5-PDFLib
RUN_DEPENDS= ${BUILD_DEPENDS}
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
USE_PERL5= yes
PERL_CONFIGURE= yes
diff --git a/print/axpoint/pkg-plist b/print/axpoint/pkg-plist
index ce3c3a988521..7e25c924d3c1 100644
--- a/print/axpoint/pkg-plist
+++ b/print/axpoint/pkg-plist
@@ -1,8 +1,8 @@
bin/axpoint
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/AxPoint.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/Handler/AxPoint.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/print/guitartex/Makefile b/print/guitartex/Makefile
index 1fc713ed6ad6..f225efe9f851 100644
--- a/print/guitartex/Makefile
+++ b/print/guitartex/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GuitarTeX converts the Chord format into "normal" LaTeX format
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
latex:${PORTSDIR}/print/latex
USE_REINPLACE= yes
diff --git a/print/p5-GnomePrint/Makefile b/print/p5-GnomePrint/Makefile
index 7993ace28084..a988955e1ebb 100644
--- a/print/p5-GnomePrint/Makefile
+++ b/print/p5-GnomePrint/Makefile
@@ -16,9 +16,9 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Gnome Print module of Gtk-Perl
-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}/Gtk/Gdk/Pixbuf.pm:${PORTSDIR}/x11-toolkits/p5-GdkPixbuf \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk/ImlibImage.pm:${PORTSDIR}/x11-toolkits/p5-GdkImlib
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
+ ${SITE_PERL}/${PERL_ARCH}/Gtk/Gdk/Pixbuf.pm:${PORTSDIR}/x11-toolkits/p5-GdkPixbuf \
+ ${SITE_PERL}/${PERL_ARCH}/Gtk/Gdk/ImlibImage.pm:${PORTSDIR}/x11-toolkits/p5-GdkImlib
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= yes
diff --git a/print/p5-GnomePrint/pkg-plist b/print/p5-GnomePrint/pkg-plist
index 77fe554b6535..185d8b30ede6 100644
--- a/print/p5-GnomePrint/pkg-plist
+++ b/print/p5-GnomePrint/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print/Install/GnomePrintDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print/Install/GnomePrintTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print/Install/PerlGnomePrintInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print/TypesLazy.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Print/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Print/Print.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Print/Print.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Print
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Print
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print/Install/GnomePrintDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print/Install/GnomePrintTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print/Install/PerlGnomePrintInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print/TypesLazy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome/Print/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome/Print/Print.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome/Print/Print.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Print
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gnome 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome/Print
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome 2>/dev/null || true
diff --git a/print/p5-PDFLib/Makefile b/print/p5-PDFLib/Makefile
index 75c1ebbf4d64..f6c7f9ea0065 100644
--- a/print/p5-PDFLib/Makefile
+++ b/print/p5-PDFLib/Makefile
@@ -17,7 +17,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= More OO interface to pdflib_pl.pm
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/pdflib_pl.pm:${PORTSDIR}/print/pdflib-perl
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/pdflib_pl.pm:${PORTSDIR}/print/pdflib-perl
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PERL5= yes
diff --git a/print/p5-PDFLib/pkg-plist b/print/p5-PDFLib/pkg-plist
index fe88530f847e..6c9e10ad0ec6 100644
--- a/print/p5-PDFLib/pkg-plist
+++ b/print/p5-PDFLib/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/PDFLib.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDFLib/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDFLib
+%%SITE_PERL%%/PDFLib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFLib/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFLib
diff --git a/print/p5-PostScript-Simple/pkg-plist b/print/p5-PostScript-Simple/pkg-plist
index 90839c40f6ad..1e13271eedaf 100644
--- a/print/p5-PostScript-Simple/pkg-plist
+++ b/print/p5-PostScript-Simple/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PostScript/Simple/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/PostScript/Simple.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PostScript/Simple
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/PostScript 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/PostScript 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Simple/.packlist
+%%SITE_PERL%%/PostScript/Simple.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Simple
+@unexec rmdir %D/%%SITE_PERL%%/i386-freebsd/auto/PostScript 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/PostScript 2>/dev/null || true
diff --git a/print/pdflib/pkg-plist b/print/pdflib/pkg-plist
index a3c724d742c4..91c23ef0c348 100644
--- a/print/pdflib/pkg-plist
+++ b/print/pdflib/pkg-plist
@@ -3,10 +3,10 @@ include/pdflib.h
lib/libpdf.a
lib/libpdf.so
lib/libpdf.so.6
-%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.a
-%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.pm
-%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so
-%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so.0
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.a
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0
%%PORTDOCS%%share/doc/pdflib/PDFlib-Lite-license.pdf
%%PORTDOCS%%share/doc/pdflib/PDFlib-manual.pdf
%%PORTDOCS%%share/doc/pdflib/PDFlib-purchase-order.pdf
diff --git a/print/pdflib4/pkg-plist b/print/pdflib4/pkg-plist
index 8d22d8afdc90..c3afb8e1506a 100644
--- a/print/pdflib4/pkg-plist
+++ b/print/pdflib4/pkg-plist
@@ -3,10 +3,10 @@ include/pdflib.h
lib/libpdf.a
lib/libpdf.so
lib/libpdf.so.4
-%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.a
-%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.pm
-%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so
-%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so.0
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.a
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0
%%PORTDOCS%%share/doc/pdflib/PDFlib-license.pdf
%%PORTDOCS%%share/doc/pdflib/PDFlib-manual.pdf
%%PORTDOCS%%share/doc/pdflib/PDFlib-purchase-order.pdf
diff --git a/print/perlftlib/pkg-plist b/print/perlftlib/pkg-plist
index ef3d522ea012..05d9a4e36ff4 100644
--- a/print/perlftlib/pkg-plist
+++ b/print/perlftlib/pkg-plist
@@ -1,11 +1,11 @@
bin/mkttfdir
bin/ftinfo
-lib/perl5/site_perl/%%PERL_VER%%/FreeTypeWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeType/FreeType.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeType/FreeType.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeType/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeType/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FreeType.pm
+%%SITE_PERL%%/FreeTypeWrapper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeType/FreeType.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeType/FreeType.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeType/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeType/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/FreeType.pm
@comment I do not know how to treat the next files
@comment lib/perl5/%%PERL_VERSION%%/i386-freebsd/perllocal.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeType
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeType
diff --git a/russian/p5-Lingua-RU-Charset/Makefile b/russian/p5-Lingua-RU-Charset/Makefile
index c66c4483f532..91ac48879466 100644
--- a/russian/p5-Lingua-RU-Charset/Makefile
+++ b/russian/p5-Lingua-RU-Charset/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for detecting and converting various russian character s
PERL_CONFIGURE= YES
MAN3= Lingua::RU::Charset.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/russian/p5-Lingua-RU-Charset/pkg-plist b/russian/p5-Lingua-RU-Charset/pkg-plist
index 281ed04f7b4c..f91b2535e624 100644
--- a/russian/p5-Lingua-RU-Charset/pkg-plist
+++ b/russian/p5-Lingua-RU-Charset/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/RU/Charset.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/RU 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/RU 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/RU/Charset.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/RU 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
diff --git a/russian/p5-XML-Parser-encodings/Makefile b/russian/p5-XML-Parser-encodings/Makefile
index 80f1961fb230..c9750b84897f 100644
--- a/russian/p5-XML-Parser-encodings/Makefile
+++ b/russian/p5-XML-Parser-encodings/Makefile
@@ -14,9 +14,9 @@ DISTFILES=
MAINTAINER= skv@FreeBSD.org
COMMENT= Additional russian encodings for XML::Parser
-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
BUILD_DEPENDS= ${RUN_DEPENDS} \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Encoding.pm:${PORTSDIR}/textproc/p5-XML-Encoding \
+ ${SITE_PERL}/XML/Encoding.pm:${PORTSDIR}/textproc/p5-XML-Encoding \
${NONEXISTENT}:${PORTSDIR}/converters/iconv:extract \
${NONEXISTENT}:${PORTSDIR}/converters/iconv-extra:extract
diff --git a/russian/p5-XML-Parser-encodings/pkg-plist b/russian/p5-XML-Parser-encodings/pkg-plist
index e69027e39cbe..53fa70993e8e 100644
--- a/russian/p5-XML-Parser-encodings/pkg-plist
+++ b/russian/p5-XML-Parser-encodings/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp1251.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp866.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/koi8-r.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1251.enc
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp1251.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp866.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/koi8-r.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1251.enc
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
diff --git a/russian/p5-cyrillic/Makefile b/russian/p5-cyrillic/Makefile
index e1292689d7b9..1c26eb1555cb 100644
--- a/russian/p5-cyrillic/Makefile
+++ b/russian/p5-cyrillic/Makefile
@@ -17,7 +17,6 @@ COMMENT= Library for fast and easy cyrillic text manipulation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= cyrillic.3
.include <bsd.port.mk>
diff --git a/russian/p5-cyrillic/pkg-plist b/russian/p5-cyrillic/pkg-plist
index 9afe94f8470f..1b83ceaa04aa 100644
--- a/russian/p5-cyrillic/pkg-plist
+++ b/russian/p5-cyrillic/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/cyrillic.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cyrillic/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cyrillic
+%%SITE_PERL%%/cyrillic.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/cyrillic/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/cyrillic
diff --git a/science/p5-Chemistry-Elements/Makefile b/science/p5-Chemistry-Elements/Makefile
index bb9bf90b7232..da7e5c9d9a85 100644
--- a/science/p5-Chemistry-Elements/Makefile
+++ b/science/p5-Chemistry-Elements/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for working with Chemical Elements
PERL_CONFIGURE= yes
MAN3= Chemistry::Elements.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/science/p5-Chemistry-Elements/pkg-plist b/science/p5-Chemistry-Elements/pkg-plist
index 7e27497b289c..be8be406a681 100644
--- a/science/p5-Chemistry-Elements/pkg-plist
+++ b/science/p5-Chemistry-Elements/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Chemistry/Elements.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chemistry/Elements/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chemistry/Elements
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Chemistry 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Chemistry 2>/dev/null || true
+%%SITE_PERL%%/Chemistry/Elements.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Chemistry 2>/dev/null || true
diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile
index b7c3bd780977..d812aa0ab468 100644
--- a/security/amavis-perl/Makefile
+++ b/security/amavis-perl/Makefile
@@ -19,16 +19,16 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/uvscan:${PORTSDIR}/security/vscan \
${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo \
${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/AtomicFile.pm:${PORTSDIR}/devel/p5-IO-stringy \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Convert/UUlib.pm:${PORTSDIR}/converters/p5-Convert-UUlib \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
+ ${SITE_PERL}/IO/AtomicFile.pm:${PORTSDIR}/devel/p5-IO-stringy \
+ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+ ${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+ ${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+ ${SITE_PERL}/${PERL_ARCH}/Convert/UUlib.pm:${PORTSDIR}/converters/p5-Convert-UUlib \
+ ${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
+ ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
+ ${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
+ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
.if !exists(/usr/bin/bzip2)
BUILD_DEPENDS+= bunzip2:${PORTSDIR}/archivers/bzip2
.endif
diff --git a/security/cp2fwb/Makefile b/security/cp2fwb/Makefile
index 3593376ade6d..c50128f785ea 100644
--- a/security/cp2fwb/Makefile
+++ b/security/cp2fwb/Makefile
@@ -15,8 +15,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Checkpoint FW1 to Firewall Builder ruleset converter
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS= ${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
+ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
USE_PERL5= yes
NO_BUILD= yes
diff --git a/security/p5-Authen-Krb5/pkg-plist b/security/p5-Authen-Krb5/pkg-plist
index 35fc34195b4d..e18648a1dcc3 100644
--- a/security/p5-Authen-Krb5/pkg-plist
+++ b/security/p5-Authen-Krb5/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen/Krb5.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb5/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb5/Krb5.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb5/Krb5.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb5/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb5
+%%SITE_PERL%%/%%PERL_ARCH%%/Authen/Krb5.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5/Krb5.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5/Krb5.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Krb5
diff --git a/security/p5-Authen-PAM/pkg-plist b/security/p5-Authen-PAM/pkg-plist
index f394bc6404ec..1d6535116b2f 100644
--- a/security/p5-Authen-PAM/pkg-plist
+++ b/security/p5-Authen-PAM/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen/FAQ.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen/PAM.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/PAM/PAM.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/PAM/PAM.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/PAM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/PAM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Authen/FAQ.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Authen/PAM.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/PAM.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/PAM.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
diff --git a/security/p5-Authen-Smb/pkg-plist b/security/p5-Authen-Smb/pkg-plist
index fb6d5048c40d..67b447cd7a27 100644
--- a/security/p5-Authen-Smb/pkg-plist
+++ b/security/p5-Authen-Smb/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen/Smb.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Smb/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Smb/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Smb
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Authen/Smb.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
diff --git a/security/p5-Authen-TacacsPlus/Makefile b/security/p5-Authen-TacacsPlus/Makefile
index 962bca85cc78..b3585c7bca30 100644
--- a/security/p5-Authen-TacacsPlus/Makefile
+++ b/security/p5-Authen-TacacsPlus/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl module that provides authentication using a tacacs+ server
PERL_CONFIGURE= yes
MAKE_ENV+= CCFLAGS="${CFLAGS}"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Authen::TacacsPlus.3
pre-build:
diff --git a/security/p5-Authen-TacacsPlus/pkg-plist b/security/p5-Authen-TacacsPlus/pkg-plist
index a3e351b9e59b..0140da6a61cf 100644
--- a/security/p5-Authen-TacacsPlus/pkg-plist
+++ b/security/p5-Authen-TacacsPlus/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen/TacacsPlus.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Authen/TacacsPlus.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
diff --git a/security/p5-Authen-Ticket/Makefile b/security/p5-Authen-Ticket/Makefile
index 71a84982a8a8..f429ee9b2fe6 100644
--- a/security/p5-Authen-Ticket/Makefile
+++ b/security/p5-Authen-Ticket/Makefile
@@ -17,6 +17,5 @@ COMMENT= Perl module providing the framework for implementing a ticketing system
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Authen-Ticket/pkg-plist b/security/p5-Authen-Ticket/pkg-plist
index c96c9b373fe2..87b02d1b9624 100644
--- a/security/p5-Authen-Ticket/pkg-plist
+++ b/security/p5-Authen-Ticket/pkg-plist
@@ -2,12 +2,12 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Authen::Ticket.3
lib/perl5/%%PERL_VERSION%%/man/man3/Authen::Ticket::Client.3
lib/perl5/%%PERL_VERSION%%/man/man3/Authen::Ticket::Server.3
lib/perl5/%%PERL_VERSION%%/man/man3/Authen::Ticket::Signature.3
-lib/perl5/site_perl/%%PERL_VER%%/Authen/Ticket.pm
-lib/perl5/site_perl/%%PERL_VER%%/Authen/Ticket/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Authen/Ticket/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Authen/Ticket/Signature.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Ticket/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Ticket
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Authen/Ticket
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Authen 2>/dev/null || true
+%%SITE_PERL%%/Authen/Ticket.pm
+%%SITE_PERL%%/Authen/Ticket/Client.pm
+%%SITE_PERL%%/Authen/Ticket/Server.pm
+%%SITE_PERL%%/Authen/Ticket/Signature.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Ticket/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Ticket
+@dirrm %%SITE_PERL%%/Authen/Ticket
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true
diff --git a/security/p5-Crypt-Blowfish/Makefile b/security/p5-Crypt-Blowfish/Makefile
index 7a775e4e7291..7e38815d4ece 100644
--- a/security/p5-Crypt-Blowfish/Makefile
+++ b/security/p5-Crypt-Blowfish/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Crypt::Blowfish.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-Blowfish/pkg-plist b/security/p5-Crypt-Blowfish/pkg-plist
index 2db6023eade1..e7a7883aa25d 100644
--- a/security/p5-Crypt-Blowfish/pkg-plist
+++ b/security/p5-Crypt-Blowfish/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/Blowfish.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Blowfish.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Blowfish_PP/Makefile b/security/p5-Crypt-Blowfish_PP/Makefile
index 9ee72285ac64..0c0c36f8d715 100644
--- a/security/p5-Crypt-Blowfish_PP/Makefile
+++ b/security/p5-Crypt-Blowfish_PP/Makefile
@@ -18,6 +18,5 @@ COMMENT= Blowfish encryption algorithm implemented purely in Perl
PERL_CONFIGURE= yes
MAN3= Crypt::Blowfish_PP.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-Blowfish_PP/pkg-plist b/security/p5-Crypt-Blowfish_PP/pkg-plist
index 95c0078786ad..59bb9f1990f9 100644
--- a/security/p5-Crypt-Blowfish_PP/pkg-plist
+++ b/security/p5-Crypt-Blowfish_PP/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Blowfish_PP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/Blowfish_PP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-CBC/Makefile b/security/p5-Crypt-CBC/Makefile
index 1b90eca61278..838e2190cdd7 100644
--- a/security/p5-Crypt-CBC/Makefile
+++ b/security/p5-Crypt-CBC/Makefile
@@ -22,7 +22,7 @@ MAN3= Crypt::CBC.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-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
.endif
.include <bsd.port.post.mk>
diff --git a/security/p5-Crypt-CBC/pkg-plist b/security/p5-Crypt-CBC/pkg-plist
index e45a02b30e70..fefc24052297 100644
--- a/security/p5-Crypt-CBC/pkg-plist
+++ b/security/p5-Crypt-CBC/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CBC/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CBC
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/CBC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBC/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBC
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-CipherSaber/Makefile b/security/p5-Crypt-CipherSaber/Makefile
index 571ba4b17b98..4da29e6a61f7 100644
--- a/security/p5-Crypt-CipherSaber/Makefile
+++ b/security/p5-Crypt-CipherSaber/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module providing an OO interface to CipherSaber encryption
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::CipherSaber.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-CipherSaber/pkg-plist b/security/p5-Crypt-CipherSaber/pkg-plist
index a2c3ba7ed099..45c0dc1c90ec 100644
--- a/security/p5-Crypt-CipherSaber/pkg-plist
+++ b/security/p5-Crypt-CipherSaber/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/CipherSaber.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/CipherSaber.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Cracklib/Makefile b/security/p5-Crypt-Cracklib/Makefile
index bc8311738655..35d112558448 100644
--- a/security/p5-Crypt-Cracklib/Makefile
+++ b/security/p5-Crypt-Cracklib/Makefile
@@ -18,11 +18,10 @@ COMMENT= Perl interface to Alec Muffet's cracklib library
BUILD_DEPENDS= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
CONFIGURE_ARGS+=INC="-I${LOCALBASE}/include"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::Cracklib.3
post-patch:
diff --git a/security/p5-Crypt-Cracklib/pkg-plist b/security/p5-Crypt-Cracklib/pkg-plist
index b5b312c6f8c8..9f9abbdb3788 100644
--- a/security/p5-Crypt-Cracklib/pkg-plist
+++ b/security/p5-Crypt-Cracklib/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/Cracklib.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Cracklib
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cracklib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Cryptix/Makefile b/security/p5-Crypt-Cryptix/Makefile
index a984af011835..0c60fc3c1ab6 100644
--- a/security/p5-Crypt-Cryptix/Makefile
+++ b/security/p5-Crypt-Cryptix/Makefile
@@ -23,6 +23,5 @@ MAN3= Crypt::DES.3 \
Math::BigInteger.3 \
Math::TrulyRandom.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-Cryptix/pkg-plist b/security/p5-Crypt-Cryptix/pkg-plist
index 8adb8d1e9898..e46166dcc412 100644
--- a/security/p5-Crypt-Cryptix/pkg-plist
+++ b/security/p5-Crypt-Cryptix/pkg-plist
@@ -1,88 +1,88 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/PRSG/PRSG.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/PRSG/PRSG.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BigInteger/BigInteger.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BigInteger/BigInteger.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SHA0/SHA0.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SHA0/SHA0.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SHA/SHA.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SHA/SHA.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/MD5/MD5.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/MD5/MD5.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cryptix/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/StringInput.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/DataEncoding.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/DataInput.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/DataOutput.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/Streamable.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/FileOutput.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/FileInput.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/IO.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream/StringOutput.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/Random.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/PseudoRandomStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/TestPrime.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/PRSG.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/BigInteger.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/BigInteger.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/MPI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/PRSG.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/TrulyRandom.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math/TrulyRandom.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/RSAKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/RSAPublicKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/HashMD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DES.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/ECB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/StreamCipher.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/IDEA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/CFB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/HashSHA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/HashSHA0.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/Blowfish.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/CSRandomStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SHA0.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/MessageHash.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DES.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/MessageDigest.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SHA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/RSAKeyGen.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/IDEA.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/BlockCipher.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DES3EDE.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/Blowfish.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/RSASecretKeyPair.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DSA/PublicKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DSA/SecretKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DSA/KeyGen.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DSA/NOTES
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/ElGamal/NOTES
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/ElGamal/KeyGen.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/ElGamal/PublicKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/ElGamal/SecretKey.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/TrulyRandom
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/PRSG
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BigInteger
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cryptix
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SHA0
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SHA
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/MD5
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DES
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Stream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/ElGamal
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DSA
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom/TrulyRandom.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/PRSG/PRSG.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/PRSG/PRSG.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInteger/BigInteger.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInteger/BigInteger.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SHA0/SHA0.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SHA0/SHA0.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SHA/SHA.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SHA/SHA.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MD5/MD5.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MD5/MD5.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cryptix/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/StringInput.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/DataEncoding.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/DataInput.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/DataOutput.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/Streamable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/FileOutput.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/FileInput.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/IO.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Stream/StringOutput.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/PseudoRandomStream.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/TestPrime.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/PRSG.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/BigInteger.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/BigInteger.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/MPI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/PRSG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/TrulyRandom.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/TrulyRandom.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RSAKey.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RSAPublicKey.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/HashMD5.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DES.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/ECB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/StreamCipher.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/MD5.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/IDEA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/CFB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/HashSHA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/HashSHA0.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Blowfish.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/CSRandomStream.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SHA0.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/MessageHash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DES.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/MessageDigest.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SHA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RSAKeyGen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/IDEA.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/BlockCipher.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DES3EDE.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Blowfish.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/CBC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RSASecretKeyPair.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DSA/PublicKey.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DSA/SecretKey.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DSA/KeyGen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DSA/NOTES
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/ElGamal/NOTES
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/ElGamal/KeyGen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/ElGamal/PublicKey.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/ElGamal/SecretKey.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/PRSG
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInteger
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cryptix
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SHA0
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SHA
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MD5
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Stream
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/ElGamal
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DSA
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 144e4af8dc19..5a63e46740c5 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 interface to DES block cipher
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::DES.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-DES/pkg-plist b/security/p5-Crypt-DES/pkg-plist
index 3edef572b78d..bf40e2183b1c 100644
--- a/security/p5-Crypt-DES/pkg-plist
+++ b/security/p5-Crypt-DES/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/DES.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DES/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DES
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/DES.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
diff --git a/security/p5-Crypt-DES_EDE3/Makefile b/security/p5-Crypt-DES_EDE3/Makefile
index c3e15f838bc1..a0ce10f9ba38 100644
--- a/security/p5-Crypt-DES_EDE3/Makefile
+++ b/security/p5-Crypt-DES_EDE3/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jesper@FreeBSD.org
COMMENT= Perl5 interface to a implementing 3-DES EDE encryption and decryption
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::DES_EDE3.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-DES_EDE3/pkg-plist b/security/p5-Crypt-DES_EDE3/pkg-plist
index 79686ec84530..fc7de7edbb79 100644
--- a/security/p5-Crypt-DES_EDE3/pkg-plist
+++ b/security/p5-Crypt-DES_EDE3/pkg-plist
@@ -1 +1 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DES_EDE3.pm
+%%SITE_PERL%%/Crypt/DES_EDE3.pm
diff --git a/security/p5-Crypt-DH/Makefile b/security/p5-Crypt-DH/Makefile
index 8fe8d281975e..64a5b4753509 100644
--- a/security/p5-Crypt-DH/Makefile
+++ b/security/p5-Crypt-DH/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jesper@FreeBSD.org
COMMENT= Perl5 interface to a Diffie-Hellman key exchange system
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Crypt/Random.pm:${PORTSDIR}/security/p5-Crypt-Random
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
+ ${SITE_PERL}/Crypt/Random.pm:${PORTSDIR}/security/p5-Crypt-Random
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::DH.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-DH/pkg-plist b/security/p5-Crypt-DH/pkg-plist
index dd2727e9a53c..ddc9a76e48c2 100644
--- a/security/p5-Crypt-DH/pkg-plist
+++ b/security/p5-Crypt-DH/pkg-plist
@@ -1 +1 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DH.pm
+%%SITE_PERL%%/Crypt/DH.pm
diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile
index 583f4518c685..1fd63e2c1a0d 100644
--- a/security/p5-Crypt-DSA/Makefile
+++ b/security/p5-Crypt-DSA/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
COMMENT= DSA signature and key generation
-PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERLBASE= ${SITE_PERL}
BUILD_DEPENDS= ${PERLBASE}/Crypt/Random.pm:${PORTSDIR}/security/p5-Crypt-Random \
${PERLBASE}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
@@ -25,7 +25,6 @@ BUILD_DEPENDS= ${PERLBASE}/Crypt/Random.pm:${PORTSDIR}/security/p5-Crypt-Random
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::DSA::Key::SSH2.3 Crypt::DSA.3 Crypt::DSA::Key.3 \
Crypt::DSA::Key::PEM.3 Crypt::DSA::Signature.3 \
Crypt::DSA::KeyChain.3 Crypt::DSA::Util.3
diff --git a/security/p5-Crypt-DSA/pkg-plist b/security/p5-Crypt-DSA/pkg-plist
index c1d778730033..a5c46891aa3e 100644
--- a/security/p5-Crypt-DSA/pkg-plist
+++ b/security/p5-Crypt-DSA/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA/Key/SSH2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA/Key/PEM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA/Key.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA/Signature.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA/KeyChain.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DSA/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA/Key
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/DSA
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/DSA
+%%SITE_PERL%%/Crypt/DSA/Key/SSH2.pm
+%%SITE_PERL%%/Crypt/DSA/Key/PEM.pm
+%%SITE_PERL%%/Crypt/DSA/Key.pm
+%%SITE_PERL%%/Crypt/DSA/Signature.pm
+%%SITE_PERL%%/Crypt/DSA/KeyChain.pm
+%%SITE_PERL%%/Crypt/DSA/Util.pm
+%%SITE_PERL%%/Crypt/DSA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DSA/.packlist
+@dirrm %%SITE_PERL%%/Crypt/DSA/Key
+@dirrm %%SITE_PERL%%/Crypt/DSA
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DSA
diff --git a/security/p5-Crypt-ECB/Makefile b/security/p5-Crypt-ECB/Makefile
index 26baad4ec6fb..a406f9474412 100644
--- a/security/p5-Crypt-ECB/Makefile
+++ b/security/p5-Crypt-ECB/Makefile
@@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-2//}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::ECB.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-ECB/pkg-plist b/security/p5-Crypt-ECB/pkg-plist
index e5326fa0d08a..9de44d23c92e 100644
--- a/security/p5-Crypt-ECB/pkg-plist
+++ b/security/p5-Crypt-ECB/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/ECB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/ECB/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/ECB
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/ECB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/ECB/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/ECB
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-HCE_SHA/Makefile b/security/p5-Crypt-HCE_SHA/Makefile
index d77e4411f295..6dae8454d88f 100644
--- a/security/p5-Crypt-HCE_SHA/Makefile
+++ b/security/p5-Crypt-HCE_SHA/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl5 interface to one way hash chaining block cipher
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -25,8 +25,8 @@ MAN3= Crypt::HCE_SHA.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
.endif
.include <bsd.port.post.mk>
diff --git a/security/p5-Crypt-HCE_SHA/pkg-plist b/security/p5-Crypt-HCE_SHA/pkg-plist
index 7f3cfd6004ef..6bff173d3f9c 100644
--- a/security/p5-Crypt-HCE_SHA/pkg-plist
+++ b/security/p5-Crypt-HCE_SHA/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/HCE_SHA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/HCE_SHA/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/HCE_SHA/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/HCE_SHA
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/HCE_SHA
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/HCE_SHA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_SHA/.packlist
+%%SITE_PERL%%/auto/Crypt/HCE_SHA/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_SHA
+@dirrm %%SITE_PERL%%/auto/Crypt/HCE_SHA
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index 2c7ad01b09f8..703802784388 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 interface to IDEA block cipher
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::IDEA.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-IDEA/pkg-plist b/security/p5-Crypt-IDEA/pkg-plist
index f7406776a740..1fc47168387a 100644
--- a/security/p5-Crypt-IDEA/pkg-plist
+++ b/security/p5-Crypt-IDEA/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/IDEA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/IDEA.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/IDEA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/IDEA.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
diff --git a/security/p5-Crypt-OTP/Makefile b/security/p5-Crypt-OTP/Makefile
index 766530faacd1..337b4164ad10 100644
--- a/security/p5-Crypt-OTP/Makefile
+++ b/security/p5-Crypt-OTP/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl implementation of the One Time Pad (hence, OTP) encryption method
PERL_CONFIGURE= yes
MAN3= Crypt::OTP.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-OTP/pkg-plist b/security/p5-Crypt-OTP/pkg-plist
index 8894a74d9a8d..639fd6c5ce84 100644
--- a/security/p5-Crypt-OTP/pkg-plist
+++ b/security/p5-Crypt-OTP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/OTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OTP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OTP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/OTP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OTP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OTP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-OpenSSL-DSA/Makefile b/security/p5-Crypt-OpenSSL-DSA/Makefile
index b99ac219fb96..f7daf3e66db6 100644
--- a/security/p5-Crypt-OpenSSL-DSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-DSA/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Crypt::OpenSSL::DSA.3 Crypt::OpenSSL::DSA::Signature.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-OpenSSL-DSA/pkg-plist b/security/p5-Crypt-OpenSSL-DSA/pkg-plist
index ab15e7d54526..a9319dfbf5fa 100644
--- a/security/p5-Crypt-OpenSSL-DSA/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-DSA/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA/Signature.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/DSA.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/DSA.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA/Signature.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/DSA.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/DSA.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile
index 21defef46567..d19df66b3fde 100644
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
COMMENT= Perl5 module to RSA encode and decode strings using OpenSSL
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/OpenSSL/Random.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/Random.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Crypt::OpenSSL::RSA.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-OpenSSL-RSA/pkg-plist b/security/p5-Crypt-OpenSSL-RSA/pkg-plist
index 7787226c9545..f10fe03ffb87 100644
--- a/security/p5-Crypt-OpenSSL-RSA/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-RSA/pkg-plist
@@ -1,27 +1,27 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/OpenSSL/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/RSA.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/RSA.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/DESTROY.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/_new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/_set_padding_mode.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/generate_key.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_key_parameters.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_padding_mode.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_private_key_string.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_public_key_string.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/import_random_seed.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/load_private_key.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/load_public_key.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_key_from_parameters.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_private_key.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_public_key.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/set_padding_mode.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/use_sslv23_padding.al
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/RSA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/RSA.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/RSA.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/DESTROY.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/_new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/_set_padding_mode.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/generate_key.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_key_parameters.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_padding_mode.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_private_key_string.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/get_public_key_string.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/import_random_seed.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/load_private_key.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/load_public_key.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_key_from_parameters.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_private_key.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_public_key.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/set_padding_mode.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/use_sslv23_padding.al
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-OpenSSL-Random/Makefile b/security/p5-Crypt-OpenSSL-Random/Makefile
index 26f0a2a268c3..5a129752c632 100644
--- a/security/p5-Crypt-OpenSSL-Random/Makefile
+++ b/security/p5-Crypt-OpenSSL-Random/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Crypt::OpenSSL::Random.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-OpenSSL-Random/pkg-plist b/security/p5-Crypt-OpenSSL-Random/pkg-plist
index 110caabb12a3..61d813d6a70d 100644
--- a/security/p5-Crypt-OpenSSL-Random/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-Random/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/OpenSSL/Random.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/autosplit.ix
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Random.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/autosplit.ix
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-PGPSimple/Makefile b/security/p5-Crypt-PGPSimple/Makefile
index 2274a70b829c..2258146098ab 100644
--- a/security/p5-Crypt-PGPSimple/Makefile
+++ b/security/p5-Crypt-PGPSimple/Makefile
@@ -20,6 +20,5 @@ RUN_DEPENDS= ${LOCALBASE}/bin/pgp:${PORTSDIR}/security/pgp
PERL_CONFIGURE= yes
MAN3= Crypt::PGPSimple.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-PGPSimple/pkg-plist b/security/p5-Crypt-PGPSimple/pkg-plist
index 8f930faf73f9..94256c17c920 100644
--- a/security/p5-Crypt-PGPSimple/pkg-plist
+++ b/security/p5-Crypt-PGPSimple/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/PGPSimple.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple/.packlist
+%%SITE_PERL%%/Crypt/PGPSimple.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-PassGen/Makefile b/security/p5-Crypt-PassGen/Makefile
index ae823dd622ad..da10d31d3a24 100644
--- a/security/p5-Crypt-PassGen/Makefile
+++ b/security/p5-Crypt-PassGen/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Crypt::PassGen - Generate a random password that looks like a real word
-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
MAN3= Crypt::PassGen.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-PassGen/pkg-plist b/security/p5-Crypt-PassGen/pkg-plist
index 1219a265e71a..032d181adc56 100644
--- a/security/p5-Crypt-PassGen/pkg-plist
+++ b/security/p5-Crypt-PassGen/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/PassGen/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/PassGenWordFreq.dat
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/PassGen.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/PassGen
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PassGen/.packlist
+%%SITE_PERL%%/Crypt/PassGenWordFreq.dat
+%%SITE_PERL%%/Crypt/PassGen.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PassGen
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-PasswdMD5/pkg-plist b/security/p5-Crypt-PasswdMD5/pkg-plist
index 59283eb97b48..8c4cec1a92c1 100644
--- a/security/p5-Crypt-PasswdMD5/pkg-plist
+++ b/security/p5-Crypt-PasswdMD5/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/PasswdMD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/PasswdMD5/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/PasswdMD5.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PasswdMD5/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index 62201314ecd9..c603f5c03f9c 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
COMMENT= Provable Prime Number Generator suitable for Cryptographic Applications
-PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERLBASE= ${SITE_PERL}
BUILD_DEPENDS= ${PERLBASE}/Crypt/Random.pm:${PORTSDIR}/security/p5-Crypt-Random \
${PERLBASE}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::Primes.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-RC4/Makefile b/security/p5-Crypt-RC4/Makefile
index 066d7888f92d..ec1b5ac8d887 100644
--- a/security/p5-Crypt-RC4/Makefile
+++ b/security/p5-Crypt-RC4/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl implementation of the RC4 encryption algorithm
PERL_CONFIGURE= yes
MAN3= Crypt::RC4.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-RC4/pkg-plist b/security/p5-Crypt-RC4/pkg-plist
index 709e992f69c5..a70c3b1acec9 100644
--- a/security/p5-Crypt-RC4/pkg-plist
+++ b/security/p5-Crypt-RC4/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RC4.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RC4/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RC4
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/RC4.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC4/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC4
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-RC5/Makefile b/security/p5-Crypt-RC5/Makefile
index a8fd4d7e950a..40e7019651ef 100644
--- a/security/p5-Crypt-RC5/Makefile
+++ b/security/p5-Crypt-RC5/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Crypt::RC5.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-RC5/pkg-plist b/security/p5-Crypt-RC5/pkg-plist
index a8d326e25262..5b5822b99979 100644
--- a/security/p5-Crypt-RC5/pkg-plist
+++ b/security/p5-Crypt-RC5/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RC5.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RC5/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RC5
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/RC5.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC5/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC5
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-RC6/Makefile b/security/p5-Crypt-RC6/Makefile
index 5b69602c5884..81323cdeb74b 100644
--- a/security/p5-Crypt-RC6/Makefile
+++ b/security/p5-Crypt-RC6/Makefile
@@ -21,7 +21,6 @@ PERL_CONFIGURE= yes
MAN3= Crypt::RC6.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-patch:
${REINPLACE_CMD} -e 's/ //' ${WRKSRC}/RC6.pm
diff --git a/security/p5-Crypt-RC6/pkg-plist b/security/p5-Crypt-RC6/pkg-plist
index b3fb7cbf2eb3..c3441f96c83e 100644
--- a/security/p5-Crypt-RC6/pkg-plist
+++ b/security/p5-Crypt-RC6/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/RC6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RC6/RC6.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RC6/RC6.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RC6/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RC6
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RC6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/RC6.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/RC6.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-RIPEMD160/Makefile b/security/p5-Crypt-RIPEMD160/Makefile
index 6e76df513b4e..aa3e34349ecb 100644
--- a/security/p5-Crypt-RIPEMD160/Makefile
+++ b/security/p5-Crypt-RIPEMD160/Makefile
@@ -17,7 +17,6 @@ COMMENT= RIPEMD-160 message digest algorithm
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::RIPEMD160::MAC.3 Crypt::RIPEMD160.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-RIPEMD160/pkg-plist b/security/p5-Crypt-RIPEMD160/pkg-plist
index afa248db53cd..0560b276a2e4 100644
--- a/security/p5-Crypt-RIPEMD160/pkg-plist
+++ b/security/p5-Crypt-RIPEMD160/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/RIPEMD160.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/RIPEMD160.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/RIPEMD160.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/RIPEMD160/MAC.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/RIPEMD160
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/RIPEMD160.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/RIPEMD160.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160/MAC.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index 4a4efbcae007..1ef5294ae978 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
COMMENT= RSA public-key cryptosystem
-PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERLBASE= ${SITE_PERL}
BUILD_DEPENDS= ${PERLBASE}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
${PERLBASE}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5-Crypt-Blowfish \
@@ -33,7 +33,6 @@ BUILD_DEPENDS= ${PERLBASE}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-D
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::RSA::Key.3 Crypt::RSA::SS::PSS.3 \
Crypt::RSA::Primitives.3 Crypt::RSA::ES::OAEP.3 \
Crypt::RSA.3 Crypt::RSA::SS::PKCS1v15.3 \
diff --git a/security/p5-Crypt-RSA/pkg-plist b/security/p5-Crypt-RSA/pkg-plist
index 843b9a33b039..7eb7882cc609 100644
--- a/security/p5-Crypt-RSA/pkg-plist
+++ b/security/p5-Crypt-RSA/pkg-plist
@@ -1,22 +1,22 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Key.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/SS/PSS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/SS/PKCS1v15.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/ES/OAEP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/ES/PKCS1v15.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Primitives.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Key/Private/SSH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Key/Private.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Key/Public/SSH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Key/Public.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/DataFormat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Errorhandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RSA/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/ES
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Key/Private
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Key/Public
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/Key
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA/SS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/RSA
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RSA
+%%SITE_PERL%%/Crypt/RSA/Key.pm
+%%SITE_PERL%%/Crypt/RSA/SS/PSS.pm
+%%SITE_PERL%%/Crypt/RSA/SS/PKCS1v15.pm
+%%SITE_PERL%%/Crypt/RSA/ES/OAEP.pm
+%%SITE_PERL%%/Crypt/RSA/ES/PKCS1v15.pm
+%%SITE_PERL%%/Crypt/RSA/Primitives.pm
+%%SITE_PERL%%/Crypt/RSA/Key/Private/SSH.pm
+%%SITE_PERL%%/Crypt/RSA/Key/Private.pm
+%%SITE_PERL%%/Crypt/RSA/Key/Public/SSH.pm
+%%SITE_PERL%%/Crypt/RSA/Key/Public.pm
+%%SITE_PERL%%/Crypt/RSA/DataFormat.pm
+%%SITE_PERL%%/Crypt/RSA/Debug.pm
+%%SITE_PERL%%/Crypt/RSA/Errorhandler.pm
+%%SITE_PERL%%/Crypt/RSA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA/.packlist
+@dirrm %%SITE_PERL%%/Crypt/RSA/ES
+@dirrm %%SITE_PERL%%/Crypt/RSA/Key/Private
+@dirrm %%SITE_PERL%%/Crypt/RSA/Key/Public
+@dirrm %%SITE_PERL%%/Crypt/RSA/Key
+@dirrm %%SITE_PERL%%/Crypt/RSA/SS
+@dirrm %%SITE_PERL%%/Crypt/RSA
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA
diff --git a/security/p5-Crypt-RandPasswd/Makefile b/security/p5-Crypt-RandPasswd/Makefile
index 9c827a6d5c68..795eb8af7d19 100644
--- a/security/p5-Crypt-RandPasswd/Makefile
+++ b/security/p5-Crypt-RandPasswd/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An implementation of the Automated Password Generator standard
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::RandPasswd.3
diff --git a/security/p5-Crypt-RandPasswd/pkg-plist b/security/p5-Crypt-RandPasswd/pkg-plist
index 368ae693603c..2a61d9fc57f7 100644
--- a/security/p5-Crypt-RandPasswd/pkg-plist
+++ b/security/p5-Crypt-RandPasswd/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/RandPasswd.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RandPasswd/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/RandPasswd
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt
+%%SITE_PERL%%/Crypt/RandPasswd.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RandPasswd/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RandPasswd
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrm %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index ba3054526bbc..34506f00a7ec 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
COMMENT= Cryptographically Secure, True Random Number Generator
-PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERLBASE= ${SITE_PERL}
BUILD_DEPENDS= ${PERLBASE}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
${PERLBASE}/Class/Loader.pm:${PORTSDIR}/devel/p5-Class-Loader
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::Random.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-Random/pkg-plist b/security/p5-Crypt-Random/pkg-plist
index 0fe77e1737f8..acf0ccebad69 100644
--- a/security/p5-Crypt-Random/pkg-plist
+++ b/security/p5-Crypt-Random/pkg-plist
@@ -1,14 +1,14 @@
bin/makerandom
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random/Provider/rand.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random/Provider/devurandom.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random/Provider/egd.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random/Provider/devrandom.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random/Provider/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random/Generator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Random/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random/Provider
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Crypt/Random
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Random
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/Random/Provider/rand.pm
+%%SITE_PERL%%/Crypt/Random/Provider/devurandom.pm
+%%SITE_PERL%%/Crypt/Random/Provider/egd.pm
+%%SITE_PERL%%/Crypt/Random/Provider/devrandom.pm
+%%SITE_PERL%%/Crypt/Random/Provider/File.pm
+%%SITE_PERL%%/Crypt/Random/Generator.pm
+%%SITE_PERL%%/Crypt/Random.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random/.packlist
+@dirrm %%SITE_PERL%%/Crypt/Random/Provider
+@dirrm %%SITE_PERL%%/Crypt/Random
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Rijndael/pkg-plist b/security/p5-Crypt-Rijndael/pkg-plist
index 1d735b701ff0..cc0dc16563d7 100644
--- a/security/p5-Crypt-Rijndael/pkg-plist
+++ b/security/p5-Crypt-Rijndael/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/Rijndael.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Rijndael
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Rijndael.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile
index 6ab86cffe4b4..cf669a2ff920 100644
--- a/security/p5-Crypt-SSLeay/Makefile
+++ b/security/p5-Crypt-SSLeay/Makefile
@@ -15,21 +15,20 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Perl5 interface to allow p5-libwww LWP to make https connections
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI/URL.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS= ${SITE_PERL}/URI/URL.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
CONFIGURE_ARGS+= "/usr"
USE_OPENSSL= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::SSLeay.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
.endif
.include <bsd.port.post.mk>
diff --git a/security/p5-Crypt-SSLeay/pkg-plist b/security/p5-Crypt-SSLeay/pkg-plist
index a04feb9a3c3e..04e1619975df 100644
--- a/security/p5-Crypt-SSLeay/pkg-plist
+++ b/security/p5-Crypt-SSLeay/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/Conn.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/CTX.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/Err.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/MainContext.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/X509.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/SSL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/Conn.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/CTX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/Err.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/MainContext.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay/X509.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Serpent/Makefile b/security/p5-Crypt-Serpent/Makefile
index 99736f916e34..d268de32e399 100644
--- a/security/p5-Crypt-Serpent/Makefile
+++ b/security/p5-Crypt-Serpent/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Crypt::Serpent.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-Serpent/pkg-plist b/security/p5-Crypt-Serpent/pkg-plist
index 17f5c79924ae..03e7e9c7379d 100644
--- a/security/p5-Crypt-Serpent/pkg-plist
+++ b/security/p5-Crypt-Serpent/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/Serpent.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Serpent/Serpent.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Serpent/Serpent.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Serpent/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Serpent
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Serpent.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/Serpent.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/Serpent.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Solitaire/Makefile b/security/p5-Crypt-Solitaire/Makefile
index da4732e0e409..c30bf5533f34 100644
--- a/security/p5-Crypt-Solitaire/Makefile
+++ b/security/p5-Crypt-Solitaire/Makefile
@@ -18,6 +18,5 @@ COMMENT= Solitaire encryption
PERL_CONFIGURE= yes
MAN3= Crypt::Solitaire.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-Solitaire/pkg-plist b/security/p5-Crypt-Solitaire/pkg-plist
index ca65cac4688e..6cd45923cd41 100644
--- a/security/p5-Crypt-Solitaire/pkg-plist
+++ b/security/p5-Crypt-Solitaire/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/Solitaire.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/Solitaire/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Solitaire/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Solitaire
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt/Solitaire
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/Solitaire.pm
+%%SITE_PERL%%/auto/Crypt/Solitaire/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Solitaire/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Solitaire
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/Crypt/Solitaire
+@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-TripleDES/Makefile b/security/p5-Crypt-TripleDES/Makefile
index 1424dada357c..fd7dd26b151c 100644
--- a/security/p5-Crypt-TripleDES/Makefile
+++ b/security/p5-Crypt-TripleDES/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module implementing the Triple-DES cipher
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::TripleDES.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-TripleDES/pkg-plist b/security/p5-Crypt-TripleDES/pkg-plist
index 77b2f78e40b5..79a3db025a97 100644
--- a/security/p5-Crypt-TripleDES/pkg-plist
+++ b/security/p5-Crypt-TripleDES/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/PPDES.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/TripleDES.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/TripleDES/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/TripleDES
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/PPDES.pm
+%%SITE_PERL%%/Crypt/TripleDES.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TripleDES/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TripleDES
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Twofish/pkg-plist b/security/p5-Crypt-Twofish/pkg-plist
index 5c7005470c93..347fe0fd504c 100644
--- a/security/p5-Crypt-Twofish/pkg-plist
+++ b/security/p5-Crypt-Twofish/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/Twofish.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Twofish.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Twofish2/Makefile b/security/p5-Crypt-Twofish2/Makefile
index 445e2e6ac62f..29ea2311c637 100644
--- a/security/p5-Crypt-Twofish2/Makefile
+++ b/security/p5-Crypt-Twofish2/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Crypt::Twofish2.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-Twofish2/pkg-plist b/security/p5-Crypt-Twofish2/pkg-plist
index bff8eed7a8d8..77712f93ec35 100644
--- a/security/p5-Crypt-Twofish2/pkg-plist
+++ b/security/p5-Crypt-Twofish2/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/Twofish2.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish2
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Twofish2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-UnixCrypt/Makefile b/security/p5-Crypt-UnixCrypt/Makefile
index feafc5856cab..895070ad43d0 100644
--- a/security/p5-Crypt-UnixCrypt/Makefile
+++ b/security/p5-Crypt-UnixCrypt/Makefile
@@ -15,10 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl module implementing crypt(3) function
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Crypt::UnixCrypt.3
.include <bsd.port.mk>
diff --git a/security/p5-Crypt-UnixCrypt/pkg-plist b/security/p5-Crypt-UnixCrypt/pkg-plist
index 15b19cbb4f48..302e0f58561d 100644
--- a/security/p5-Crypt-UnixCrypt/pkg-plist
+++ b/security/p5-Crypt-UnixCrypt/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/UnixCrypt.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
+%%SITE_PERL%%/Crypt/UnixCrypt.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Digest-BubbleBabble/Makefile b/security/p5-Digest-BubbleBabble/Makefile
index 2e0e90a43e9f..13fa80016842 100644
--- a/security/p5-Digest-BubbleBabble/Makefile
+++ b/security/p5-Digest-BubbleBabble/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 interface to a fingerprint in "bubble babble" format
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Digest::BubbleBabble.3
.include <bsd.port.mk>
diff --git a/security/p5-Digest-BubbleBabble/pkg-plist b/security/p5-Digest-BubbleBabble/pkg-plist
index ae4ea50af9b7..b5cccaadd591 100644
--- a/security/p5-Digest-BubbleBabble/pkg-plist
+++ b/security/p5-Digest-BubbleBabble/pkg-plist
@@ -1 +1 @@
-lib/perl5/site_perl/%%PERL_VER%%/Digest/BubbleBabble.pm
+%%SITE_PERL%%/Digest/BubbleBabble.pm
diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile
index 3f766540fa32..99e3558aaf6e 100644
--- a/security/p5-Digest-HMAC/Makefile
+++ b/security/p5-Digest-HMAC/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
COMMENT= Perl5 interface to HMAC Message-Digest Algorithms
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Digest::HMAC.3 \
Digest::HMAC_MD5.3 \
Digest::HMAC_SHA1.3
@@ -28,7 +27,7 @@ MAN3= Digest::HMAC.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
.endif
.include <bsd.port.post.mk>
diff --git a/security/p5-Digest-HMAC/pkg-plist b/security/p5-Digest-HMAC/pkg-plist
index c373881c8779..350bd43d71ce 100644
--- a/security/p5-Digest-HMAC/pkg-plist
+++ b/security/p5-Digest-HMAC/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Digest/HMAC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Digest/HMAC_MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/Digest/HMAC_SHA1.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/HMAC/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/HMAC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Digest 2>/dev/null || true
+%%SITE_PERL%%/Digest/HMAC.pm
+%%SITE_PERL%%/Digest/HMAC_MD5.pm
+%%SITE_PERL%%/Digest/HMAC_SHA1.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true
diff --git a/security/p5-Digest-MD2/Makefile b/security/p5-Digest-MD2/Makefile
index 22eba3a6edd4..1a9cce6dea5f 100644
--- a/security/p5-Digest-MD2/Makefile
+++ b/security/p5-Digest-MD2/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 interface to the MD2 message digest algorithm
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Digest::MD2.3
.include <bsd.port.mk>
diff --git a/security/p5-Digest-MD2/pkg-plist b/security/p5-Digest-MD2/pkg-plist
index 4d6705e8ce83..2f42d58fd055 100644
--- a/security/p5-Digest-MD2/pkg-plist
+++ b/security/p5-Digest-MD2/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Digest/MD2.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD2/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.bs
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD2
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.bs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
diff --git a/security/p5-Digest-MD4/Makefile b/security/p5-Digest-MD4/Makefile
index 0641b80e6c69..66e4d21099ee 100644
--- a/security/p5-Digest-MD4/Makefile
+++ b/security/p5-Digest-MD4/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl5 interface to the MD4 message digest algorithm
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Digest::MD4.3
.include <bsd.port.mk>
diff --git a/security/p5-Digest-Nilsimsa/Makefile b/security/p5-Digest-Nilsimsa/Makefile
index 7cffc0acb6f2..1357ab168dc3 100644
--- a/security/p5-Digest-Nilsimsa/Makefile
+++ b/security/p5-Digest-Nilsimsa/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl version of Nilsimsa code
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Digest::Nilsimsa.3
.include <bsd.port.mk>
diff --git a/security/p5-File-Scan/Makefile b/security/p5-File-Scan/Makefile
index 16595e9e974d..f45d620f7170 100644
--- a/security/p5-File-Scan/Makefile
+++ b/security/p5-File-Scan/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 anti-virus file scanning package
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= File::Scan.3
post-install:
diff --git a/security/p5-File-Scan/pkg-plist b/security/p5-File-Scan/pkg-plist
index a644d1648514..d04feba0f8f3 100644
--- a/security/p5-File-Scan/pkg-plist
+++ b/security/p5-File-Scan/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
-lib/perl5/site_perl/%%PERL_VER%%/File/Scan.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Scan/.packlist
+%%SITE_PERL%%/File/Scan.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan/.packlist
%%PORTDOCS%%%%DOCSDIR%%/Changes
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/README
@@ -15,6 +15,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Scan/.packlist
@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Scan
-@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
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan
+@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/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
index 1537265e215a..c76913aa51e4 100644
--- a/security/p5-Filter-CBC/Makefile
+++ b/security/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/security/p5-Filter-CBC/pkg-plist b/security/p5-Filter-CBC/pkg-plist
index 3e278b272f6d..94989c6b4e2b 100644
--- a/security/p5-Filter-CBC/pkg-plist
+++ b/security/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/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index 18b85da55db0..154cc45f6e00 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= trevor@FreeBSD.org
COMMENT= Perl module for interfacing with GnuPG
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker
+BUILD_DEPENDS= ${SITE_PERL}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker
RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
${BUILD_DEPENDS}
@@ -33,6 +33,5 @@ MAN3= GnuPG::Fingerprint.3 \
GnuPG::Signature.3 \
GnuPG::SubKey.3 \
GnuPG::UserId.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index 5f588a568fc3..768b4d356d83 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= scrappy@FreeBSD.org
COMMENT= Perl5 interface to SSL sockets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= IO::Socket::SSL.3
.include <bsd.port.mk>
diff --git a/security/p5-IO-Socket-SSL/pkg-plist b/security/p5-IO-Socket-SSL/pkg-plist
index 092f190608aa..93c72f97b80e 100644
--- a/security/p5-IO-Socket-SSL/pkg-plist
+++ b/security/p5-IO-Socket-SSL/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/IO/Socket/SSL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/SSL/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/SSL
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IO/Socket
-@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%%/IO 2>/dev/null || true
+%%SITE_PERL%%/IO/Socket/SSL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/SSL/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/SSL
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
+@dirrm %%SITE_PERL%%/IO/Socket
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 71e139755499..16a6ec88a73f 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -18,12 +18,11 @@ COMMENT= Perl5 interface to MD5 Message-Digest Algorithm
PERL_CONFIGURE= yes
MAN3= MD5.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
RUN_DEPENDS= ${BUILD_DEPENDS}
.endif
diff --git a/security/p5-MD5/pkg-plist b/security/p5-MD5/pkg-plist
index dd6f8d2553aa..b4d8a74a32be 100644
--- a/security/p5-MD5/pkg-plist
+++ b/security/p5-MD5/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MD5/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MD5
+%%SITE_PERL%%/MD5.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MD5/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MD5
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 454d694736f5..ae0c7904a0dc 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -20,7 +20,6 @@ PERL_CONFIGURE= yes
CONFIGURE_ARGS+= "/usr"
USE_OPENSSL= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::SSLeay.3 Net::SSLeay::Handle.3
PLDIR= ${PREFIX}/share/examples/p5-Net-SSLeay
diff --git a/security/p5-Net-SSLeay/pkg-plist b/security/p5-Net-SSLeay/pkg-plist
index 1cfc9aa1a639..961112a40b8d 100644
--- a/security/p5-Net-SSLeay/pkg-plist
+++ b/security/p5-Net-SSLeay/pkg-plist
@@ -1,48 +1,48 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/SSLeay.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/SSLeay/Handle.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/ptrtstrun.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/SSLeay.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/SSLeay.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/debug_read.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https2.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https3.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https4.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/dump_peer_certificate.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https3.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https4.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https3.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https4.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/https_cat.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/make_form.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/make_headers.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/new_x_ctx.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/open_proxy_tcp_connection.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/open_tcp_connection.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https3.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https4.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https3.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https4.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/randomize.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_cert_and_key.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_proxy.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_server_cert_and_key.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_CRLF.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_all.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_until.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_write_CRLF.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_write_all.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/sslcat.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_X509_lookup.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_nothing.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_read.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_write.al
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay/Handle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/ptrtstrun.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/SSLeay.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/SSLeay.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/debug_read.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https2.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https3.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/do_https4.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/dump_peer_certificate.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https3.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/get_https4.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https3.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/head_https4.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/https_cat.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/make_form.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/make_headers.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/new_x_ctx.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/open_proxy_tcp_connection.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/open_tcp_connection.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https3.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/post_https4.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https3.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/put_https4.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/randomize.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_cert_and_key.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_proxy.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/set_server_cert_and_key.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_CRLF.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_all.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_read_until.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_write_CRLF.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/ssl_write_all.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/sslcat.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_X509_lookup.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_nothing.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_read.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_write.al
%%PORTDOCS%%share/examples/p5-Net-SSLeay/bio.pl
%%PORTDOCS%%share/examples/p5-Net-SSLeay/bulk.pl
%%PORTDOCS%%share/examples/p5-Net-SSLeay/callback.pl
@@ -63,7 +63,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay/want_write.al
%%PORTDOCS%%share/examples/p5-Net-SSLeay/sslecho.pl
%%PORTDOCS%%share/examples/p5-Net-SSLeay/stdio_bulk.pl
%%PORTDOCS%%@dirrm share/examples/p5-Net-SSLeay
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSLeay
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/SSLeay
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index e61dcf25265f..e4373d5d39d9 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -19,7 +19,6 @@ PERL_CONFIGURE= yes
CONFIGURE_ARGS= PGPS=${PGPS} PGPV=${PGPV} PGPSTYLE=${PGPSTYLE}
MAN3= PGP::Sign.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
# If DEFAULTPGP isn't defined, it gets set to PGP2. If you don't like
# the values that this process assigns to PGP (or PGPV and PGPS) and
diff --git a/security/p5-PGP-Sign/pkg-plist b/security/p5-PGP-Sign/pkg-plist
index e1ad5fd0a295..a5f790989576 100644
--- a/security/p5-PGP-Sign/pkg-plist
+++ b/security/p5-PGP-Sign/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/PGP/Sign.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP/Sign/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP/Sign
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/PGP 2>/dev/null || true
+%%SITE_PERL%%/PGP/Sign.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Sign/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Sign
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/PGP 2>/dev/null || true
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index e4bf4e431b42..42a8a5e273c2 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= pgp:${PORTSDIR}/security/pgp
PERL_CONFIGURE= yes
MAN3= PGP::Pipe.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-configure:
@${CP} ${WRKSRC}/PGP/Pipe.pm ${WRKSRC}
diff --git a/security/p5-PGP/pkg-plist b/security/p5-PGP/pkg-plist
index c56b6d81003a..06439aa3748b 100644
--- a/security/p5-PGP/pkg-plist
+++ b/security/p5-PGP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/PGP/Pipe.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP/Pipe/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP/Pipe
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/PGP
+%%SITE_PERL%%/PGP/Pipe.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Pipe/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Pipe
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP
+@dirrm %%SITE_PERL%%/PGP
diff --git a/security/p5-SHA/Makefile b/security/p5-SHA/Makefile
index 816a343bbf63..9252dc28ec5e 100644
--- a/security/p5-SHA/Makefile
+++ b/security/p5-SHA/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 interface to the SHA1 algorithm
PERL_CONFIGURE= yes
MAN3= SHA.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-SHA/pkg-plist b/security/p5-SHA/pkg-plist
index ae5679f86e22..1cdf90388460 100644
--- a/security/p5-SHA/pkg-plist
+++ b/security/p5-SHA/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SHA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SHA.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/sha_driver.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SHA/SHA.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SHA/SHA.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SHA/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SHA/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SHA
+%%SITE_PERL%%/%%PERL_ARCH%%/SHA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SHA.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/sha_driver.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SHA/SHA.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SHA/SHA.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SHA/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SHA/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SHA
diff --git a/security/p5-Safe-Hole/Makefile b/security/p5-Safe-Hole/Makefile
index bad7cb928809..6548f61c1bf1 100644
--- a/security/p5-Safe-Hole/Makefile
+++ b/security/p5-Safe-Hole/Makefile
@@ -18,6 +18,5 @@ COMMENT= Make a hole to the original main compartment in the Safe compartment
PERL_CONFIGURE= yes
MAN3= Safe::Hole.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/security/p5-Safe-Hole/pkg-plist b/security/p5-Safe-Hole/pkg-plist
index bf05c989882e..a4c9a30d13a6 100644
--- a/security/p5-Safe-Hole/pkg-plist
+++ b/security/p5-Safe-Hole/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Safe/Hole/Hole.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Safe/Hole/Hole.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Safe/Hole.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Safe/Hole/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Safe/Hole/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Safe/Hole/
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/Hole.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/Hole.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/Safe/Hole.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index 819abf90ab8e..da8569746bdf 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
COMMENT= Hashes (and objects based on hashes) with encrypting fields
-PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERLBASE= ${SITE_PERL}
BUILD_DEPENDS= ${PERLBASE}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC \
${PERLBASE}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES \
@@ -24,7 +24,6 @@ BUILD_DEPENDS= ${PERLBASE}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tie::EncryptedHash.3
.include <bsd.port.mk>
diff --git a/security/saferpay/pkg-plist.p5 b/security/saferpay/pkg-plist.p5
index 4943b234db95..6936372b6e2b 100644
--- a/security/saferpay/pkg-plist.p5
+++ b/security/saferpay/pkg-plist.p5
@@ -3,25 +3,25 @@ lib/libidpapp.so.1
bin/saferpay
share/examples/saferpay/settings.template
@dirrm share/examples/saferpay
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/ConfigurationSetup.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/ConfigurationSetup.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/soplex/saferpay/ConfigurationSetup.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/MessageFactory.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/MessageFactory.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/soplex/saferpay/MessageFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/MessageObject.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/MessageObject.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/soplex/saferpay/MessageObject.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/ConfigurationSetup.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/ConfigurationSetup.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/soplex/saferpay/ConfigurationSetup.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/MessageFactory.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/MessageFactory.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/soplex/saferpay/MessageFactory.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/MessageObject.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/MessageObject.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/soplex/saferpay/MessageObject.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/autosplit.ix
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/../man/man3/soplex::saferpay::MessageFactory.3.gz
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/../man/man3/soplex::saferpay::MessageObject.3.gz
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex
diff --git a/security/smtpscan/Makefile b/security/smtpscan/Makefile
index 713573d070ec..7c8ce89329fa 100644
--- a/security/smtpscan/Makefile
+++ b/security/smtpscan/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES= http://www.greyhats.org/outils/smtpscan/
MAINTAINER= hubert@frbsd.org
COMMENT= A remote SMTP server version detector
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS= ${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
+ ${SITE_PERL}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO \
+ ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
USE_PERL5= yes
MAN1= smtpscan.1
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index 1c5b09a4c079..1dffa50d4f35 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -15,7 +15,7 @@ DISTNAME= SnortSnarf-${PORTVERSION}.1
MAINTAINER= ports@FreeBSD.org
COMMENT= Generate HTML report summaries from snort incident alerts
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/JulianDay.pm:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS= ${SITE_PERL}/Time/JulianDay.pm:${PORTSDIR}/devel/p5-Time-modules
NO_BUILD= yes
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index b09881b979b9..f358aaf31ea0 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${site_perl}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
${site_perl}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
${site_perl}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-site_perl= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+site_perl= ${SITE_PERL}
PERL_CONFIGURE= yes
CONFIGURE_ARGS= INSTALLMAN1DIR=${PREFIX}/man/man1
diff --git a/security/swatch/pkg-plist b/security/swatch/pkg-plist
index 719956a550a3..101828fb7dd3 100644
--- a/security/swatch/pkg-plist
+++ b/security/swatch/pkg-plist
@@ -1,4 +1,4 @@
bin/swatch
bin/swatch_oldrc2newrc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/swatch/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/swatch
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/swatch/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/swatch
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index 06114720bb59..c9dbf7c09aac 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://tinyca.sm-zone.net/
MAINTAINER= Janos.Mohacsi@bsd.hu
COMMENT= Simple graphical interface to manage a small Certification Authority
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext \
zip:${PORTSDIR}/archivers/zip
diff --git a/shells/perlsh/pkg-plist b/shells/perlsh/pkg-plist
index 27e78ce89041..9d712dbf4602 100644
--- a/shells/perlsh/pkg-plist
+++ b/shells/perlsh/pkg-plist
@@ -1,64 +1,64 @@
bin/psh
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bind.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Complete.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Dirs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Drives.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Exit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Ls.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Env.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Firsttime.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Function.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Help.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/History.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Kill.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Pshtokenize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Readline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Set.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Source.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Strategy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Rename.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Italian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/French.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Spanish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/German.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Portuguese.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Unix.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Win.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_resume.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_cd.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Fallback_builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlfunc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlscript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Completion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PCompletion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PerlEval.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Job.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Prompt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Psh.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/OS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh
+%%SITE_PERL%%/Psh/Builtins/Bg.pm
+%%SITE_PERL%%/Psh/Builtins/Bind.pm
+%%SITE_PERL%%/Psh/Builtins/Builtin.pm
+%%SITE_PERL%%/Psh/Builtins/Complete.pm
+%%SITE_PERL%%/Psh/Builtins/Dirs.pm
+%%SITE_PERL%%/Psh/Builtins/Drives.pm
+%%SITE_PERL%%/Psh/Builtins/Exit.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Ls.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Env.pm
+%%SITE_PERL%%/Psh/Builtins/Fc.pm
+%%SITE_PERL%%/Psh/Builtins/Fg.pm
+%%SITE_PERL%%/Psh/Builtins/Firsttime.pm
+%%SITE_PERL%%/Psh/Builtins/Function.pm
+%%SITE_PERL%%/Psh/Builtins/Help.pm
+%%SITE_PERL%%/Psh/Builtins/History.pm
+%%SITE_PERL%%/Psh/Builtins/Kill.pm
+%%SITE_PERL%%/Psh/Builtins/Jobs.pm
+%%SITE_PERL%%/Psh/Builtins/Pshtokenize.pm
+%%SITE_PERL%%/Psh/Builtins/Readline.pm
+%%SITE_PERL%%/Psh/Builtins/Set.pm
+%%SITE_PERL%%/Psh/Builtins/Source.pm
+%%SITE_PERL%%/Psh/Builtins/Strategy.pm
+%%SITE_PERL%%/Psh/Builtins/Symbols.pm
+%%SITE_PERL%%/Psh/Builtins/Rename.pm
+%%SITE_PERL%%/Psh/Builtins/Which.pm
+%%SITE_PERL%%/Psh/Locale/Base.pm
+%%SITE_PERL%%/Psh/Locale/Italian.pm
+%%SITE_PERL%%/Psh/Locale/Default.pm
+%%SITE_PERL%%/Psh/Locale/French.pm
+%%SITE_PERL%%/Psh/Locale/Spanish.pm
+%%SITE_PERL%%/Psh/Locale/German.pm
+%%SITE_PERL%%/Psh/Locale/Portuguese.pm
+%%SITE_PERL%%/Psh/OS/Unix.pm
+%%SITE_PERL%%/Psh/OS/Win.pm
+%%SITE_PERL%%/Psh/OS/Mac.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_resume.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_cd.pm
+%%SITE_PERL%%/Psh/Strategy/Debug.pm
+%%SITE_PERL%%/Psh/Strategy/Fallback_builtin.pm
+%%SITE_PERL%%/Psh/Strategy/Perlfunc.pm
+%%SITE_PERL%%/Psh/Strategy/Perlscript.pm
+%%SITE_PERL%%/Psh/Completion.pm
+%%SITE_PERL%%/Psh/OS.pm
+%%SITE_PERL%%/Psh/PCompletion.pm
+%%SITE_PERL%%/Psh/PerlEval.pm
+%%SITE_PERL%%/Psh/Job.pm
+%%SITE_PERL%%/Psh/Joblist.pm
+%%SITE_PERL%%/Psh/Util.pm
+%%SITE_PERL%%/Psh/Prompt.pm
+%%SITE_PERL%%/Psh/Builtins.pm
+%%SITE_PERL%%/Psh/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/psh/.packlist
+%%SITE_PERL%%/Psh.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/psh
+@dirrm %%SITE_PERL%%/Psh/Builtins/Fallback
+@dirrm %%SITE_PERL%%/Psh/Builtins
+@dirrm %%SITE_PERL%%/Psh/Locale
+@dirrm %%SITE_PERL%%/Psh/OS
+@dirrm %%SITE_PERL%%/Psh/Strategy
+@dirrm %%SITE_PERL%%/Psh
@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man 2>/dev/null || true
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index 27e78ce89041..9d712dbf4602 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -1,64 +1,64 @@
bin/psh
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bind.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Complete.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Dirs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Drives.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Exit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Ls.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Env.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Firsttime.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Function.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Help.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/History.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Kill.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Pshtokenize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Readline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Set.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Source.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Strategy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Rename.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Italian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/French.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Spanish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/German.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Portuguese.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Unix.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Win.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_resume.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_cd.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Fallback_builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlfunc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlscript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Completion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PCompletion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PerlEval.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Job.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Prompt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Psh.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/OS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh
+%%SITE_PERL%%/Psh/Builtins/Bg.pm
+%%SITE_PERL%%/Psh/Builtins/Bind.pm
+%%SITE_PERL%%/Psh/Builtins/Builtin.pm
+%%SITE_PERL%%/Psh/Builtins/Complete.pm
+%%SITE_PERL%%/Psh/Builtins/Dirs.pm
+%%SITE_PERL%%/Psh/Builtins/Drives.pm
+%%SITE_PERL%%/Psh/Builtins/Exit.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Ls.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Env.pm
+%%SITE_PERL%%/Psh/Builtins/Fc.pm
+%%SITE_PERL%%/Psh/Builtins/Fg.pm
+%%SITE_PERL%%/Psh/Builtins/Firsttime.pm
+%%SITE_PERL%%/Psh/Builtins/Function.pm
+%%SITE_PERL%%/Psh/Builtins/Help.pm
+%%SITE_PERL%%/Psh/Builtins/History.pm
+%%SITE_PERL%%/Psh/Builtins/Kill.pm
+%%SITE_PERL%%/Psh/Builtins/Jobs.pm
+%%SITE_PERL%%/Psh/Builtins/Pshtokenize.pm
+%%SITE_PERL%%/Psh/Builtins/Readline.pm
+%%SITE_PERL%%/Psh/Builtins/Set.pm
+%%SITE_PERL%%/Psh/Builtins/Source.pm
+%%SITE_PERL%%/Psh/Builtins/Strategy.pm
+%%SITE_PERL%%/Psh/Builtins/Symbols.pm
+%%SITE_PERL%%/Psh/Builtins/Rename.pm
+%%SITE_PERL%%/Psh/Builtins/Which.pm
+%%SITE_PERL%%/Psh/Locale/Base.pm
+%%SITE_PERL%%/Psh/Locale/Italian.pm
+%%SITE_PERL%%/Psh/Locale/Default.pm
+%%SITE_PERL%%/Psh/Locale/French.pm
+%%SITE_PERL%%/Psh/Locale/Spanish.pm
+%%SITE_PERL%%/Psh/Locale/German.pm
+%%SITE_PERL%%/Psh/Locale/Portuguese.pm
+%%SITE_PERL%%/Psh/OS/Unix.pm
+%%SITE_PERL%%/Psh/OS/Win.pm
+%%SITE_PERL%%/Psh/OS/Mac.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_resume.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_cd.pm
+%%SITE_PERL%%/Psh/Strategy/Debug.pm
+%%SITE_PERL%%/Psh/Strategy/Fallback_builtin.pm
+%%SITE_PERL%%/Psh/Strategy/Perlfunc.pm
+%%SITE_PERL%%/Psh/Strategy/Perlscript.pm
+%%SITE_PERL%%/Psh/Completion.pm
+%%SITE_PERL%%/Psh/OS.pm
+%%SITE_PERL%%/Psh/PCompletion.pm
+%%SITE_PERL%%/Psh/PerlEval.pm
+%%SITE_PERL%%/Psh/Job.pm
+%%SITE_PERL%%/Psh/Joblist.pm
+%%SITE_PERL%%/Psh/Util.pm
+%%SITE_PERL%%/Psh/Prompt.pm
+%%SITE_PERL%%/Psh/Builtins.pm
+%%SITE_PERL%%/Psh/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/psh/.packlist
+%%SITE_PERL%%/Psh.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/psh
+@dirrm %%SITE_PERL%%/Psh/Builtins/Fallback
+@dirrm %%SITE_PERL%%/Psh/Builtins
+@dirrm %%SITE_PERL%%/Psh/Locale
+@dirrm %%SITE_PERL%%/Psh/OS
+@dirrm %%SITE_PERL%%/Psh/Strategy
+@dirrm %%SITE_PERL%%/Psh
@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man3 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man 2>/dev/null || true
diff --git a/shells/vshnu/Makefile b/shells/vshnu/Makefile
index e9a52e8c4871..d3ac27d9e9ae 100644
--- a/shells/vshnu/Makefile
+++ b/shells/vshnu/Makefile
@@ -16,11 +16,11 @@ COMMENT= New Visual Shell
.include <bsd.port.pre.mk>
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/Screen.pm:${PORTSDIR}/devel/p5-Term-Screen
+BUILD_DEPENDS= ${SITE_PERL}/Term/Screen.pm:${PORTSDIR}/devel/p5-Term-Screen
# perl 5.6.0
.if ${OSVERSION} < 500007
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS+= ${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
.endif
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/sysutils/colorize/Makefile b/sysutils/colorize/Makefile
index 6bcc9f356781..00aa601fd4a9 100644
--- a/sysutils/colorize/Makefile
+++ b/sysutils/colorize/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
COMMENT= A robust log colorizer
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
+RUN_DEPENDS= ${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
diff --git a/sysutils/cvsweb-converters/Makefile b/sysutils/cvsweb-converters/Makefile
index 99a99186c19b..500d8e19795f 100644
--- a/sysutils/cvsweb-converters/Makefile
+++ b/sysutils/cvsweb-converters/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES= http://www.sbox.TUGraz.at/home/d/dada/distfiles/
MAINTAINER= mkamm@gmx.net
COMMENT= Create hyperlinks to cvsweb from cvs[up] output or FreeBSD commitlogs
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS= ${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+ ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
+ ${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules
NO_BUILD= yes
USE_PERL5= yes
diff --git a/sysutils/fastest_cvsup/Makefile b/sysutils/fastest_cvsup/Makefile
index e01d83bd45cf..dacc2f31ee61 100644
--- a/sysutils/fastest_cvsup/Makefile
+++ b/sysutils/fastest_cvsup/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://fastest-cvsup.sourceforge.net/download/
MAINTAINER= ajr@subdimension.com
COMMENT= Finds fastest CVSup server
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
USE_PERL5= yes
diff --git a/sysutils/p5-File-Which/pkg-plist b/sysutils/p5-File-Which/pkg-plist
index fdcb7da0857c..bdaba80669a1 100644
--- a/sysutils/p5-File-Which/pkg-plist
+++ b/sysutils/p5-File-Which/pkg-plist
@@ -1,6 +1,6 @@
bin/pwhich
-lib/perl5/site_perl/%%PERL_VER%%/File/Which.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Which/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Which
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/File
+%%SITE_PERL%%/File/Which.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Which/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Which
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrm %%SITE_PERL%%/File
diff --git a/sysutils/p5-Filesys-DiskSpace/Makefile b/sysutils/p5-Filesys-DiskSpace/Makefile
index f3187bfd5523..8825208b6104 100644
--- a/sysutils/p5-Filesys-DiskSpace/Makefile
+++ b/sysutils/p5-Filesys-DiskSpace/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl equivalent of statfs(2)
PERL_CONFIGURE= yes
MAN3= Filesys::DiskSpace.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/sysutils/p5-Filesys-DiskSpace/pkg-plist b/sysutils/p5-Filesys-DiskSpace/pkg-plist
index 352586945a72..5ebb1e2ae4b5 100644
--- a/sysutils/p5-Filesys-DiskSpace/pkg-plist
+++ b/sysutils/p5-Filesys-DiskSpace/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filesys/DiskSpace/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Filesys/DiskSpace.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filesys/DiskSpace
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filesys
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Filesys
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskSpace/.packlist
+%%SITE_PERL%%/Filesys/DiskSpace.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskSpace
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
+@dirrm %%SITE_PERL%%/Filesys
diff --git a/sysutils/p5-LJ-Cache/Makefile b/sysutils/p5-LJ-Cache/Makefile
index e27410a98ce6..ea8b10fb5da9 100644
--- a/sysutils/p5-LJ-Cache/Makefile
+++ b/sysutils/p5-LJ-Cache/Makefile
@@ -16,7 +16,6 @@ COMMENT= Perl5 implementation of an LRU dictionary cache
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= LJ::Cache.3
.include <bsd.port.mk>
diff --git a/sysutils/p5-LJ-Cache/pkg-plist b/sysutils/p5-LJ-Cache/pkg-plist
index 21834af71757..b3f6973cd97f 100644
--- a/sysutils/p5-LJ-Cache/pkg-plist
+++ b/sysutils/p5-LJ-Cache/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/auto/LJ/Cache/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/Cache/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/LJ/Cache.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/LJ/Cache
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/Cache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/LJ 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LJ 2>/dev/null || true
+%%SITE_PERL%%/auto/LJ/Cache/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/Cache/.packlist
+%%SITE_PERL%%/LJ/Cache.pm
+@dirrm %%SITE_PERL%%/auto/LJ/Cache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/Cache
+@unexec rmdir %D/%%SITE_PERL%%/auto/LJ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true
diff --git a/sysutils/p5-LJ-TextMessage/Makefile b/sysutils/p5-LJ-TextMessage/Makefile
index 47f706ae2bdc..ff4ee035f3a8 100644
--- a/sysutils/p5-LJ-TextMessage/Makefile
+++ b/sysutils/p5-LJ-TextMessage/Makefile
@@ -16,7 +16,6 @@ COMMENT= Perl5 interface to send text messages to phones/pagers
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= LJ::TextMessage.3
.include <bsd.port.mk>
diff --git a/sysutils/p5-LJ-TextMessage/pkg-plist b/sysutils/p5-LJ-TextMessage/pkg-plist
index c252a61e7cad..adc627a007f6 100644
--- a/sysutils/p5-LJ-TextMessage/pkg-plist
+++ b/sysutils/p5-LJ-TextMessage/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/LJ/TextMessage.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/TextMessage/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/TextMessage
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LJ 2>/dev/null || true
+%%SITE_PERL%%/LJ/TextMessage.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/TextMessage/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/TextMessage
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true
diff --git a/sysutils/p5-Schedule-At/Makefile b/sysutils/p5-Schedule-At/Makefile
index dbcceb9fb1d7..d34436491d99 100644
--- a/sysutils/p5-Schedule-At/Makefile
+++ b/sysutils/p5-Schedule-At/Makefile
@@ -18,6 +18,5 @@ COMMENT= OS independent interface to the Unix 'at' command
PERL_CONFIGURE= yes
MAN3= Schedule::At.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/sysutils/p5-Schedule-At/pkg-plist b/sysutils/p5-Schedule-At/pkg-plist
index 7e845c1cda67..ff379856ab8c 100644
--- a/sysutils/p5-Schedule-At/pkg-plist
+++ b/sysutils/p5-Schedule-At/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Schedule/At.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule/At/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule/At
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Schedule 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true
+%%SITE_PERL%%/Schedule/At.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/At/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/At
+@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true
diff --git a/sysutils/p5-Schedule-Cron/Makefile b/sysutils/p5-Schedule-Cron/Makefile
index 44e1b1092158..96a21efe3e77 100644
--- a/sysutils/p5-Schedule-Cron/Makefile
+++ b/sysutils/p5-Schedule-Cron/Makefile
@@ -16,12 +16,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Schedule::Cron - cron-like scheduler for Perl subroutines
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules
+BUILD_DEPENDS= ${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Schedule::Cron.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/sysutils/p5-Schedule-Cron/pkg-plist b/sysutils/p5-Schedule-Cron/pkg-plist
index 6d760fa18c54..529d5ca38929 100644
--- a/sysutils/p5-Schedule-Cron/pkg-plist
+++ b/sysutils/p5-Schedule-Cron/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule/Cron/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Schedule/Cron.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule/Cron
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Schedule 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Cron/.packlist
+%%SITE_PERL%%/Schedule/Cron.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Cron
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true
diff --git a/sysutils/p5-Schedule-Match/Makefile b/sysutils/p5-Schedule-Match/Makefile
index f64c65de3fed..cd8837f20e6d 100644
--- a/sysutils/p5-Schedule-Match/Makefile
+++ b/sysutils/p5-Schedule-Match/Makefile
@@ -18,6 +18,5 @@ COMMENT= Handles and detects clash between pattern-based schedules
PERL_CONFIGURE= yes
MAN3= Schedule::Match.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/sysutils/p5-Schedule-Match/pkg-plist b/sysutils/p5-Schedule-Match/pkg-plist
index 2e70c444039f..c04b1dda5ad2 100644
--- a/sysutils/p5-Schedule-Match/pkg-plist
+++ b/sysutils/p5-Schedule-Match/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule/Match/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Schedule/Match.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule/Match
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Schedule 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Match/.packlist
+%%SITE_PERL%%/Schedule/Match.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Match
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true
diff --git a/sysutils/p5-Stat-lsMode/Makefile b/sysutils/p5-Stat-lsMode/Makefile
index 4b48cd0b987a..d2140c79dd6c 100644
--- a/sysutils/p5-Stat-lsMode/Makefile
+++ b/sysutils/p5-Stat-lsMode/Makefile
@@ -18,6 +18,5 @@ COMMENT= Stat::lsMode - format file modes like the ls -l command does
PERL_CONFIGURE= yes
MAN3= Stat::lsMode.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/sysutils/p5-Stat-lsMode/pkg-plist b/sysutils/p5-Stat-lsMode/pkg-plist
index 621e7a7309f0..81786c09e006 100644
--- a/sysutils/p5-Stat-lsMode/pkg-plist
+++ b/sysutils/p5-Stat-lsMode/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Stat/lsMode/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Stat/lsMode.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Stat/lsMode
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Stat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Stat 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat/lsMode/.packlist
+%%SITE_PERL%%/Stat/lsMode.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat/lsMode
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Stat 2>/dev/null || true
diff --git a/sysutils/p5-Sys-CpuLoad/Makefile b/sysutils/p5-Sys-CpuLoad/Makefile
index d7bb80a366fe..664d7647114b 100644
--- a/sysutils/p5-Sys-CpuLoad/Makefile
+++ b/sysutils/p5-Sys-CpuLoad/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 module to retrieve CPU load averages
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Sys::CpuLoad.3
.include <bsd.port.mk>
diff --git a/sysutils/p5-Sys-CpuLoad/pkg-plist b/sysutils/p5-Sys-CpuLoad/pkg-plist
index 1f454eb478bb..52863016c303 100644
--- a/sysutils/p5-Sys-CpuLoad/pkg-plist
+++ b/sysutils/p5-Sys-CpuLoad/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Sys/CpuLoad.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/CpuLoad.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/CpuLoad.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/CpuLoad
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Sys/CpuLoad.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/CpuLoad.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/CpuLoad.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
diff --git a/sysutils/p5-SyslogScan/Makefile b/sysutils/p5-SyslogScan/Makefile
index 6766867a41f1..97768e5f66a1 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 routines to parse system logs
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= SyslogScan::ByGroup.3 SyslogScan::Delivery.3 \
SyslogScan::DeliveryIterator.3 \
SyslogScan::SendmailLine.3 SyslogScan::SendmailLineFrom.3 \
diff --git a/sysutils/p5-SyslogScan/pkg-plist b/sysutils/p5-SyslogScan/pkg-plist
index 41ec60615a4b..7a33321d8e59 100644
--- a/sysutils/p5-SyslogScan/pkg-plist
+++ b/sysutils/p5-SyslogScan/pkg-plist
@@ -1,23 +1,23 @@
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/ByGroup.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/Delivery.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/DeliveryIterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/FilterUser.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/Group.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/In_identdLine.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/ParseDate.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/SendmailLine.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/SendmailLineClone.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/SendmailLineFrom.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/SendmailLineTo.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/SendmailLineTrans.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/SendmailUtil.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/Summary.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/SyslogEntry.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/UnsupportedEntry.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/Usage.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/Volume.pm
-lib/perl5/site_perl/%%PERL_VER%%/SyslogScan/WhereIs.pm
-lib/perl5/site_perl/%%PERL_VER%%/read_mail_log.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SyslogScan/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SyslogScan
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SyslogScan
+%%SITE_PERL%%/SyslogScan/ByGroup.pm
+%%SITE_PERL%%/SyslogScan/Delivery.pm
+%%SITE_PERL%%/SyslogScan/DeliveryIterator.pm
+%%SITE_PERL%%/SyslogScan/FilterUser.pm
+%%SITE_PERL%%/SyslogScan/Group.pm
+%%SITE_PERL%%/SyslogScan/In_identdLine.pm
+%%SITE_PERL%%/SyslogScan/ParseDate.pm
+%%SITE_PERL%%/SyslogScan/SendmailLine.pm
+%%SITE_PERL%%/SyslogScan/SendmailLineClone.pm
+%%SITE_PERL%%/SyslogScan/SendmailLineFrom.pm
+%%SITE_PERL%%/SyslogScan/SendmailLineTo.pm
+%%SITE_PERL%%/SyslogScan/SendmailLineTrans.pm
+%%SITE_PERL%%/SyslogScan/SendmailUtil.pm
+%%SITE_PERL%%/SyslogScan/Summary.pm
+%%SITE_PERL%%/SyslogScan/SyslogEntry.pm
+%%SITE_PERL%%/SyslogScan/UnsupportedEntry.pm
+%%SITE_PERL%%/SyslogScan/Usage.pm
+%%SITE_PERL%%/SyslogScan/Volume.pm
+%%SITE_PERL%%/SyslogScan/WhereIs.pm
+%%SITE_PERL%%/read_mail_log.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SyslogScan/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SyslogScan
+@dirrm %%SITE_PERL%%/SyslogScan
diff --git a/sysutils/p5-Tie-Syslog/Makefile b/sysutils/p5-Tie-Syslog/Makefile
index 33057152d514..147c97204f3f 100644
--- a/sysutils/p5-Tie-Syslog/Makefile
+++ b/sysutils/p5-Tie-Syslog/Makefile
@@ -18,6 +18,5 @@ COMMENT= Tie a filehandle to Syslog
PERL_CONFIGURE= yes
MAN3= Tie::Syslog.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/sysutils/p5-Tie-Syslog/pkg-plist b/sysutils/p5-Tie-Syslog/pkg-plist
index 02a5bde57bc2..04c6e4f437d0 100644
--- a/sysutils/p5-Tie-Syslog/pkg-plist
+++ b/sysutils/p5-Tie-Syslog/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/Syslog/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Tie/Syslog.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog/.packlist
+%%SITE_PERL%%/Tie/Syslog.pm
+@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
diff --git a/sysutils/p5-UPS-Nut/Makefile b/sysutils/p5-UPS-Nut/Makefile
index bcd88e4ec491..029d7cc22c9a 100644
--- a/sysutils/p5-UPS-Nut/Makefile
+++ b/sysutils/p5-UPS-Nut/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl module for accessing Network UPS Tools' upsd
PERL_CONFIGURE= yes
MAN3= UPS::Nut.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-configure:
${PERL} -pi -e 'm.INSTALLDIRS.&&s,.,,sg' ${WRKSRC}/Makefile.PL
diff --git a/sysutils/p5-UPS-Nut/pkg-plist b/sysutils/p5-UPS-Nut/pkg-plist
index 276fb6886872..09b299f80594 100644
--- a/sysutils/p5-UPS-Nut/pkg-plist
+++ b/sysutils/p5-UPS-Nut/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/UPS/Nut/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/UPS/Nut.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/UPS/Nut
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/UPS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/UPS 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS/Nut/.packlist
+%%SITE_PERL%%/UPS/Nut.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS/Nut
+@unexec rmdir %D/%%SITE_PERL%%/UPS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS 2>/dev/null || true
diff --git a/sysutils/p5-Unix-ConfigFile/Makefile b/sysutils/p5-Unix-ConfigFile/Makefile
index d0ed8104499c..ffd084c6d410 100644
--- a/sysutils/p5-Unix-ConfigFile/Makefile
+++ b/sysutils/p5-Unix-ConfigFile/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl modules that provides a simple interface to reading /etc files
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Unix::GroupFile.3 Unix::AliasFile.3 \
Unix::PasswdFile.3 Unix::AutomountFile.3
diff --git a/sysutils/p5-Unix-ConfigFile/pkg-plist b/sysutils/p5-Unix-ConfigFile/pkg-plist
index cf8583837622..185dd77b86b8 100644
--- a/sysutils/p5-Unix-ConfigFile/pkg-plist
+++ b/sysutils/p5-Unix-ConfigFile/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Unix/AliasFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Unix/AutomountFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Unix/ConfigFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Unix/GroupFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Unix/PasswdFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/ConfigFile/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/ConfigFile
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Unix 2>/dev/null || true
+%%SITE_PERL%%/Unix/AliasFile.pm
+%%SITE_PERL%%/Unix/AutomountFile.pm
+%%SITE_PERL%%/Unix/ConfigFile.pm
+%%SITE_PERL%%/Unix/GroupFile.pm
+%%SITE_PERL%%/Unix/PasswdFile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Unix 2>/dev/null || true
diff --git a/sysutils/p5-Unix-Syslog/Makefile b/sysutils/p5-Unix-Syslog/Makefile
index 2ca2a4dd2e8f..d75c398f74ef 100644
--- a/sysutils/p5-Unix-Syslog/Makefile
+++ b/sysutils/p5-Unix-Syslog/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 interface to the UNIX syslog(3) calls
PERL_CONFIGURE= yes
MAN3= Unix::Syslog.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/sysutils/p5-Unix-Syslog/pkg-plist b/sysutils/p5-Unix-Syslog/pkg-plist
index c6e45dfbe96d..161d9d310ad9 100644
--- a/sysutils/p5-Unix-Syslog/pkg-plist
+++ b/sysutils/p5-Unix-Syslog/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unix/Syslog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/Syslog/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/Syslog/Syslog.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/Syslog/Syslog.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/Syslog/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/Syslog
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unix 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Syslog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/Syslog.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/Syslog.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unix 2>/dev/null || true
diff --git a/sysutils/p5-User/Makefile b/sysutils/p5-User/Makefile
index 9866949438f9..0badd9091d5d 100644
--- a/sysutils/p5-User/Makefile
+++ b/sysutils/p5-User/Makefile
@@ -17,7 +17,6 @@ COMMENT= User - API for locating user information regardless of OS
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= User.3
.include <bsd.port.mk>
diff --git a/sysutils/p5-User/pkg-plist b/sysutils/p5-User/pkg-plist
index e6faed84a23b..1761c1a8fa37 100644
--- a/sysutils/p5-User/pkg-plist
+++ b/sysutils/p5-User/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/User.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/User/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/User
+%%SITE_PERL%%/User.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/User/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/User
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 7948cd5305e5..9a3178937a20 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -17,8 +17,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Web-based interface for performing some user tasks
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-Authen-PAM
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
+ ${SITE_PERL}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-Authen-PAM
NO_BUILD= yes
USE_PERL5= yes
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 67c1466dc5e7..abfdecfbfdc7 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -17,8 +17,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Web-based interface for system administration for Unix
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-Authen-PAM
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
+ ${SITE_PERL}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-Authen-PAM
NO_BUILD= yes
USE_PERL5= yes
diff --git a/sysutils/whatpix/Makefile b/sysutils/whatpix/Makefile
index eecc62fe7cc2..efa4dfcb98ed 100644
--- a/sysutils/whatpix/Makefile
+++ b/sysutils/whatpix/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= http://whatpix.sourceforge.net/download/
MAINTAINER= pcasidy@casidy.com
COMMENT= Perl console application which finds, moves or deletes duplicate files
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+ ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
NO_BUILD= yes
USE_PERL5_RUN= yes
diff --git a/sysutils/wots/Makefile b/sysutils/wots/Makefile
index 66212579213e..eab6fd51f21f 100644
--- a/sysutils/wots/Makefile
+++ b/sysutils/wots/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= http://www.hpcc.uh.edu/~tonyc/tools/
MAINTAINER= bms@spc.org
COMMENT= System log watch/alert utility, similar to swatch, written in Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Send.pm:${PORTSDIR}/mail/p5-Mail-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS= ${SITE_PERL}/Mail/Send.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+ ${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PERL5= yes
diff --git a/textproc/ascii2pdf/Makefile b/textproc/ascii2pdf/Makefile
index 9114492a4178..0260695a6634 100644
--- a/textproc/ascii2pdf/Makefile
+++ b/textproc/ascii2pdf/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-0.9.1
MAINTAINER= petef@FreeBSD.org
COMMENT= A perl script to convert text files to PDF files
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/PDF/Create.pm:${PORTSDIR}/textproc/p5-PDF-Create
+RUN_DEPENDS= ${SITE_PERL}/PDF/Create.pm:${PORTSDIR}/textproc/p5-PDF-Create
NO_BUILD= yes
diff --git a/textproc/gutenbook/Makefile b/textproc/gutenbook/Makefile
index 44d64c0277d3..5efa8fd9aa91 100644
--- a/textproc/gutenbook/Makefile
+++ b/textproc/gutenbook/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
${site_perl}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
${site_perl}/URI/URL.pm:${PORTSDIR}/net/p5-URI
-site_perl= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+site_perl= ${SITE_PERL}
USE_GNOME= gtk12
NO_BUILD= yes
diff --git a/textproc/gutenbook/pkg-plist b/textproc/gutenbook/pkg-plist
index 5e4b75fccd63..51c8c0841ac5 100644
--- a/textproc/gutenbook/pkg-plist
+++ b/textproc/gutenbook/pkg-plist
@@ -1,11 +1,11 @@
bin/gutenbook
-lib/perl5/site_perl/%%PERL_VER%%/PGB.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/Etext.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/Index.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/Network.pm
-lib/perl5/site_perl/%%PERL_VER%%/PGB/PropList.pm
+%%SITE_PERL%%/PGB.pm
+%%SITE_PERL%%/PGB/Etext.pm
+%%SITE_PERL%%/PGB/File.pm
+%%SITE_PERL%%/PGB/Index.pm
+%%SITE_PERL%%/PGB/Network.pm
+%%SITE_PERL%%/PGB/PropList.pm
share/doc/gutenbook/MANUAL
share/doc/gutenbook/gutenbook.spec
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/PGB
+@dirrm %%SITE_PERL%%/PGB
@dirrm share/doc/gutenbook
diff --git a/textproc/makepatch/pkg-plist b/textproc/makepatch/pkg-plist
index 6253252daab7..e79c2a2e4948 100644
--- a/textproc/makepatch/pkg-plist
+++ b/textproc/makepatch/pkg-plist
@@ -1,4 +1,4 @@
bin/applypatch
bin/makepatch
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/makepatch/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/makepatch
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/makepatch/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/makepatch
diff --git a/textproc/p5-Apache-ParseLog/Makefile b/textproc/p5-Apache-ParseLog/Makefile
index 4f009f8059fe..bd39e13c77e3 100644
--- a/textproc/p5-Apache-ParseLog/Makefile
+++ b/textproc/p5-Apache-ParseLog/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= Apache::ParseLog.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Apache-ParseLog/pkg-plist b/textproc/p5-Apache-ParseLog/pkg-plist
index 7ac4c313e734..95769851c9de 100644
--- a/textproc/p5-Apache-ParseLog/pkg-plist
+++ b/textproc/p5-Apache-ParseLog/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/ParseLog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/ParseLog/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/ParseLog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/ParseLog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/textproc/p5-CSS-SAC/Makefile b/textproc/p5-CSS-SAC/Makefile
index 81f1e592bacb..92c40fd164fe 100644
--- a/textproc/p5-CSS-SAC/Makefile
+++ b/textproc/p5-CSS-SAC/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= SAC CSS (Simple API for CSS) parser
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ArrayObjects.pm:${PORTSDIR}/devel/p5-Class-ArrayObjects
+BUILD_DEPENDS= ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
+ ${SITE_PERL}/Class/ArrayObjects.pm:${PORTSDIR}/devel/p5-Class-ArrayObjects
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-CSS-SAC/pkg-plist b/textproc/p5-CSS-SAC/pkg-plist
index fe372fff15c1..ab0f1dad7c6f 100644
--- a/textproc/p5-CSS-SAC/pkg-plist
+++ b/textproc/p5-CSS-SAC/pkg-plist
@@ -1,30 +1,30 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CSS/SAC/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Attribute.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Combinator.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Content.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Lang.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Negative.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition/Positional.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/ConditionFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/LexicalUnit.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/CharacterData.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Conditional.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Descendant.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Element.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Negative.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/ProcessingInstruction.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Sibling.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/SelectorFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/SelectorList.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/TestWriter.pm
-lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Writer.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Condition
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC/Selector
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CSS/SAC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CSS/SAC
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CSS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CSS 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/SAC/.packlist
+%%SITE_PERL%%/CSS/SAC.pm
+%%SITE_PERL%%/CSS/SAC/Condition.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Attribute.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Combinator.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Content.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Lang.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Negative.pm
+%%SITE_PERL%%/CSS/SAC/Condition/Positional.pm
+%%SITE_PERL%%/CSS/SAC/ConditionFactory.pm
+%%SITE_PERL%%/CSS/SAC/LexicalUnit.pm
+%%SITE_PERL%%/CSS/SAC/Selector.pm
+%%SITE_PERL%%/CSS/SAC/Selector/CharacterData.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Conditional.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Descendant.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Element.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Negative.pm
+%%SITE_PERL%%/CSS/SAC/Selector/ProcessingInstruction.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Sibling.pm
+%%SITE_PERL%%/CSS/SAC/Selector/Simple.pm
+%%SITE_PERL%%/CSS/SAC/SelectorFactory.pm
+%%SITE_PERL%%/CSS/SAC/SelectorList.pm
+%%SITE_PERL%%/CSS/SAC/TestWriter.pm
+%%SITE_PERL%%/CSS/SAC/Writer.pm
+@dirrm %%SITE_PERL%%/CSS/SAC/Condition
+@dirrm %%SITE_PERL%%/CSS/SAC/Selector
+@dirrm %%SITE_PERL%%/CSS/SAC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/SAC
+@unexec rmdir %D/%%SITE_PERL%%/CSS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS 2>/dev/null || true
diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index 30e1d5977be5..bfb9c75b6f9d 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -18,6 +18,5 @@ COMMENT= Validates user input (usually from an HTML form) based
PERL_CONFIGURE= yes
MAN3= Data::FormValidator.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Data-FormValidator/pkg-plist b/textproc/p5-Data-FormValidator/pkg-plist
index eb888bff9d88..67c7f801511f 100644
--- a/textproc/p5-Data-FormValidator/pkg-plist
+++ b/textproc/p5-Data-FormValidator/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/FormValidator/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/FormValidator.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/FormValidator
-@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/FormValidator/.packlist
+%%SITE_PERL%%/Data/FormValidator.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/FormValidator
+@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/textproc/p5-DelimMatch/Makefile b/textproc/p5-DelimMatch/Makefile
index efb0737443eb..e1ab7f7317a6 100644
--- a/textproc/p5-DelimMatch/Makefile
+++ b/textproc/p5-DelimMatch/Makefile
@@ -17,6 +17,5 @@ COMMENT= Perl extension to find regexp delimited strings with proper nesting
PERL_CONFIGURE= yes
MAN3= Text::DelimMatch.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-DelimMatch/pkg-plist b/textproc/p5-DelimMatch/pkg-plist
index 0492f61925e1..03e14a538488 100644
--- a/textproc/p5-DelimMatch/pkg-plist
+++ b/textproc/p5-DelimMatch/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/DelimMatch/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DelimMatch/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/DelimMatch.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Text/DelimMatch
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DelimMatch
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/auto/Text/DelimMatch/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch/.packlist
+%%SITE_PERL%%/Text/DelimMatch.pm
+@dirrm %%SITE_PERL%%/auto/Text/DelimMatch
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch
+@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-FreeBSD-Ports/pkg-plist b/textproc/p5-FreeBSD-Ports/pkg-plist
index 9e63253110c6..a6ecd11c12cf 100644
--- a/textproc/p5-FreeBSD-Ports/pkg-plist
+++ b/textproc/p5-FreeBSD-Ports/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports/Port.pm
-lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/FreeBSD/Ports
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/FreeBSD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreeBSD
+%%SITE_PERL%%/FreeBSD/Ports/Port.pm
+%%SITE_PERL%%/FreeBSD/Ports.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/.packlist
+@dirrm %%SITE_PERL%%/FreeBSD/Ports
+@dirrm %%SITE_PERL%%/FreeBSD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
diff --git a/textproc/p5-HTML-Format/Makefile b/textproc/p5-HTML-Format/Makefile
index 70aa8f5dc5a1..97fcf183f49a 100644
--- a/textproc/p5-HTML-Format/Makefile
+++ b/textproc/p5-HTML-Format/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
COMMENT= A module to format HTML to text or PS
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Font/AFM.pm:${PORTSDIR}/x11-fonts/p5-Font-AFM
+BUILD_DEPENDS= ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
+ ${SITE_PERL}/Font/AFM.pm:${PORTSDIR}/x11-fonts/p5-Font-AFM
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= HTML::Formatter.3 HTML::FormatPS.3 HTML::FormatRTF.3 HTML::FormatText.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-HTML-Format/pkg-plist b/textproc/p5-HTML-Format/pkg-plist
index c1efd13e78d7..840824ec9183 100644
--- a/textproc/p5-HTML-Format/pkg-plist
+++ b/textproc/p5-HTML-Format/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/FormatPS.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/FormatRTF.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/FormatText.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Formatter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Format/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Format
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/FormatPS.pm
+%%SITE_PERL%%/HTML/FormatRTF.pm
+%%SITE_PERL%%/HTML/FormatText.pm
+%%SITE_PERL%%/HTML/Formatter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Format/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Format
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/textproc/p5-LJ-SpellCheck/Makefile b/textproc/p5-LJ-SpellCheck/Makefile
index e39be6db0982..ef78401055d7 100644
--- a/textproc/p5-LJ-SpellCheck/Makefile
+++ b/textproc/p5-LJ-SpellCheck/Makefile
@@ -20,6 +20,5 @@ RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
PERL_CONFIGURE= yes
MAN3= LJ::SpellCheck.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-LJ-SpellCheck/pkg-plist b/textproc/p5-LJ-SpellCheck/pkg-plist
index dd94c10c55fd..2707ab5b9d8c 100644
--- a/textproc/p5-LJ-SpellCheck/pkg-plist
+++ b/textproc/p5-LJ-SpellCheck/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/LJ/SpellCheck.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/SpellCheck/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/SpellCheck
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LJ 2>/dev/null || true
+%%SITE_PERL%%/LJ/SpellCheck.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/SpellCheck/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/SpellCheck
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true
diff --git a/textproc/p5-Lingua-Conjunction/Makefile b/textproc/p5-Lingua-Conjunction/Makefile
index 9242cbf0b8c8..567a5798f270 100644
--- a/textproc/p5-Lingua-Conjunction/Makefile
+++ b/textproc/p5-Lingua-Conjunction/Makefile
@@ -18,6 +18,5 @@ COMMENT= Convert Perl lists into linguistic conjunctions
PERL_CONFIGURE= yes
MAN3= Lingua::Conjunction.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-Conjunction/pkg-plist b/textproc/p5-Lingua-Conjunction/pkg-plist
index ce9019f839e9..e33c2c526586 100644
--- a/textproc/p5-Lingua-Conjunction/pkg-plist
+++ b/textproc/p5-Lingua-Conjunction/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Conjunction.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Conjunction/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Conjunction
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/Conjunction.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-AddressParse/Makefile b/textproc/p5-Lingua-EN-AddressParse/Makefile
index b0525a1cf1b7..8502e53a6875 100644
--- a/textproc/p5-Lingua-EN-AddressParse/Makefile
+++ b/textproc/p5-Lingua-EN-AddressParse/Makefile
@@ -20,11 +20,10 @@ BUILD_DEPENDS= ${SITE_PERL}/Lingua/EN/NameParse.pm:${PORTSDIR}/textproc/p5-Lingu
${SITE_PERL}/Locale/SubCountry.pm:${PORTSDIR}/misc/p5-Locale-SubCountry
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Lingua::EN::AddressGrammar.3 \
Lingua::EN::AddressParse.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-AddressParse/pkg-plist b/textproc/p5-Lingua-EN-AddressParse/pkg-plist
index 77a8128b9660..ee4050cbedef 100644
--- a/textproc/p5-Lingua-EN-AddressParse/pkg-plist
+++ b/textproc/p5-Lingua-EN-AddressParse/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/AddressGrammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/AddressParse.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/AddressGrammar.pm
+%%SITE_PERL%%/Lingua/EN/AddressParse.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Gender/Makefile b/textproc/p5-Lingua-EN-Gender/Makefile
index 8a1077a632c2..6bafaaba3fd5 100644
--- a/textproc/p5-Lingua-EN-Gender/Makefile
+++ b/textproc/p5-Lingua-EN-Gender/Makefile
@@ -18,6 +18,5 @@ COMMENT= Inflect pronouns for gender
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Gender.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Gender/pkg-plist b/textproc/p5-Lingua-EN-Gender/pkg-plist
index a6e1217ef626..e6e16cea201b 100644
--- a/textproc/p5-Lingua-EN-Gender/pkg-plist
+++ b/textproc/p5-Lingua-EN-Gender/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Gender.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Gender.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Inflect/Makefile b/textproc/p5-Lingua-EN-Inflect/Makefile
index 7e38889091af..f201b84f79a1 100644
--- a/textproc/p5-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect/Makefile
@@ -18,6 +18,5 @@ COMMENT= Convert singular words to their plural form
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Inflect.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Inflect/pkg-plist b/textproc/p5-Lingua-EN-Inflect/pkg-plist
index 7eb692eb5a71..b397e1ebc7ab 100644
--- a/textproc/p5-Lingua-EN-Inflect/pkg-plist
+++ b/textproc/p5-Lingua-EN-Inflect/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Inflect.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_NO.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_NUM.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_PL.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_eq.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/demo_inflect.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Inflect.pm
+%%SITE_PERL%%/Lingua/EN/demo_NO.pl
+%%SITE_PERL%%/Lingua/EN/demo_NUM.pl
+%%SITE_PERL%%/Lingua/EN/demo_PL.pl
+%%SITE_PERL%%/Lingua/EN/demo_eq.pl
+%%SITE_PERL%%/Lingua/EN/demo_inflect.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-MatchNames/Makefile b/textproc/p5-Lingua-EN-MatchNames/Makefile
index 890b88a65a4f..0c6b8da7130d 100644
--- a/textproc/p5-Lingua-EN-MatchNames/Makefile
+++ b/textproc/p5-Lingua-EN-MatchNames/Makefile
@@ -21,10 +21,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Lingua/EN/NameParse.pm:${PORTSDIR}/textproc/p5-Lingu
${SITE_PERL}/${PERL_ARCH}/Text/Metaphone.pm:${PORTSDIR}/textproc/p5-Text-Metaphone
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Lingua::EN::MatchNames.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-MatchNames/pkg-plist b/textproc/p5-Lingua-EN-MatchNames/pkg-plist
index 328e816d86e6..bf1f57546ad7 100644
--- a/textproc/p5-Lingua-EN-MatchNames/pkg-plist
+++ b/textproc/p5-Lingua-EN-MatchNames/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/MatchNames.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/MatchNames.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-NameCase/Makefile b/textproc/p5-Lingua-EN-NameCase/Makefile
index 4ea9a33cc4b2..e1c5af01768a 100644
--- a/textproc/p5-Lingua-EN-NameCase/Makefile
+++ b/textproc/p5-Lingua-EN-NameCase/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to fix the case of people's names
PERL_CONFIGURE= yes
MAN3= Lingua::EN::NameCase.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-NameCase/pkg-plist b/textproc/p5-Lingua-EN-NameCase/pkg-plist
index 54614a9e2065..411f8b0a5870 100644
--- a/textproc/p5-Lingua-EN-NameCase/pkg-plist
+++ b/textproc/p5-Lingua-EN-NameCase/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/NameCase.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/NameCase.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-NameParse/Makefile b/textproc/p5-Lingua-EN-NameParse/Makefile
index fda3cd54d472..c262487769f8 100644
--- a/textproc/p5-Lingua-EN-NameParse/Makefile
+++ b/textproc/p5-Lingua-EN-NameParse/Makefile
@@ -18,11 +18,10 @@ COMMENT= Perl routines for manipulating a person's name
BUILD_DEPENDS= ${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Lingua::EN::NameGrammar.3 \
Lingua::EN::NameParse.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-NameParse/pkg-plist b/textproc/p5-Lingua-EN-NameParse/pkg-plist
index af4463564abc..aeac9708f2ae 100644
--- a/textproc/p5-Lingua-EN-NameParse/pkg-plist
+++ b/textproc/p5-Lingua-EN-NameParse/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/NameGrammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/NameParse.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/NameGrammar.pm
+%%SITE_PERL%%/Lingua/EN/NameParse.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Lingua/EN
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Nickname/Makefile b/textproc/p5-Lingua-EN-Nickname/Makefile
index 61f1161bba96..11ead49f7f42 100644
--- a/textproc/p5-Lingua-EN-Nickname/Makefile
+++ b/textproc/p5-Lingua-EN-Nickname/Makefile
@@ -18,6 +18,5 @@ COMMENT= Genealogical nickname matching (Liz=Beth)
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Nickname.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Nickname/pkg-plist b/textproc/p5-Lingua-EN-Nickname/pkg-plist
index 984986de941f..ace6d667c365 100644
--- a/textproc/p5-Lingua-EN-Nickname/pkg-plist
+++ b/textproc/p5-Lingua-EN-Nickname/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Nickname.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/nickhash.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Nickname.pm
+%%SITE_PERL%%/Lingua/EN/nickhash.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Lingua/EN
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
index f26ccff3376f..63ec42a0cc9d 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
@@ -18,6 +18,5 @@ COMMENT= Go from cardinal number (3) to ordinal ("3rd")
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Numbers::Ordinate.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
index 580f23e4ea5c..dd1824999427 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Numbers/Ordinate.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Numbers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Numbers/Ordinate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Numbers 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Numbers/Makefile b/textproc/p5-Lingua-EN-Numbers/Makefile
index 85c3afe37e1e..9c8909c31a40 100644
--- a/textproc/p5-Lingua-EN-Numbers/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers/Makefile
@@ -18,6 +18,5 @@ COMMENT= Converts numeric values into their English string equivalents
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Numbers.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Numbers/pkg-plist b/textproc/p5-Lingua-EN-Numbers/pkg-plist
index 4b118ca69056..c3ca9338a694 100644
--- a/textproc/p5-Lingua-EN-Numbers/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Numbers.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Numbers.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Sentence/Makefile b/textproc/p5-Lingua-EN-Sentence/Makefile
index 52c953b90d29..c42d5ee38345 100644
--- a/textproc/p5-Lingua-EN-Sentence/Makefile
+++ b/textproc/p5-Lingua-EN-Sentence/Makefile
@@ -17,7 +17,6 @@ COMMENT= Module for splitting text into sentences
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Sentence.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-extract:
@${RM} -f ${WRKSRC}/lib/Lingua/EN/Sentence.pm~
diff --git a/textproc/p5-Lingua-EN-Sentence/pkg-plist b/textproc/p5-Lingua-EN-Sentence/pkg-plist
index ee49f991cdf1..86455eb85b62 100644
--- a/textproc/p5-Lingua-EN-Sentence/pkg-plist
+++ b/textproc/p5-Lingua-EN-Sentence/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Sentence.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Sentence.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Squeeze/Makefile b/textproc/p5-Lingua-EN-Squeeze/Makefile
index ed91f9b22c1e..cbf5125707fd 100644
--- a/textproc/p5-Lingua-EN-Squeeze/Makefile
+++ b/textproc/p5-Lingua-EN-Squeeze/Makefile
@@ -19,6 +19,5 @@ COMMENT= Shorten text to minimum syllables by using hash table
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Squeeze.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Squeeze/pkg-plist b/textproc/p5-Lingua-EN-Squeeze/pkg-plist
index 03efe63657d6..3d631d057207 100644
--- a/textproc/p5-Lingua-EN-Squeeze/pkg-plist
+++ b/textproc/p5-Lingua-EN-Squeeze/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Squeeze.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Squeeze.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Summarize/Makefile b/textproc/p5-Lingua-EN-Summarize/Makefile
index 2a7617dde72e..40feda6f348b 100644
--- a/textproc/p5-Lingua-EN-Summarize/Makefile
+++ b/textproc/p5-Lingua-EN-Summarize/Makefile
@@ -18,11 +18,10 @@ COMMENT= A simple tool for summarizing bodies of English text
BUILD_DEPENDS= ${SITE_PERL}/HTML/Summary.pm:${PORTSDIR}/www/p5-HTML-Summary
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Filters.3 \
Lingua::EN::Summarize.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Summarize/pkg-plist b/textproc/p5-Lingua-EN-Summarize/pkg-plist
index 580cc9599207..dcff42a5271e 100644
--- a/textproc/p5-Lingua-EN-Summarize/pkg-plist
+++ b/textproc/p5-Lingua-EN-Summarize/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Summarize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Summarize/Filters.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Summarize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Summarize.pm
+%%SITE_PERL%%/Lingua/EN/Summarize/Filters.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Summarize 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-EN-Syllable/Makefile b/textproc/p5-Lingua-EN-Syllable/Makefile
index 91b14f4e9799..2dcf86cc5329 100644
--- a/textproc/p5-Lingua-EN-Syllable/Makefile
+++ b/textproc/p5-Lingua-EN-Syllable/Makefile
@@ -18,6 +18,5 @@ COMMENT= Routine for estimating syllable count in words
PERL_CONFIGURE= yes
MAN3= Lingua::EN::Syllable.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Syllable/pkg-plist b/textproc/p5-Lingua-EN-Syllable/pkg-plist
index ae5e1b959dba..6e3fb503a2f7 100644
--- a/textproc/p5-Lingua-EN-Syllable/pkg-plist
+++ b/textproc/p5-Lingua-EN-Syllable/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN/Syllable.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/EN/Syllable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-Ident/pkg-plist b/textproc/p5-Lingua-Ident/pkg-plist
index 8e802a98649e..380848cbc407 100644
--- a/textproc/p5-Lingua-Ident/pkg-plist
+++ b/textproc/p5-Lingua-Ident/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Ident.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Ident/.packlist
+%%SITE_PERL%%/Lingua/Ident.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident/.packlist
bin/trainlid
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Ident 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
diff --git a/textproc/p5-Lingua-Ispell/pkg-plist b/textproc/p5-Lingua-Ispell/pkg-plist
index 1882e4a7e0ca..b8d17e603177 100644
--- a/textproc/p5-Lingua-Ispell/pkg-plist
+++ b/textproc/p5-Lingua-Ispell/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Ispell/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Ispell.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Lingua/Ispell
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ispell/.packlist
+%%SITE_PERL%%/Lingua/Ispell.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/Ispell
+@dirrm %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Preferred/Makefile b/textproc/p5-Lingua-Preferred/Makefile
index b28417911a68..ea46387726b8 100644
--- a/textproc/p5-Lingua-Preferred/Makefile
+++ b/textproc/p5-Lingua-Preferred/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= svenasse@polaris.ca
COMMENT= Perl extension to choose a language
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Log/TraceMessages.pm:${PORTSDIR}/devel/p5-Log-TraceMessages
+RUN_DEPENDS= ${SITE_PERL}/Log/TraceMessages.pm:${PORTSDIR}/devel/p5-Log-TraceMessages
PERL_CONFIGURE= yes
MAN3= Lingua::Preferred.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-Preferred/pkg-plist b/textproc/p5-Lingua-Preferred/pkg-plist
index 37f6d0733f00..392f69888d2a 100644
--- a/textproc/p5-Lingua-Preferred/pkg-plist
+++ b/textproc/p5-Lingua-Preferred/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Preferred.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Preferred/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Lingua/Preferred/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Lingua/Preferred
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Lingua 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Preferred
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/Preferred.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred/.packlist
+%%SITE_PERL%%/auto/Lingua/Preferred/autosplit.ix
+@dirrm %%SITE_PERL%%/auto/Lingua/Preferred
+@unexec rmdir %D/%%SITE_PERL%%/auto/Lingua 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
diff --git a/textproc/p5-MARC/Makefile b/textproc/p5-MARC/Makefile
index cd0267f8f3ea..ddf53d23477e 100644
--- a/textproc/p5-MARC/Makefile
+++ b/textproc/p5-MARC/Makefile
@@ -18,6 +18,5 @@ COMMENT= A module for manipulating bibliographic records in the USMARC format
PERL_CONFIGURE= yes
MAN3= MARC.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-MARC/pkg-plist b/textproc/p5-MARC/pkg-plist
index 388c280c4acb..b0c5d440c89e 100644
--- a/textproc/p5-MARC/pkg-plist
+++ b/textproc/p5-MARC/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MARC/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/MARC.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MARC
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC/.packlist
+%%SITE_PERL%%/MARC.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MARC
diff --git a/textproc/p5-NetAddr-IP-Find/Makefile b/textproc/p5-NetAddr-IP-Find/Makefile
index 8784b220fef1..91a7cca4638f 100644
--- a/textproc/p5-NetAddr-IP-Find/Makefile
+++ b/textproc/p5-NetAddr-IP-Find/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
COMMENT= Iterates over all IP addresses in a text similar to Email::Find
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
+RUN_DEPENDS= ${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
PERL_CONFIGURE= yes
INSTALL_TARGET= pure_install
diff --git a/textproc/p5-NetAddr-IP-Find/pkg-plist b/textproc/p5-NetAddr-IP-Find/pkg-plist
index fde4508d2bce..09e01e051d9b 100644
--- a/textproc/p5-NetAddr-IP-Find/pkg-plist
+++ b/textproc/p5-NetAddr-IP-Find/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP/Find.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/NetAddr 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr 2>/dev/null || true
+%%SITE_PERL%%/NetAddr/IP/Find.pm
+@unexec rmdir %D/%%SITE_PERL%%/NetAddr/IP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/NetAddr 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr 2>/dev/null || true
diff --git a/textproc/p5-Number-Format/Makefile b/textproc/p5-Number-Format/Makefile
index 25b11962d83e..c766ad103b0c 100644
--- a/textproc/p5-Number-Format/Makefile
+++ b/textproc/p5-Number-Format/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for formatting numbers
PERL_CONFIGURE= yes
MAN3= Number::Format.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Number-Format/pkg-plist b/textproc/p5-Number-Format/pkg-plist
index c8a967674e32..75772136a33d 100644
--- a/textproc/p5-Number-Format/pkg-plist
+++ b/textproc/p5-Number-Format/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Number/Format/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Number/Format.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Number/Format
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Number 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Number 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format/.packlist
+%%SITE_PERL%%/Number/Format.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Number 2>/dev/null || true
diff --git a/textproc/p5-Orchard-Perl/Makefile b/textproc/p5-Orchard-Perl/Makefile
index 388664be27fe..c2cb7ccc991d 100644
--- a/textproc/p5-Orchard-Perl/Makefile
+++ b/textproc/p5-Orchard-Perl/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= Perl interface to Orchard-C
-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
LIB_DEPENDS= orchard.0:${PORTSDIR}/textproc/orchard-c
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Orchard-Perl/pkg-plist b/textproc/p5-Orchard-Perl/pkg-plist
index ec1ae7f35424..ad6659d16e83 100644
--- a/textproc/p5-Orchard-Perl/pkg-plist
+++ b/textproc/p5-Orchard-Perl/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/Class/Orchard/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/Class/Orchard/TreeBuilder.pm
-lib/perl5/site_perl/%%PERL_VER%%/SAXDriver/XMLParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Orchard.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Orchard-Perl/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Orchard-Perl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SAXDriver 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Orchard
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
+%%SITE_PERL%%/Class/Orchard/Node.pm
+%%SITE_PERL%%/Class/Orchard/TreeBuilder.pm
+%%SITE_PERL%%/SAXDriver/XMLParser.pm
+%%SITE_PERL%%/XML/Orchard.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Orchard-Perl/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Orchard-Perl
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/SAXDriver 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Class/Orchard
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 33e737adaa51..cbb06e8d066d 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PERL_SITELIBDIR}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/arch
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
FILES= API2.pm API2/IOString.pm API2/UniMap.pm \
API2/PDF/FileAPI.pm API2/TTF/Font.pm
diff --git a/textproc/p5-PDF-API3/Makefile b/textproc/p5-PDF-API3/Makefile
index 33e737adaa51..cbb06e8d066d 100644
--- a/textproc/p5-PDF-API3/Makefile
+++ b/textproc/p5-PDF-API3/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PERL_SITELIBDIR}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/arch
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_SITELIBDIR= ${SITE_PERL}
FILES= API2.pm API2/IOString.pm API2/UniMap.pm \
API2/PDF/FileAPI.pm API2/TTF/Font.pm
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index 8853a3b2d32c..96132307a271 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -17,6 +17,5 @@ COMMENT= A perl script to convert text files to PDF files
PERL_CONFIGURE= yes
MAN3= PDF::Create.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-PDF-Create/pkg-plist b/textproc/p5-PDF-Create/pkg-plist
index 337a44f67cd8..a5a1dd6f531b 100644
--- a/textproc/p5-PDF-Create/pkg-plist
+++ b/textproc/p5-PDF-Create/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/Create/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/PDF/Create/Page.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/Create/Outline.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/sample.pl
-lib/perl5/site_perl/%%PERL_VER%%/PDF/Create.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/Create
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/Create
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/PDF 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create/.packlist
+%%SITE_PERL%%/PDF/Create/Page.pm
+%%SITE_PERL%%/PDF/Create/Outline.pm
+%%SITE_PERL%%/PDF/sample.pl
+%%SITE_PERL%%/PDF/Create.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create
+@dirrm %%SITE_PERL%%/PDF/Create
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/PDF 2>/dev/null || true
diff --git a/textproc/p5-Parse-Syslog/Makefile b/textproc/p5-Parse-Syslog/Makefile
index 9348e52766d6..ca53e50a2167 100644
--- a/textproc/p5-Parse-Syslog/Makefile
+++ b/textproc/p5-Parse-Syslog/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 routines that present a simple interface to parse syslog files
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Parse::Syslog.3
.include <bsd.port.mk>
diff --git a/textproc/p5-Parse-Syslog/pkg-plist b/textproc/p5-Parse-Syslog/pkg-plist
index 35a768f8afa6..074c9048d381 100644
--- a/textproc/p5-Parse-Syslog/pkg-plist
+++ b/textproc/p5-Parse-Syslog/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Parse/Syslog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/Syslog/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/Syslog
-@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/Syslog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog
+@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/textproc/p5-Pod-Constants/Makefile b/textproc/p5-Pod-Constants/Makefile
index 01ad0ac9f9cf..11349801f60b 100644
--- a/textproc/p5-Pod-Constants/Makefile
+++ b/textproc/p5-Pod-Constants/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Include constants from POD
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Pod-Constants/pkg-plist b/textproc/p5-Pod-Constants/pkg-plist
index 3d0908340b34..b2fd4e9fa53f 100644
--- a/textproc/p5-Pod-Constants/pkg-plist
+++ b/textproc/p5-Pod-Constants/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod/Constants/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Constants.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod/Constants
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants/.packlist
+%%SITE_PERL%%/Pod/Constants.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants
+@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
diff --git a/textproc/p5-Pod-POM/pkg-plist b/textproc/p5-Pod-POM/pkg-plist
index 212401393921..6176a8df90b7 100644
--- a/textproc/p5-Pod-POM/pkg-plist
+++ b/textproc/p5-Pod-POM/pkg-plist
@@ -1,17 +1,17 @@
bin/pom2
bin/podlint
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod/POM/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/Nodes.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View/Pod.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View/Text.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod/POM/View
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod/POM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod/POM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/.packlist
+%%SITE_PERL%%/Pod/POM.pm
+%%SITE_PERL%%/Pod/POM/Constants.pm
+%%SITE_PERL%%/Pod/POM/Node.pm
+%%SITE_PERL%%/Pod/POM/Nodes.pm
+%%SITE_PERL%%/Pod/POM/Test.pm
+%%SITE_PERL%%/Pod/POM/View.pm
+%%SITE_PERL%%/Pod/POM/View/HTML.pm
+%%SITE_PERL%%/Pod/POM/View/Pod.pm
+%%SITE_PERL%%/Pod/POM/View/Text.pm
+@dirrm %%SITE_PERL%%/Pod/POM/View
+@dirrm %%SITE_PERL%%/Pod/POM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM
+@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
diff --git a/textproc/p5-RADIUS-UserFile/Makefile b/textproc/p5-RADIUS-UserFile/Makefile
index 2d635ff80880..7a20340a1365 100644
--- a/textproc/p5-RADIUS-UserFile/Makefile
+++ b/textproc/p5-RADIUS-UserFile/Makefile
@@ -18,11 +18,10 @@ COMMENT= Perl extension for manipulating a RADIUS users file
BUILD_DEPENDS= ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= RADIUS::UserFile.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-RADIUS-UserFile/pkg-plist b/textproc/p5-RADIUS-UserFile/pkg-plist
index 80ca56cf88b5..db40ae1d6961 100644
--- a/textproc/p5-RADIUS-UserFile/pkg-plist
+++ b/textproc/p5-RADIUS-UserFile/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/RADIUS/UserFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RADIUS/UserFile/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RADIUS/UserFile
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RADIUS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/RADIUS 2>/dev/null || true
+%%SITE_PERL%%/RADIUS/UserFile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/RADIUS 2>/dev/null || true
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index be75b16b7bbc..f5bf623f652a 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= An object oriented Perl modules for handling tasks related to RDF
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-RDF-Core/pkg-plist b/textproc/p5-RDF-Core/pkg-plist
index 0baab0f2f738..d59d5eb972dc 100644
--- a/textproc/p5-RDF-Core/pkg-plist
+++ b/textproc/p5-RDF-Core/pkg-plist
@@ -1,29 +1,29 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF/Core/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator/Memory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator/Postgres.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Evaluator.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Function.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Literal.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Model/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Model/Serializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/ModelSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/NodeFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Schema.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Serializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage/Memory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage/Postgres.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Core/.packlist
+%%SITE_PERL%%/RDF/Core.pm
+%%SITE_PERL%%/RDF/Core/Constants.pm
+%%SITE_PERL%%/RDF/Core/Enumerator.pm
+%%SITE_PERL%%/RDF/Core/Enumerator/DB_File.pm
+%%SITE_PERL%%/RDF/Core/Enumerator/Memory.pm
+%%SITE_PERL%%/RDF/Core/Enumerator/Postgres.pm
+%%SITE_PERL%%/RDF/Core/Evaluator.pm
+%%SITE_PERL%%/RDF/Core/Function.pm
+%%SITE_PERL%%/RDF/Core/Literal.pm
+%%SITE_PERL%%/RDF/Core/Model.pm
+%%SITE_PERL%%/RDF/Core/Model/Parser.pm
+%%SITE_PERL%%/RDF/Core/Model/Serializer.pm
+%%SITE_PERL%%/RDF/Core/ModelSet.pm
+%%SITE_PERL%%/RDF/Core/Node.pm
+%%SITE_PERL%%/RDF/Core/NodeFactory.pm
+%%SITE_PERL%%/RDF/Core/Parser.pm
+%%SITE_PERL%%/RDF/Core/Query.pm
+%%SITE_PERL%%/RDF/Core/Resource.pm
+%%SITE_PERL%%/RDF/Core/Schema.pm
+%%SITE_PERL%%/RDF/Core/Serializer.pm
+%%SITE_PERL%%/RDF/Core/Statement.pm
+%%SITE_PERL%%/RDF/Core/Storage.pm
+%%SITE_PERL%%/RDF/Core/Storage/DB_File.pm
+%%SITE_PERL%%/RDF/Core/Storage/Memory.pm
+%%SITE_PERL%%/RDF/Core/Storage/Postgres.pm
%%PORTDOCS%%%%DOCSDIR%%/RDF/Core/Enumerator/DB_File.pm.html
%%PORTDOCS%%%%DOCSDIR%%/RDF/Core/Enumerator/Memory.pm.html
%%PORTDOCS%%%%DOCSDIR%%/RDF/Core/Enumerator/Postgres.pm.html
@@ -56,10 +56,10 @@ lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage/Postgres.pm
%%PORTDOCS%%@dirrm %%DOCSDIR%%/RDF/Core
%%PORTDOCS%%@dirrm %%DOCSDIR%%/RDF
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Enumerator
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Model
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Core/Storage
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Core
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/RDF 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF/Core
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true
+@dirrm %%SITE_PERL%%/RDF/Core/Enumerator
+@dirrm %%SITE_PERL%%/RDF/Core/Model
+@dirrm %%SITE_PERL%%/RDF/Core/Storage
+@dirrm %%SITE_PERL%%/RDF/Core
+@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Core
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true
diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile
index cfe572276071..64260093352d 100644
--- a/textproc/p5-RDFStore/Makefile
+++ b/textproc/p5-RDFStore/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Perl API for RDF Storage
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Digest.pm:${PORTSDIR}/security/p5-Digest \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-RDFStore/pkg-plist b/textproc/p5-RDFStore/pkg-plist
index a75f7fac5afc..f161d2c7611e 100644
--- a/textproc/p5-RDFStore/pkg-plist
+++ b/textproc/p5-RDFStore/pkg-plist
@@ -1,45 +1,45 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDFStore/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/MagicTie.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Literal.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/NodeFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser/OpenHealth.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser/SiRPAC.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser/Styles/MagicTie.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/RDFNode.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/SchemaModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/SetModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/Abstract.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/Digestable.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/Generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/SHA1.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Literal.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/NodeFactory.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/RDFNode.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/SetModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/VirtualModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Vocabulary/Generator.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/VirtualModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/DAML.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/DC.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/DCQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/RDF.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary/RDFS.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser/Styles
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Parser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Digest
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford/Vocabulary
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Stanford
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore/Vocabulary
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDFStore
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDFStore
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/.packlist
+%%SITE_PERL%%/Data/MagicTie.pm
+%%SITE_PERL%%/RDFStore.pm
+%%SITE_PERL%%/RDFStore/Literal.pm
+%%SITE_PERL%%/RDFStore/Model.pm
+%%SITE_PERL%%/RDFStore/NodeFactory.pm
+%%SITE_PERL%%/RDFStore/Parser/OpenHealth.pm
+%%SITE_PERL%%/RDFStore/Parser/SiRPAC.pm
+%%SITE_PERL%%/RDFStore/Parser/Styles/MagicTie.pm
+%%SITE_PERL%%/RDFStore/RDFNode.pm
+%%SITE_PERL%%/RDFStore/Resource.pm
+%%SITE_PERL%%/RDFStore/SchemaModel.pm
+%%SITE_PERL%%/RDFStore/SetModel.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/Abstract.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/Digestable.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/Generic.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/MD5.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/SHA1.pm
+%%SITE_PERL%%/RDFStore/Stanford/Digest/Util.pm
+%%SITE_PERL%%/RDFStore/Stanford/Literal.pm
+%%SITE_PERL%%/RDFStore/Stanford/Model.pm
+%%SITE_PERL%%/RDFStore/Stanford/NodeFactory.pm
+%%SITE_PERL%%/RDFStore/Stanford/RDFNode.pm
+%%SITE_PERL%%/RDFStore/Stanford/Resource.pm
+%%SITE_PERL%%/RDFStore/Stanford/SetModel.pm
+%%SITE_PERL%%/RDFStore/Stanford/Statement.pm
+%%SITE_PERL%%/RDFStore/Stanford/VirtualModel.pm
+%%SITE_PERL%%/RDFStore/Stanford/Vocabulary/Generator.pm
+%%SITE_PERL%%/RDFStore/Statement.pm
+%%SITE_PERL%%/RDFStore/VirtualModel.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/DAML.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/DC.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/DCQ.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/RDF.pm
+%%SITE_PERL%%/RDFStore/Vocabulary/RDFS.pm
+@dirrm %%SITE_PERL%%/RDFStore/Parser/Styles
+@dirrm %%SITE_PERL%%/RDFStore/Parser
+@dirrm %%SITE_PERL%%/RDFStore/Stanford/Digest
+@dirrm %%SITE_PERL%%/RDFStore/Stanford/Vocabulary
+@dirrm %%SITE_PERL%%/RDFStore/Stanford
+@dirrm %%SITE_PERL%%/RDFStore/Vocabulary
+@dirrm %%SITE_PERL%%/RDFStore
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
diff --git a/textproc/p5-Search-Saryer/Makefile b/textproc/p5-Search-Saryer/Makefile
index 8986d7f70694..c529af4c4a48 100644
--- a/textproc/p5-Search-Saryer/Makefile
+++ b/textproc/p5-Search-Saryer/Makefile
@@ -21,6 +21,5 @@ PERL_CONFIGURE= yes
MAN3= Search::Saryer.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Search-Saryer/pkg-plist b/textproc/p5-Search-Saryer/pkg-plist
index ec769ceb739d..97b2244a408e 100644
--- a/textproc/p5-Search-Saryer/pkg-plist
+++ b/textproc/p5-Search-Saryer/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Search/Saryer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Saryer/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search/Saryer
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Search/Saryer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Search 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
diff --git a/textproc/p5-Sort-ArbBiLex/Makefile b/textproc/p5-Sort-ArbBiLex/Makefile
index 5c423e7488fb..655cb9054a78 100644
--- a/textproc/p5-Sort-ArbBiLex/Makefile
+++ b/textproc/p5-Sort-ArbBiLex/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to make sort functions for arbitrary sort orders
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Sort::ArbBiLex.3
.include <bsd.port.mk>
diff --git a/textproc/p5-Sort-ArbBiLex/pkg-plist b/textproc/p5-Sort-ArbBiLex/pkg-plist
index 586ed3251688..e41b834b39fb 100644
--- a/textproc/p5-Sort-ArbBiLex/pkg-plist
+++ b/textproc/p5-Sort-ArbBiLex/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sort/ArbBiLex.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex
-@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/ArbBiLex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex
+@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/textproc/p5-Sort-Fields/Makefile b/textproc/p5-Sort-Fields/Makefile
index c74933bd4f83..e2ecd11e7612 100644
--- a/textproc/p5-Sort-Fields/Makefile
+++ b/textproc/p5-Sort-Fields/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module to sort lines containing delimited fields
PERL_CONFIGURE= yes
MAN3= Sort::Fields.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Sort-Fields/pkg-plist b/textproc/p5-Sort-Fields/pkg-plist
index 65611509b27f..09c561b1fc78 100644
--- a/textproc/p5-Sort-Fields/pkg-plist
+++ b/textproc/p5-Sort-Fields/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/Fields/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Sort/Fields.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/Fields
-@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%%/%%PERL_ARCH%%/auto/Sort/Fields/.packlist
+%%SITE_PERL%%/Sort/Fields.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields
+@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/textproc/p5-Sort-PolySort/Makefile b/textproc/p5-Sort-PolySort/Makefile
index b399d00e596c..1e0cabb9b9e0 100644
--- a/textproc/p5-Sort-PolySort/Makefile
+++ b/textproc/p5-Sort-PolySort/Makefile
@@ -18,7 +18,6 @@ COMMENT= General rules-based sorting of lists
PERL_CONFIGURE= yes
MAN3= Sort::PolySort.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@${PERL} -pi -e '/^\$$Sort::PolySort::VERSION =/ && chomp' \
diff --git a/textproc/p5-Sort-PolySort/pkg-plist b/textproc/p5-Sort-PolySort/pkg-plist
index 39aaf77427db..87da142e1b1c 100644
--- a/textproc/p5-Sort-PolySort/pkg-plist
+++ b/textproc/p5-Sort-PolySort/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/PolySort/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Sort/PolySort.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/PolySort
-@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%%/%%PERL_ARCH%%/auto/Sort/PolySort/.packlist
+%%SITE_PERL%%/Sort/PolySort.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/PolySort
+@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/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 387a5edbeca9..4fe797101e4e 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -24,7 +24,6 @@ PLIST_SUB= EXAMPLESDIR="share/examples/${PORTNAME}"
MAN3= Spreadsheet::ParseExcel.3 \
Spreadsheet::ParseExcel::SaveParser.3 \
Spreadsheet::ParseExcel::Utility.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
diff --git a/textproc/p5-String-Scanf/Makefile b/textproc/p5-String-Scanf/Makefile
index 4f60fc8fe3ba..95e1ea79c649 100644
--- a/textproc/p5-String-Scanf/Makefile
+++ b/textproc/p5-String-Scanf/Makefile
@@ -18,6 +18,5 @@ COMMENT= Emulates the sscanf() of the C stdio library
PERL_CONFIGURE= yes
MAN3= String::Scanf.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-String-Scanf/pkg-plist b/textproc/p5-String-Scanf/pkg-plist
index b20d3ce3216d..603efc4b5c2d 100644
--- a/textproc/p5-String-Scanf/pkg-plist
+++ b/textproc/p5-String-Scanf/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Scanf/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/String/Scanf.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Scanf
-@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%%/%%PERL_ARCH%%/auto/String/Scanf/.packlist
+%%SITE_PERL%%/String/Scanf.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf
+@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/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index bea2db08836e..c96aae00aa14 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module for quote strings for passing through the shell
PERL_CONFIGURE= yes
MAN3= String::ShellQuote.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-String-ShellQuote/pkg-plist b/textproc/p5-String-ShellQuote/pkg-plist
index 73e216715272..42b07f38e6a1 100644
--- a/textproc/p5-String-ShellQuote/pkg-plist
+++ b/textproc/p5-String-ShellQuote/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/ShellQuote/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/String/ShellQuote.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/ShellQuote
-@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%%/%%PERL_ARCH%%/auto/String/ShellQuote/.packlist
+%%SITE_PERL%%/String/ShellQuote.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote
+@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/textproc/p5-String-Strip/Makefile b/textproc/p5-String-Strip/Makefile
index 662ae4f2778d..2adc1811d259 100644
--- a/textproc/p5-String-Strip/Makefile
+++ b/textproc/p5-String-Strip/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for fast, commonly used, string operations
PERL_CONFIGURE= yes
MAN3= String::Strip.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-String-Strip/pkg-plist b/textproc/p5-String-Strip/pkg-plist
index 580b7b42bd94..9fb91550c52e 100644
--- a/textproc/p5-String-Strip/pkg-plist
+++ b/textproc/p5-String-Strip/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip/Strip.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip/Strip.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/String/Strip.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Strip
-@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%%/auto/String/Strip/Strip.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/Strip.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/String/Strip.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip
+@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/textproc/p5-TeX-Hyphen/Makefile b/textproc/p5-TeX-Hyphen/Makefile
index 01292ecc9541..8ef4c1a006be 100644
--- a/textproc/p5-TeX-Hyphen/Makefile
+++ b/textproc/p5-TeX-Hyphen/Makefile
@@ -17,7 +17,6 @@ COMMENT= Hyphenate words using TeX's patterns
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= TeX::Hyphen.3 TeX::Hyphen::czech.3 TeX::Hyphen::german.3
.include <bsd.port.mk>
diff --git a/textproc/p5-TeX-Hyphen/pkg-plist b/textproc/p5-TeX-Hyphen/pkg-plist
index f44e3c1a161e..6d6cfca3fde7 100644
--- a/textproc/p5-TeX-Hyphen/pkg-plist
+++ b/textproc/p5-TeX-Hyphen/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/TeX/Hyphen.pm
-lib/perl5/site_perl/%%PERL_VER%%/TeX/Hyphen/czech.pm
-lib/perl5/site_perl/%%PERL_VER%%/TeX/Hyphen/german.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TeX/Hyphen/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TeX/Hyphen
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/TeX/Hyphen
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/TeX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TeX 2>/dev/null || true
+%%SITE_PERL%%/TeX/Hyphen.pm
+%%SITE_PERL%%/TeX/Hyphen/czech.pm
+%%SITE_PERL%%/TeX/Hyphen/german.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen
+@dirrm %%SITE_PERL%%/TeX/Hyphen
+@unexec rmdir %D/%%SITE_PERL%%/TeX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX 2>/dev/null || true
diff --git a/textproc/p5-Text-Bind/Makefile b/textproc/p5-Text-Bind/Makefile
index 4d4bc1d8c569..67b14f711e0c 100644
--- a/textproc/p5-Text-Bind/Makefile
+++ b/textproc/p5-Text-Bind/Makefile
@@ -18,6 +18,5 @@ COMMENT= Bind Perl structures to text files
PERL_CONFIGURE= yes
MAN3= Text::Bind.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Bind/pkg-plist b/textproc/p5-Text-Bind/pkg-plist
index 0ccbc5eb698f..d528cb84fbfa 100644
--- a/textproc/p5-Text-Bind/pkg-plist
+++ b/textproc/p5-Text-Bind/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Bind/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Bind.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Bind
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind/.packlist
+%%SITE_PERL%%/Text/Bind.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-CSV/Makefile b/textproc/p5-Text-CSV/Makefile
index 1143e9e07f4d..5a67154e4bee 100644
--- a/textproc/p5-Text-CSV/Makefile
+++ b/textproc/p5-Text-CSV/Makefile
@@ -18,6 +18,5 @@ COMMENT= Composition and decomposition of comma-separated values
PERL_CONFIGURE= yes
MAN3= Text::CSV.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-CSV/pkg-plist b/textproc/p5-Text-CSV/pkg-plist
index 34ad51bb5880..adb60f3c722c 100644
--- a/textproc/p5-Text-CSV/pkg-plist
+++ b/textproc/p5-Text-CSV/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/version.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/new.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/status.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/error_input.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/string.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/fields.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/combine.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/parse.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/_bite.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Text/CSV/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/CSV.pm
+%%SITE_PERL%%/auto/Text/CSV/version.al
+%%SITE_PERL%%/auto/Text/CSV/new.al
+%%SITE_PERL%%/auto/Text/CSV/status.al
+%%SITE_PERL%%/auto/Text/CSV/error_input.al
+%%SITE_PERL%%/auto/Text/CSV/string.al
+%%SITE_PERL%%/auto/Text/CSV/fields.al
+%%SITE_PERL%%/auto/Text/CSV/combine.al
+%%SITE_PERL%%/auto/Text/CSV/parse.al
+%%SITE_PERL%%/auto/Text/CSV/_bite.al
+%%SITE_PERL%%/auto/Text/CSV/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/.packlist
+%%SITE_PERL%%/Text/CSV.pm
@dirrm lib/perl5/site_perl/5.6.0/mach/auto/Text/CSV
@dirrm lib/perl5/site_perl/5.6.0/mach/auto/Text
@dirrm lib/perl5/site_perl/5.6.0/auto/Text/CSV
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index 236f52097bac..c0f7b6553fcb 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -18,6 +18,5 @@ COMMENT= Composition and decomposition of comma-separated values
PERL_CONFIGURE= yes
MAN3= Text::CSV_XS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-CSV_XS/pkg-plist b/textproc/p5-Text-CSV_XS/pkg-plist
index e1ab5bf6ef92..cdfd7385a9ca 100644
--- a/textproc/p5-Text-CSV_XS/pkg-plist
+++ b/textproc/p5-Text-CSV_XS/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV_XS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV_XS/CSV_XS.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV_XS/CSV_XS.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/CSV_XS.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/CSV_XS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV_XS/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV_XS/CSV_XS.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV_XS/CSV_XS.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/CSV_XS.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV_XS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index 4f750a3f4f65..4dd4c6d8ff8e 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Text::Diff - Perform diffs on files and record sets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS= ${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Text::Diff.3 Text::Diff::Table.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Diff/pkg-plist b/textproc/p5-Text-Diff/pkg-plist
index 09cf96e27f0b..d59ca682fb75 100644
--- a/textproc/p5-Text-Diff/pkg-plist
+++ b/textproc/p5-Text-Diff/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Diff/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Diff/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Diff.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Diff
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/Diff
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff/.packlist
+%%SITE_PERL%%/Text/Diff/Table.pm
+%%SITE_PERL%%/Text/Diff.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Text/Diff
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-DoubleMetaphone/Makefile b/textproc/p5-Text-DoubleMetaphone/Makefile
index 05c1a568b69d..e4aba3c72309 100644
--- a/textproc/p5-Text-DoubleMetaphone/Makefile
+++ b/textproc/p5-Text-DoubleMetaphone/Makefile
@@ -18,6 +18,5 @@ COMMENT= Phonetic encoding of words
PERL_CONFIGURE= yes
MAN3= Text::DoubleMetaphone.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-DoubleMetaphone/pkg-plist b/textproc/p5-Text-DoubleMetaphone/pkg-plist
index 675a1088944f..d2ec9b13893d 100644
--- a/textproc/p5-Text-DoubleMetaphone/pkg-plist
+++ b/textproc/p5-Text-DoubleMetaphone/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/DoubleMetaphone.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/DoubleMetaphone.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/DoubleMetaphone.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-EtText/pkg-plist b/textproc/p5-Text-EtText/pkg-plist
index 2fd36f3f0185..242e02a0f3e1 100644
--- a/textproc/p5-Text-EtText/pkg-plist
+++ b/textproc/p5-Text-EtText/pkg-plist
@@ -1,13 +1,13 @@
bin/ethtml2text
bin/ettext2html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/EtText/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/Lists.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/DefaultGlossary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/LinkGlossary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/HTML2EtText.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/EtText/EtText2HTML.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/EtText
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/EtText
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2> /dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/EtText/.packlist
+%%SITE_PERL%%/Text/EtText.pm
+%%SITE_PERL%%/Text/EtText/Lists.pm
+%%SITE_PERL%%/Text/EtText/DefaultGlossary.pm
+%%SITE_PERL%%/Text/EtText/LinkGlossary.pm
+%%SITE_PERL%%/Text/EtText/HTML2EtText.pm
+%%SITE_PERL%%/Text/EtText/EtText2HTML.pm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/EtText
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text/EtText
+@unexec rmdir %D/%%SITE_PERL%%/Text 2> /dev/null || true
diff --git a/textproc/p5-Text-FillIn/Makefile b/textproc/p5-Text-FillIn/Makefile
index 2d9f238bf5d9..c020e296fcf3 100644
--- a/textproc/p5-Text-FillIn/Makefile
+++ b/textproc/p5-Text-FillIn/Makefile
@@ -18,6 +18,5 @@ COMMENT= A class implementing a fill-in template
PERL_CONFIGURE= yes
MAN3= Text::FillIn.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-FillIn/pkg-plist b/textproc/p5-Text-FillIn/pkg-plist
index c611f7d45b0f..211fa5669e6f 100644
--- a/textproc/p5-Text-FillIn/pkg-plist
+++ b/textproc/p5-Text-FillIn/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FillIn/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/FillIn.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FillIn
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn/.packlist
+%%SITE_PERL%%/Text/FillIn.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Filter-Chain/Makefile b/textproc/p5-Text-Filter-Chain/Makefile
index 71e1c33391fd..f525a5d26743 100644
--- a/textproc/p5-Text-Filter-Chain/Makefile
+++ b/textproc/p5-Text-Filter-Chain/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Chains multiple Text::Filter objects and runs them in sequence
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Filter.pm:${PORTSDIR}/textproc/p5-Text-Filter
+BUILD_DEPENDS= ${SITE_PERL}/Text/Filter.pm:${PORTSDIR}/textproc/p5-Text-Filter
PERL_CONFIGURE= yes
MAN3= Text::Filter::Chain.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Filter-Chain/pkg-plist b/textproc/p5-Text-Filter-Chain/pkg-plist
index 67510eb1fb3f..0a2e61f99637 100644
--- a/textproc/p5-Text-Filter-Chain/pkg-plist
+++ b/textproc/p5-Text-Filter-Chain/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Filter/Chain/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Filter/Chain.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Filter/Chain
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/Filter 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain/.packlist
+%%SITE_PERL%%/Text/Filter/Chain.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain
+@unexec rmdir %D/%%SITE_PERL%%/Text/Filter 2>/dev/null || true
diff --git a/textproc/p5-Text-Filter/Makefile b/textproc/p5-Text-Filter/Makefile
index a8a7e80eda92..8abe0be0d888 100644
--- a/textproc/p5-Text-Filter/Makefile
+++ b/textproc/p5-Text-Filter/Makefile
@@ -18,6 +18,5 @@ COMMENT= Base class for objects that can read and write text lines
PERL_CONFIGURE= yes
MAN3= Text::Filter.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Filter/pkg-plist b/textproc/p5-Text-Filter/pkg-plist
index dc5e9aff99e3..bebd509d24d2 100644
--- a/textproc/p5-Text-Filter/pkg-plist
+++ b/textproc/p5-Text-Filter/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Filter/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Filter.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Filter
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/.packlist
+%%SITE_PERL%%/Text/Filter.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index b7c532d0f768..7c5102be0fca 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Various niceties for p5-Text-FixedLength lovers
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/FixedLength.pm:${PORTSDIR}/textproc/p5-Text-FixedLength
+BUILD_DEPENDS= ${SITE_PERL}/Text/FixedLength.pm:${PORTSDIR}/textproc/p5-Text-FixedLength
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Text::FixedLength::Extra.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1);$$1/;' \
diff --git a/textproc/p5-Text-FixedLength-Extra/pkg-plist b/textproc/p5-Text-FixedLength-Extra/pkg-plist
index 0b9386335efa..a6fe8de83e28 100644
--- a/textproc/p5-Text-FixedLength-Extra/pkg-plist
+++ b/textproc/p5-Text-FixedLength-Extra/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/FixedLength/Extra.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/FixedLength 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra/.packlist
+%%SITE_PERL%%/Text/FixedLength/Extra.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra
+@unexec rmdir %D/%%SITE_PERL%%/Text/FixedLength 2>/dev/null || true
diff --git a/textproc/p5-Text-FixedLength/Makefile b/textproc/p5-Text-FixedLength/Makefile
index 466baac70f59..9de4a4bdf01e 100644
--- a/textproc/p5-Text-FixedLength/Makefile
+++ b/textproc/p5-Text-FixedLength/Makefile
@@ -18,6 +18,5 @@ COMMENT= Parse and create fixed length field records
PERL_CONFIGURE= yes
MAN3= Text::FixedLength.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-FixedLength/pkg-plist b/textproc/p5-Text-FixedLength/pkg-plist
index 9ade71aff306..247a041f1050 100644
--- a/textproc/p5-Text-FixedLength/pkg-plist
+++ b/textproc/p5-Text-FixedLength/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FixedLength/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/FixedLength.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FixedLength
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/.packlist
+%%SITE_PERL%%/Text/FixedLength.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Flowchart/Makefile b/textproc/p5-Text-Flowchart/Makefile
index 06d0cdf93114..0f88c65a4b80 100644
--- a/textproc/p5-Text-Flowchart/Makefile
+++ b/textproc/p5-Text-Flowchart/Makefile
@@ -18,6 +18,5 @@ COMMENT= ASCII Flowchart maker
PERL_CONFIGURE= yes
MAN3= Text::Flowchart.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Flowchart/pkg-plist b/textproc/p5-Text-Flowchart/pkg-plist
index 8cebf2b071c5..59f6ddccf34e 100644
--- a/textproc/p5-Text-Flowchart/pkg-plist
+++ b/textproc/p5-Text-Flowchart/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Flowchart/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Flowchart.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Flowchart
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart/.packlist
+%%SITE_PERL%%/Text/Flowchart.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index db938a1068e6..b482c8511f27 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -19,6 +19,5 @@ COMMENT= Various subroutines to format text
PERL_CONFIGURE= yes
MAN3= Text::Format.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Format/pkg-plist b/textproc/p5-Text-Format/pkg-plist
index c3961cbc9ef5..f7dfaa4c6207 100644
--- a/textproc/p5-Text-Format/pkg-plist
+++ b/textproc/p5-Text-Format/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Format/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Format.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Format
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format/.packlist
+%%SITE_PERL%%/Text/Format.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-FormatTable/Makefile b/textproc/p5-Text-FormatTable/Makefile
index 466e25ee858e..d2ceac7870d6 100644
--- a/textproc/p5-Text-FormatTable/Makefile
+++ b/textproc/p5-Text-FormatTable/Makefile
@@ -18,6 +18,5 @@ COMMENT= Renders simple tables as text
PERL_CONFIGURE= yes
MAN3= Text::FormatTable.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-FormatTable/pkg-plist b/textproc/p5-Text-FormatTable/pkg-plist
index a98e3a3805c8..815052f34e75 100644
--- a/textproc/p5-Text-FormatTable/pkg-plist
+++ b/textproc/p5-Text-FormatTable/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FormatTable/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/FormatTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/example.pl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/FormatTable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable/.packlist
+%%SITE_PERL%%/Text/FormatTable.pm
+%%SITE_PERL%%/Text/example.pl
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index 9df57d09932e..0638c0348c54 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= A text graphics rendering toolkit
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper
+BUILD_DEPENDS= ${SITE_PERL}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Text::Graphics.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
@${RM} ${WRKSRC}/lib/Text/Graphics.pm.orig
diff --git a/textproc/p5-Text-Graphics/pkg-plist b/textproc/p5-Text-Graphics/pkg-plist
index a747319850cc..e6daf9f81182 100644
--- a/textproc/p5-Text-Graphics/pkg-plist
+++ b/textproc/p5-Text-Graphics/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Graphics/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Graphics.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Graphics
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics/.packlist
+%%SITE_PERL%%/Text/Graphics.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Metaphone/Makefile b/textproc/p5-Text-Metaphone/Makefile
index ab60819c72eb..9b82d75d6aa5 100644
--- a/textproc/p5-Text-Metaphone/Makefile
+++ b/textproc/p5-Text-Metaphone/Makefile
@@ -18,6 +18,5 @@ COMMENT= A modern soundex: phonetic encoding of words
PERL_CONFIGURE= yes
MAN3= Text::Metaphone.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Metaphone/pkg-plist b/textproc/p5-Text-Metaphone/pkg-plist
index 87e808c0d99a..0c37d8351f80 100644
--- a/textproc/p5-Text-Metaphone/pkg-plist
+++ b/textproc/p5-Text-Metaphone/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/Metaphone.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Metaphone/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Metaphone
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/Metaphone.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Query/Makefile b/textproc/p5-Text-Query/Makefile
index 199f96711fb5..95c0f1e6b606 100644
--- a/textproc/p5-Text-Query/Makefile
+++ b/textproc/p5-Text-Query/Makefile
@@ -24,7 +24,6 @@ MAN3= Text::Query.3 Text::Query::Build.3 \
Text::Query::ParseSimple.3 Text::Query::Solve.3 \
Text::Query::SolveAdvancedString.3 \
Text::Query::SolveSimpleString.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@${PERL} -pi -e 's/factor\(\$$self\)/\&factor(\$$self)/' \
diff --git a/textproc/p5-Text-Query/pkg-plist b/textproc/p5-Text-Query/pkg-plist
index d35fe9eb1347..915a490f642f 100644
--- a/textproc/p5-Text-Query/pkg-plist
+++ b/textproc/p5-Text-Query/pkg-plist
@@ -1,18 +1,18 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Query/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Advanced.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Build.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Parse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildAdvancedString.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/BuildSimpleString.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/SolveAdvancedString.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Solve.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/ParseAdvanced.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/SolveSimpleString.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Optimize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Query/ParseSimple.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Query
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/Query
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query/.packlist
+%%SITE_PERL%%/Text/Query.pm
+%%SITE_PERL%%/Text/Query/Advanced.pm
+%%SITE_PERL%%/Text/Query/Build.pm
+%%SITE_PERL%%/Text/Query/Parse.pm
+%%SITE_PERL%%/Text/Query/BuildAdvancedString.pm
+%%SITE_PERL%%/Text/Query/BuildSimpleString.pm
+%%SITE_PERL%%/Text/Query/SolveAdvancedString.pm
+%%SITE_PERL%%/Text/Query/Solve.pm
+%%SITE_PERL%%/Text/Query/ParseAdvanced.pm
+%%SITE_PERL%%/Text/Query/SolveSimpleString.pm
+%%SITE_PERL%%/Text/Query/Optimize.pm
+%%SITE_PERL%%/Text/Query/Simple.pm
+%%SITE_PERL%%/Text/Query/ParseSimple.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query
+@dirrm %%SITE_PERL%%/Text/Query
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Repository/Makefile b/textproc/p5-Text-Repository/Makefile
index 6dec212650b7..7a9d4393c53b 100644
--- a/textproc/p5-Text-Repository/Makefile
+++ b/textproc/p5-Text-Repository/Makefile
@@ -18,6 +18,5 @@ COMMENT= A simple way to manage text without mixing it with Perl
PERL_CONFIGURE= yes
MAN3= Text::Repository.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Repository/pkg-plist b/textproc/p5-Text-Repository/pkg-plist
index 52b3a5de22ac..b2c6d838e139 100644
--- a/textproc/p5-Text-Repository/pkg-plist
+++ b/textproc/p5-Text-Repository/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Repository/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Repository.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Repository 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository/.packlist
+%%SITE_PERL%%/Text/Repository.pm
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Shellwords/Makefile b/textproc/p5-Text-Shellwords/Makefile
index eb6587cababa..cd759da455cf 100644
--- a/textproc/p5-Text-Shellwords/Makefile
+++ b/textproc/p5-Text-Shellwords/Makefile
@@ -18,6 +18,5 @@ COMMENT= This is a thin wrapper around the shellwords.pl package
PERL_CONFIGURE= yes
MAN3= Text::Shellwords.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Shellwords/pkg-plist b/textproc/p5-Text-Shellwords/pkg-plist
index 9ad156872ac6..b5473d50070f 100644
--- a/textproc/p5-Text-Shellwords/pkg-plist
+++ b/textproc/p5-Text-Shellwords/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Text/Shellwords.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Shellwords/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Shellwords > /dev/null || true
+%%SITE_PERL%%/Text/Shellwords.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords > /dev/null || true
diff --git a/textproc/p5-Text-SimpleTemplate/Makefile b/textproc/p5-Text-SimpleTemplate/Makefile
index eb4456bafbc0..4c40d35a097d 100644
--- a/textproc/p5-Text-SimpleTemplate/Makefile
+++ b/textproc/p5-Text-SimpleTemplate/Makefile
@@ -18,6 +18,5 @@ COMMENT= Yet another Perl module for template processing
PERL_CONFIGURE= yes
MAN3= Text::SimpleTemplate.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-SimpleTemplate/pkg-plist b/textproc/p5-Text-SimpleTemplate/pkg-plist
index 1f3d3fa5efde..9c482e006df9 100644
--- a/textproc/p5-Text-SimpleTemplate/pkg-plist
+++ b/textproc/p5-Text-SimpleTemplate/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/SimpleTemplate.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate/.packlist
+%%SITE_PERL%%/Text/SimpleTemplate.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Tabs+Wrap/Makefile b/textproc/p5-Text-Tabs+Wrap/Makefile
index e180decea27b..968679cd1201 100644
--- a/textproc/p5-Text-Tabs+Wrap/Makefile
+++ b/textproc/p5-Text-Tabs+Wrap/Makefile
@@ -18,6 +18,5 @@ COMMENT= Line wrapping to form simple paragraphs
PERL_CONFIGURE= YES
MAN3= Text::Wrap.3 Text::Tabs.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Tabs+Wrap/pkg-plist b/textproc/p5-Text-Tabs+Wrap/pkg-plist
index 5c4effac55d8..3538972597c0 100644
--- a/textproc/p5-Text-Tabs+Wrap/pkg-plist
+++ b/textproc/p5-Text-Tabs+Wrap/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Wrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Tabs.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/.packlist
+%%SITE_PERL%%/Text/Wrap.pm
+%%SITE_PERL%%/Text/Tabs.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index 34b2e3c98666..7816b6d8aed2 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -18,7 +18,6 @@ COMMENT= Expand template text with embedded Perl
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Text::Template.3 Text::Template::Preprocess.3
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Template/pkg-plist b/textproc/p5-Text-Template/pkg-plist
index ddf4a3516aac..b8dcff442e26 100644
--- a/textproc/p5-Text-Template/pkg-plist
+++ b/textproc/p5-Text-Template/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Text/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Template/Preprocess.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Template/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Template
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/Template
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/Text/Template.pm
+%%SITE_PERL%%/Text/Template/Preprocess.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Text/Template
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Tmpl/Makefile b/textproc/p5-Text-Tmpl/Makefile
index 18b67e4c6159..90c3184ff6df 100644
--- a/textproc/p5-Text-Tmpl/Makefile
+++ b/textproc/p5-Text-Tmpl/Makefile
@@ -18,7 +18,6 @@ COMMENT= Templating system perl library
PERL_CONFIGURE= yes
MAN3= template_syntax.3 Text::Tmpl.3 template_extend.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@${PERL} -pi -e '/OPTIMIZE|libtmpl.pod/ and $$_=""' \
diff --git a/textproc/p5-Text-Tmpl/pkg-plist b/textproc/p5-Text-Tmpl/pkg-plist
index b5e5dfe0a172..9094eac83d63 100644
--- a/textproc/p5-Text-Tmpl/pkg-plist
+++ b/textproc/p5-Text-Tmpl/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/template_syntax.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/libtmpl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/template_extend.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/Tmpl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Tmpl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/Tmpl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/template_syntax.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/libtmpl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/template_extend.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/Tmpl.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index a6a1f0ab32ca..9b0d9e8b2ae8 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -18,6 +18,5 @@ COMMENT= Simple word wrapping routine
PERL_CONFIGURE= yes
MAN3= Text::Wrapper.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Text-Wrapper/pkg-plist b/textproc/p5-Text-Wrapper/pkg-plist
index a6c8643e2ef1..3a7e09e44eb4 100644
--- a/textproc/p5-Text-Wrapper/pkg-plist
+++ b/textproc/p5-Text-Wrapper/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Wrapper/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Text/Wrapper.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Wrapper
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper/.packlist
+%%SITE_PERL%%/Text/Wrapper.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index 7fe0201aecb6..38d06aa79757 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Tk::XMLViewer - Tk widget to display XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Tree-Nary/Makefile b/textproc/p5-Tree-Nary/Makefile
index 772d68dcd245..3006268a3d14 100644
--- a/textproc/p5-Tree-Nary/Makefile
+++ b/textproc/p5-Tree-Nary/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl implementation of N-ary search trees
PERL_CONFIGURE= yes
MAN3= Tree::Nary.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-Tree-Nary/pkg-plist b/textproc/p5-Tree-Nary/pkg-plist
index fff56a5e9e1f..97994796f75c 100644
--- a/textproc/p5-Tree-Nary/pkg-plist
+++ b/textproc/p5-Tree-Nary/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tree/Nary/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Tree/Nary.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tree/Nary
-@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%%/%%PERL_ARCH%%/auto/Tree/Nary/.packlist
+%%SITE_PERL%%/Tree/Nary.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary
+@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/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index bf986e95c652..58c145632795 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
COMMENT= Perl module to find URIs in arbitrary text
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS= ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-URI-Find/pkg-plist b/textproc/p5-URI-Find/pkg-plist
index 02e00aca6b45..c2d831fef15c 100644
--- a/textproc/p5-URI-Find/pkg-plist
+++ b/textproc/p5-URI-Find/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/URI/Find.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/Find/Schemeless.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/Find/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/Find
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/Find
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/URI 2>/dev/null || true
+%%SITE_PERL%%/URI/Find.pm
+%%SITE_PERL%%/URI/Find/Schemeless.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Find/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Find
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/URI/Find
+@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
diff --git a/textproc/p5-WDDX/Makefile b/textproc/p5-WDDX/Makefile
index b1a135aa0201..f1b2758fdbd8 100644
--- a/textproc/p5-WDDX/Makefile
+++ b/textproc/p5-WDDX/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= eric@talesfromthereal.com
COMMENT= Perl module to parse WDDX Packets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
PERL_CONFIGURE= yes
ALL_TARGET= all test
MAN3= WDDX.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/textproc/p5-WDDX/pkg-plist b/textproc/p5-WDDX/pkg-plist
index f030dd7d9e32..94cc6097abb1 100644
--- a/textproc/p5-WDDX/pkg-plist
+++ b/textproc/p5-WDDX/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WDDX/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/WDDX.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Array.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Binary.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Boolean.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Datetime.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Number.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Recordset.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/String.pm
-lib/perl5/site_perl/%%PERL_VER%%/WDDX/Struct.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WDDX/.packlist
+%%SITE_PERL%%/WDDX.pm
+%%SITE_PERL%%/WDDX/Array.pm
+%%SITE_PERL%%/WDDX/Binary.pm
+%%SITE_PERL%%/WDDX/Boolean.pm
+%%SITE_PERL%%/WDDX/Datetime.pm
+%%SITE_PERL%%/WDDX/Null.pm
+%%SITE_PERL%%/WDDX/Number.pm
+%%SITE_PERL%%/WDDX/Parser.pm
+%%SITE_PERL%%/WDDX/Recordset.pm
+%%SITE_PERL%%/WDDX/String.pm
+%%SITE_PERL%%/WDDX/Struct.pm
%%PORTDOCS%%share/doc/WDDX/Changes
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WDDX
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WDDX
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WDDX
+@dirrm %%SITE_PERL%%/WDDX
%%PORTDOCS%%@dirrm share/doc/WDDX
diff --git a/textproc/p5-XML-Catalog/Makefile b/textproc/p5-XML-Catalog/Makefile
index e53c374142dd..e1a5cbd0f271 100644
--- a/textproc/p5-XML-Catalog/Makefile
+++ b/textproc/p5-XML-Catalog/Makefile
@@ -26,7 +26,6 @@ SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl
PERL_CONFIGURE= yes
MAN3= XML::Catalog.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e 's/\r//' ${WRKSRC}/Catalog.pm
diff --git a/textproc/p5-XML-Catalog/pkg-plist b/textproc/p5-XML-Catalog/pkg-plist
index 33ce207b7d02..3dcc2a3063e7 100644
--- a/textproc/p5-XML-Catalog/pkg-plist
+++ b/textproc/p5-XML-Catalog/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/XML/Catalog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Catalog/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Catalog
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/Catalog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 0f303d61598f..2255b041bbb6 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -35,9 +35,8 @@ MAN3= XML::DOM.3 XML::DOM::AttDef.3 XML::DOM::AttlistDecl.3 \
XML::DOM::Parser.3 XML::DOM::PerlSAX.3 \
XML::DOM::ProcessingInstruction.3 XML::DOM::Text.3 \
XML::DOM::XMLDecl.3 XML::Handler::BuildDOM.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-PBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PBASE= ${SITE_PERL}
.include <bsd.port.pre.mk>
diff --git a/textproc/p5-XML-DOM/pkg-plist b/textproc/p5-XML-DOM/pkg-plist
index 3f2b7fd8b1a0..443d4f1010e9 100644
--- a/textproc/p5-XML-DOM/pkg-plist
+++ b/textproc/p5-XML-DOM/pkg-plist
@@ -1,31 +1,31 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-DOM/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/AttDef.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/AttlistDecl.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Attr.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/CDATASection.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/CharacterData.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Comment.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/DOMException.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/DOMImplementation.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Document.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/DocumentFragment.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/DocumentType.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Element.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/ElementDecl.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Entity.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/EntityReference.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/NamedNodeMap.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/NamedNodeMap.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Node.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/NodeList.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/NodeList.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Notation.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Parser.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/PerlSAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/ProcessingInstruction.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/Text.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM/XMLDecl.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/BuildDOM.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DOM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-DOM
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-DOM/.packlist
+%%SITE_PERL%%/XML/DOM.pm
+%%SITE_PERL%%/XML/DOM/AttDef.pod
+%%SITE_PERL%%/XML/DOM/AttlistDecl.pod
+%%SITE_PERL%%/XML/DOM/Attr.pod
+%%SITE_PERL%%/XML/DOM/CDATASection.pod
+%%SITE_PERL%%/XML/DOM/CharacterData.pod
+%%SITE_PERL%%/XML/DOM/Comment.pod
+%%SITE_PERL%%/XML/DOM/DOMException.pm
+%%SITE_PERL%%/XML/DOM/DOMImplementation.pod
+%%SITE_PERL%%/XML/DOM/Document.pod
+%%SITE_PERL%%/XML/DOM/DocumentFragment.pod
+%%SITE_PERL%%/XML/DOM/DocumentType.pod
+%%SITE_PERL%%/XML/DOM/Element.pod
+%%SITE_PERL%%/XML/DOM/ElementDecl.pod
+%%SITE_PERL%%/XML/DOM/Entity.pod
+%%SITE_PERL%%/XML/DOM/EntityReference.pod
+%%SITE_PERL%%/XML/DOM/NamedNodeMap.pm
+%%SITE_PERL%%/XML/DOM/NamedNodeMap.pod
+%%SITE_PERL%%/XML/DOM/Node.pod
+%%SITE_PERL%%/XML/DOM/NodeList.pm
+%%SITE_PERL%%/XML/DOM/NodeList.pod
+%%SITE_PERL%%/XML/DOM/Notation.pod
+%%SITE_PERL%%/XML/DOM/Parser.pod
+%%SITE_PERL%%/XML/DOM/PerlSAX.pm
+%%SITE_PERL%%/XML/DOM/ProcessingInstruction.pod
+%%SITE_PERL%%/XML/DOM/Text.pod
+%%SITE_PERL%%/XML/DOM/XMLDecl.pod
+%%SITE_PERL%%/XML/Handler/BuildDOM.pm
+@dirrm %%SITE_PERL%%/XML/DOM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-DOM
diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index 8a86df6dec18..4095a5c03cac 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl module for down translation of XML to strings
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::DT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
@${MKDIR} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/XML/DT/examples
diff --git a/textproc/p5-XML-DT/pkg-plist b/textproc/p5-XML-DT/pkg-plist
index fef3fd7eee3b..be416475c54d 100644
--- a/textproc/p5-XML-DT/pkg-plist
+++ b/textproc/p5-XML-DT/pkg-plist
@@ -1,51 +1,51 @@
bin/mkdtskel
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/DT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex1.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex1.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex2.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex2.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex3.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex3.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex4.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex4.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex5.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex5.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex6.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex6.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex7.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex7.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex8.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath/ex8.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/10nov.sgm
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/README
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/arq.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/arq.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex1.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.1.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.2.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.2.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.3.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex10.3.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex11.1.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex11.1.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex11.5.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex11.5.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex2.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex3.xml
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex5.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex6.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/ex7.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/gcapaper2tex.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/jj.dtd
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/lat1.html
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/makefile
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/makenewexample
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/pub.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/publico.dtd
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/DT
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples/XPath
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DT/examples
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT/.packlist
+%%SITE_PERL%%/XML/DT.pm
+%%SITE_PERL%%/XML/DT/examples/XPath/ex1.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex1.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex2.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex2.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex3.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex3.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex4.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex4.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex5.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex5.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex6.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex6.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex7.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex7.xml
+%%SITE_PERL%%/XML/DT/examples/XPath/ex8.pl
+%%SITE_PERL%%/XML/DT/examples/XPath/ex8.xml
+%%SITE_PERL%%/XML/DT/examples/10nov.sgm
+%%SITE_PERL%%/XML/DT/examples/README
+%%SITE_PERL%%/XML/DT/examples/arq.pl
+%%SITE_PERL%%/XML/DT/examples/arq.xml
+%%SITE_PERL%%/XML/DT/examples/ex.xml
+%%SITE_PERL%%/XML/DT/examples/ex1.pl
+%%SITE_PERL%%/XML/DT/examples/ex10.1.pl
+%%SITE_PERL%%/XML/DT/examples/ex10.2.pl
+%%SITE_PERL%%/XML/DT/examples/ex10.2.xml
+%%SITE_PERL%%/XML/DT/examples/ex10.3.pl
+%%SITE_PERL%%/XML/DT/examples/ex10.3.xml
+%%SITE_PERL%%/XML/DT/examples/ex11.1.pl
+%%SITE_PERL%%/XML/DT/examples/ex11.1.xml
+%%SITE_PERL%%/XML/DT/examples/ex11.5.pl
+%%SITE_PERL%%/XML/DT/examples/ex11.5.xml
+%%SITE_PERL%%/XML/DT/examples/ex2.pl
+%%SITE_PERL%%/XML/DT/examples/ex3.xml
+%%SITE_PERL%%/XML/DT/examples/ex5.pl
+%%SITE_PERL%%/XML/DT/examples/ex6.pl
+%%SITE_PERL%%/XML/DT/examples/ex7.pl
+%%SITE_PERL%%/XML/DT/examples/gcapaper2tex.pl
+%%SITE_PERL%%/XML/DT/examples/jj.dtd
+%%SITE_PERL%%/XML/DT/examples/lat1.html
+%%SITE_PERL%%/XML/DT/examples/makefile
+%%SITE_PERL%%/XML/DT/examples/makenewexample
+%%SITE_PERL%%/XML/DT/examples/pub.pl
+%%SITE_PERL%%/XML/DT/examples/publico.dtd
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT
+@dirrm %%SITE_PERL%%/XML/DT/examples/XPath
+@dirrm %%SITE_PERL%%/XML/DT/examples
+@dirrm %%SITE_PERL%%/XML/DT
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index 1ee88c0b8164..bebe61e08b61 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= Returns a content of directory as XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RDF/Notation3.pm:${PORTSDIR}/textproc/p5-RDF-Notation3
+BUILD_DEPENDS= ${SITE_PERL}/RDF/Notation3.pm:${PORTSDIR}/textproc/p5-RDF-Notation3
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -24,7 +24,6 @@ MAN3= XML::Directory.3 XML::Directory::Apache.3 \
XML::Directory::Exception.3 XML::Directory::SAX.3 \
XML::Directory::String.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
pre-patch:
@find ${WRKSRC} -name "*.pm" | xargs ${PERL} -pi -e \
diff --git a/textproc/p5-XML-Directory/pkg-plist b/textproc/p5-XML-Directory/pkg-plist
index 211983800e95..84cfd60c7813 100644
--- a/textproc/p5-XML-Directory/pkg-plist
+++ b/textproc/p5-XML-Directory/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Directory/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory/SAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Directory/String.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Directory
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Directory
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Directory/.packlist
+%%SITE_PERL%%/XML/Directory.pm
+%%SITE_PERL%%/XML/Directory.pod
+%%SITE_PERL%%/XML/Directory/Apache.pm
+%%SITE_PERL%%/XML/Directory/Exception.pm
+%%SITE_PERL%%/XML/Directory/SAX.pm
+%%SITE_PERL%%/XML/Directory/String.pm
+@dirrm %%SITE_PERL%%/XML/Directory
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Directory
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Dumper/Makefile b/textproc/p5-XML-Dumper/Makefile
index b07b05543fe8..3293580f01a7 100644
--- a/textproc/p5-XML-Dumper/Makefile
+++ b/textproc/p5-XML-Dumper/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl module for dumping Perl objects from/to XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Dumper.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Dumper/pkg-plist b/textproc/p5-XML-Dumper/pkg-plist
index 22e21500e0d5..10f520c1a76e 100644
--- a/textproc/p5-XML-Dumper/pkg-plist
+++ b/textproc/p5-XML-Dumper/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Dumper/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Dumper.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Dumper
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper/.packlist
+%%SITE_PERL%%/XML/Dumper.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Encoding/Makefile b/textproc/p5-XML-Encoding/Makefile
index 234abd334e6c..21d0772d813c 100644
--- a/textproc/p5-XML-Encoding/Makefile
+++ b/textproc/p5-XML-Encoding/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= A perl module for parsing XML encoding maps
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Encoding.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Encoding/pkg-plist b/textproc/p5-XML-Encoding/pkg-plist
index 3cfccfa1a47b..cea86c5de505 100644
--- a/textproc/p5-XML-Encoding/pkg-plist
+++ b/textproc/p5-XML-Encoding/pkg-plist
@@ -1,7 +1,7 @@
bin/compile_encoding
bin/make_encmap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Encoding/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Encoding.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Encoding
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding/.packlist
+%%SITE_PERL%%/XML/Encoding.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-Base/Makefile b/textproc/p5-XML-Filter-Base/Makefile
index 391d4f19a89c..3e953e47c4ac 100644
--- a/textproc/p5-XML-Filter-Base/Makefile
+++ b/textproc/p5-XML-Filter-Base/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
MAN3= XML::Filter::Base.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-Base/pkg-plist b/textproc/p5-XML-Filter-Base/pkg-plist
index 267c3fcb3072..106822be1760 100644
--- a/textproc/p5-XML-Filter-Base/pkg-plist
+++ b/textproc/p5-XML-Filter-Base/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/Base/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/Base.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/Base
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Base/.packlist
+%%SITE_PERL%%/XML/Filter/Base.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Base
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-DetectWS/Makefile b/textproc/p5-XML-Filter-DetectWS/Makefile
index d82ab003d177..b3cb69d56761 100644
--- a/textproc/p5-XML-Filter-DetectWS/Makefile
+++ b/textproc/p5-XML-Filter-DetectWS/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= A PerlSAX filter that detects ignorable whitespace
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Filter/SAXT.pm:${PORTSDIR}/textproc/p5-XML-Filter-SAXT
+RUN_DEPENDS= ${SITE_PERL}/XML/Filter/SAXT.pm:${PORTSDIR}/textproc/p5-XML-Filter-SAXT
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Filter::DetectWS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-DetectWS/pkg-plist b/textproc/p5-XML-Filter-DetectWS/pkg-plist
index 85ed6c74a370..6f5380d016c2 100644
--- a/textproc/p5-XML-Filter-DetectWS/pkg-plist
+++ b/textproc/p5-XML-Filter-DetectWS/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/DetectWS.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS/.packlist
+%%SITE_PERL%%/XML/Filter/DetectWS.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-GenericChunk/Makefile b/textproc/p5-XML-Filter-GenericChunk/Makefile
index 1c4f7c7f67d3..344efe85ab33 100644
--- a/textproc/p5-XML-Filter-GenericChunk/Makefile
+++ b/textproc/p5-XML-Filter-GenericChunk/Makefile
@@ -25,7 +25,6 @@ PERL_CONFIGURE= yes
MAN3= XML::Filter::CharacterChunk.3 \
XML::Filter::GenericChunk.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e '$$_="" if /use warnings/;' \
diff --git a/textproc/p5-XML-Filter-Reindent/Makefile b/textproc/p5-XML-Filter-Reindent/Makefile
index a22ec7637ce7..ecaa7a37be11 100644
--- a/textproc/p5-XML-Filter-Reindent/Makefile
+++ b/textproc/p5-XML-Filter-Reindent/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Reformats whitespace for pretty printing XML
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Filter/DetectWS.pm:${PORTSDIR}/textproc/p5-XML-Filter-DetectWS
+RUN_DEPENDS= ${SITE_PERL}/XML/Filter/DetectWS.pm:${PORTSDIR}/textproc/p5-XML-Filter-DetectWS
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Filter::Reindent.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-Reindent/pkg-plist b/textproc/p5-XML-Filter-Reindent/pkg-plist
index 5104bb7aa45e..f70f6504f983 100644
--- a/textproc/p5-XML-Filter-Reindent/pkg-plist
+++ b/textproc/p5-XML-Filter-Reindent/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/Reindent.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent/.packlist
+%%SITE_PERL%%/XML/Filter/Reindent.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-SAXT/Makefile b/textproc/p5-XML-Filter-SAXT/Makefile
index 2fde7217c2c8..13579c227de5 100644
--- a/textproc/p5-XML-Filter-SAXT/Makefile
+++ b/textproc/p5-XML-Filter-SAXT/Makefile
@@ -18,6 +18,5 @@ COMMENT= Replicates SAX events to several SAX event handlers
PERL_CONFIGURE= yes
MAN3= XML::Filter::SAXT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-SAXT/pkg-plist b/textproc/p5-XML-Filter-SAXT/pkg-plist
index d85a30b3f069..629338a8642e 100644
--- a/textproc/p5-XML-Filter-SAXT/pkg-plist
+++ b/textproc/p5-XML-Filter-SAXT/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/SAXT.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT/.packlist
+%%SITE_PERL%%/XML/Filter/SAXT.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-XInclude/Makefile b/textproc/p5-XML-Filter-XInclude/Makefile
index 07069916c761..a554758d598e 100644
--- a/textproc/p5-XML-Filter-XInclude/Makefile
+++ b/textproc/p5-XML-Filter-XInclude/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= XInclude as a SAX Filter
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
+RUN_DEPENDS= ${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Filter::XInclude.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-XInclude/pkg-plist b/textproc/p5-XML-Filter-XInclude/pkg-plist
index afd4341d188c..130b64b321de 100644
--- a/textproc/p5-XML-Filter-XInclude/pkg-plist
+++ b/textproc/p5-XML-Filter-XInclude/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/XInclude.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude/.packlist
+%%SITE_PERL%%/XML/Filter/XInclude.pm
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Filter-XSLT/Makefile b/textproc/p5-XML-Filter-XSLT/Makefile
index 67bc3d2cf6e5..9dd9abb95ab5 100644
--- a/textproc/p5-XML-Filter-XSLT/Makefile
+++ b/textproc/p5-XML-Filter-XSLT/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= XSLT as a SAX Filter
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX/Writer.pm:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
+RUN_DEPENDS= ${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
+ ${SITE_PERL}/XML/SAX/Writer.pm:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
+ ${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= XML::Filter::XSLT.3 XML::Filter::XSLT::LibXSLT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Filter-XSLT/pkg-plist b/textproc/p5-XML-Filter-XSLT/pkg-plist
index 583d51008bcc..92648bc62c91 100644
--- a/textproc/p5-XML-Filter-XSLT/pkg-plist
+++ b/textproc/p5-XML-Filter-XSLT/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/XSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/XSLT/LibXSLT.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Filter/XSLT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT/.packlist
+%%SITE_PERL%%/XML/Filter/XSLT.pm
+%%SITE_PERL%%/XML/Filter/XSLT/LibXSLT.pm
+@dirrm %%SITE_PERL%%/XML/Filter/XSLT
+@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-GDOME/Makefile b/textproc/p5-XML-GDOME/Makefile
index 51b93179c61f..f65b1e1a5516 100644
--- a/textproc/p5-XML-GDOME/Makefile
+++ b/textproc/p5-XML-GDOME/Makefile
@@ -47,6 +47,5 @@ MAN3= XML::GDOME.3 \
XML::GDOME::XPath::Result.3 \
XML::GDOME::ProcessingInstruction.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Generator-PerlData/Makefile b/textproc/p5-XML-Generator-PerlData/Makefile
index e5b3bc68fd4f..491f78888f11 100644
--- a/textproc/p5-XML-Generator-PerlData/Makefile
+++ b/textproc/p5-XML-Generator-PerlData/Makefile
@@ -23,6 +23,5 @@ PERL_CONFIGURE= yes
MAN3= XML::Generator::PerlData.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index 10e33cfea590..24ad3e8ffcd0 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X
${SITE_PERL}/Data/Grove.pm:${PORTSDIR}/textproc/p5-libxml
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= XML::DOM-ecmascript.3 \
@@ -35,6 +35,5 @@ MAN3= XML::DOM-ecmascript.3 \
XML::Grove::Sub.3 \
XML::Grove::Subst.3 \
XML::Grove::XPointer.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Grove/pkg-plist b/textproc/p5-XML-Grove/pkg-plist
index 1858cc2ddf62..43887eb0b053 100644
--- a/textproc/p5-XML-Grove/pkg-plist
+++ b/textproc/p5-XML-Grove/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/%%PERL_VER%%/XML/DOM-ecmascript.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/AsCanonXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/AsString.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Builder.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Factory.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/IDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Path.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/PerlSAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Sub.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/Subst.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Grove/XPointer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Grove/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Grove
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Grove
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/DOM-ecmascript.pod
+%%SITE_PERL%%/XML/Grove.pm
+%%SITE_PERL%%/XML/Grove/AsCanonXML.pm
+%%SITE_PERL%%/XML/Grove/AsString.pm
+%%SITE_PERL%%/XML/Grove/Builder.pm
+%%SITE_PERL%%/XML/Grove/Factory.pm
+%%SITE_PERL%%/XML/Grove/IDs.pm
+%%SITE_PERL%%/XML/Grove/Path.pm
+%%SITE_PERL%%/XML/Grove/PerlSAX.pm
+%%SITE_PERL%%/XML/Grove/Sub.pm
+%%SITE_PERL%%/XML/Grove/Subst.pm
+%%SITE_PERL%%/XML/Grove/XPointer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/XML/Grove
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index dd63e9b48104..062f62e164f4 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Yet another Perl SAX XML Writer
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml
+BUILD_DEPENDS= ${SITE_PERL}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-Handler-YAWriter/pkg-plist b/textproc/p5-XML-Handler-YAWriter/pkg-plist
index b25026d0feac..f34eba0011d9 100644
--- a/textproc/p5-XML-Handler-YAWriter/pkg-plist
+++ b/textproc/p5-XML-Handler-YAWriter/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter/.packlist
bin/xmlpretty
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/YAWriter.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/Handler/YAWriter.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter
+@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-LibRSVG/Makefile b/textproc/p5-XML-LibRSVG/Makefile
index 5d61e9c6a15a..36b1e3b0f942 100644
--- a/textproc/p5-XML-LibRSVG/Makefile
+++ b/textproc/p5-XML-LibRSVG/Makefile
@@ -27,6 +27,5 @@ CONFIGURE_ENV= INC='-I${LOCALBASE}/include' LIBS='-L${LOCALBASE}/lib'
USE_GNOME= gdkpixbuf
MAN3= XML::LibRSVG.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-LibRSVG/pkg-plist b/textproc/p5-XML-LibRSVG/pkg-plist
index 55dbb9821ba9..86578b451ad4 100644
--- a/textproc/p5-XML-LibRSVG/pkg-plist
+++ b/textproc/p5-XML-LibRSVG/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/LibRSVG.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibRSVG/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibRSVG
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibRSVG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-LibXML-Common/pkg-plist b/textproc/p5-XML-LibXML-Common/pkg-plist
index dc9026a4c5fe..43553b9bf828 100644
--- a/textproc/p5-XML-LibXML-Common/pkg-plist
+++ b/textproc/p5-XML-LibXML-Common/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/LibXML/Common.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML/Common
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.so
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index d514170cf171..5817970774e3 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -22,10 +22,9 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
PERL_CONFIGURE= yes
CONFIGURE_ARGS= INC='-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2'
-PERL_ABASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+PERL_ABASE= ${SITE_PERL}/${PERL_ARCH}
MAN3= XML::LibXSLT.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-LibXSLT/pkg-plist b/textproc/p5-XML-LibXSLT/pkg-plist
index cc3aeea08de7..22f090040a21 100644
--- a/textproc/p5-XML-LibXSLT/pkg-plist
+++ b/textproc/p5-XML-LibXSLT/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/LibXSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/benchmark.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXSLT/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/LibXSLT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXSLT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/benchmark.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index d152abe8fa42..cefdd8114615 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wjv@FreeBSD.org
COMMENT= Perl5 module to extend and simplify XML::Parser
-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= XML::Node.3
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Node/pkg-plist b/textproc/p5-XML-Node/pkg-plist
index 91faf8db3d44..6f52ccd88f8b 100644
--- a/textproc/p5-XML-Node/pkg-plist
+++ b/textproc/p5-XML-Node/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/XML/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/parse-foo.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/parse-orders.pl
-lib/perl5/site_perl/%%PERL_VER%%/XML/parse-testsuite.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%//auto/XML/Node/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Node
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/Node.pm
+%%SITE_PERL%%/XML/parse-foo.pl
+%%SITE_PERL%%/XML/parse-orders.pl
+%%SITE_PERL%%/XML/parse-testsuite.pl
+%%SITE_PERL%%/%%PERL_ARCH%%//auto/XML/Node/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Node
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index 7da2245f7034..faf6242445ef 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -22,6 +22,5 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textpro
PERL_CONFIGURE= yes
MAN3= XML::RSS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index afeb2deae0fd..463c12fac8f0 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -17,7 +17,6 @@ COMMENT= Regular expressions for XML tokens
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::RegExp.3
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-RegExp/pkg-plist b/textproc/p5-XML-RegExp/pkg-plist
index 670b15d0f15e..66c16735198d 100644
--- a/textproc/p5-XML-RegExp/pkg-plist
+++ b/textproc/p5-XML-RegExp/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/RegExp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/RegExp.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/RegExp
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp/.packlist
+%%SITE_PERL%%/XML/RegExp.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-SAX-Base/Makefile b/textproc/p5-XML-SAX-Base/Makefile
index f201b4c01584..6c62b2a6d69b 100644
--- a/textproc/p5-XML-SAX-Base/Makefile
+++ b/textproc/p5-XML-SAX-Base/Makefile
@@ -20,6 +20,5 @@ PERL_CONFIGURE= yes
MAN3= XML::SAX::Exception.3 \
XML::SAX::Base.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-SAX-Base/pkg-plist b/textproc/p5-XML-SAX-Base/pkg-plist
index f001db4efdb4..0302d26ce61a 100644
--- a/textproc/p5-XML-SAX-Base/pkg-plist
+++ b/textproc/p5-XML-SAX-Base/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX/Base/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX/Exception.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX/Base 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Base/.packlist
+%%SITE_PERL%%/XML/SAX/Base.pm
+%%SITE_PERL%%/XML/SAX/Exception.pm
+@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Base 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-SAXDriver-Sablotron/Makefile b/textproc/p5-XML-SAXDriver-Sablotron/Makefile
index 5219877158ee..a5244fab3063 100644
--- a/textproc/p5-XML-SAXDriver-Sablotron/Makefile
+++ b/textproc/p5-XML-SAXDriver-Sablotron/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Perl SAX driver for the Sablotron XSLT
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX/Base.pm:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron \
+ ${SITE_PERL}/XML/SAX/Base.pm:${PORTSDIR}/textproc/p5-XML-SAX
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist b/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
index fe58c878b371..6cc0140de83a 100644
--- a/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
+++ b/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAXDriver/Sablotron.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/SAXDriver 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/SAXDriver 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron/.packlist
+%%SITE_PERL%%/XML/SAXDriver/Sablotron.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron
+@unexec rmdir %D/%%SITE_PERL%%/XML/SAXDriver 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Schematron/Makefile b/textproc/p5-XML-Schematron/Makefile
index 68ed5be01923..4fb379129820 100644
--- a/textproc/p5-XML-Schematron/Makefile
+++ b/textproc/p5-XML-Schematron/Makefile
@@ -18,13 +18,12 @@ COMMENT= Perl implementation of the Schematron
BUILD_DEPENDS= ${SITE_PERL}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= XML::Schematron::Sablotron.3 \
XML::Schematron::XPath.3 \
XML::Schematron::LibXSLT.3 \
XML::Schematron.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Schematron/pkg-plist b/textproc/p5-XML-Schematron/pkg-plist
index b22c209e82dd..119153e0c2db 100644
--- a/textproc/p5-XML-Schematron/pkg-plist
+++ b/textproc/p5-XML-Schematron/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Schematron/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron/LibXSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron/Sablotron.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron/XPath.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Schematron 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Schematron 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron/.packlist
+%%SITE_PERL%%/XML/Schematron.pm
+%%SITE_PERL%%/XML/Schematron/LibXSLT.pm
+%%SITE_PERL%%/XML/Schematron/Sablotron.pm
+%%SITE_PERL%%/XML/Schematron/XPath.pm
+@unexec rmdir %D/%%SITE_PERL%%/XML/Schematron 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 409c14075ac3..c0c1806f873c 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= andrew@ugh.net.au
COMMENT= Trivial API for reading and writing XML (esp config files)
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
MAN3= XML::Simple.3 XML::Simple::FAQ.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile
index bfb551cb52f7..dbf3ab4c21b8 100644
--- a/textproc/p5-XML-Stream/Makefile
+++ b/textproc/p5-XML-Stream/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= XML::Stream provides you with access to XML Stream
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::Stream.3 XML::Stream::Hash.3 XML::Stream::Namespace.3 \
XML::Stream::Parser.3 XML::Stream::Parser::DTD.3 \
XML::Stream::Tree.3 XML::Stream::Node.3
diff --git a/textproc/p5-XML-Stream/pkg-plist b/textproc/p5-XML-Stream/pkg-plist
index b88351f9609b..3ce803352dfa 100644
--- a/textproc/p5-XML-Stream/pkg-plist
+++ b/textproc/p5-XML-Stream/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Stream/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Namespace.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Parser/DTD.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Tree.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Stream
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Stream/Parser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/Stream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Stream/.packlist
+%%SITE_PERL%%/XML/Stream.pm
+%%SITE_PERL%%/XML/Stream/Hash.pm
+%%SITE_PERL%%/XML/Stream/Namespace.pm
+%%SITE_PERL%%/XML/Stream/Node.pm
+%%SITE_PERL%%/XML/Stream/Parser.pm
+%%SITE_PERL%%/XML/Stream/Parser/DTD.pm
+%%SITE_PERL%%/XML/Stream/Tree.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Stream
+@dirrm %%SITE_PERL%%/XML/Stream/Parser
+@dirrm %%SITE_PERL%%/XML/Stream
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile
index 312f96cc3f1d..d0e9a2a7ffc3 100644
--- a/textproc/p5-XML-TreeBuilder/Makefile
+++ b/textproc/p5-XML-TreeBuilder/Makefile
@@ -16,13 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl module to make XML document trees
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::TreeBuilder.3 XML::Element.3
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-TreeBuilder/pkg-plist b/textproc/p5-XML-TreeBuilder/pkg-plist
index e928c3c3a9c4..91d97f64549f 100644
--- a/textproc/p5-XML-TreeBuilder/pkg-plist
+++ b/textproc/p5-XML-TreeBuilder/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/XML/TreeBuilder.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Element.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-TreeBuilder/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-TreeBuilder
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/TreeBuilder.pm
+%%SITE_PERL%%/XML/Element.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-TreeBuilder/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-TreeBuilder
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Twig/Makefile b/textproc/p5-XML-Twig/Makefile
index 0edd44f0cde9..3533f9fa0510 100644
--- a/textproc/p5-XML-Twig/Makefile
+++ b/textproc/p5-XML-Twig/Makefile
@@ -17,12 +17,11 @@ COMMENT= Process huge XML documents by chunks via a tree interface
# On Perl < 5.8.0, XML::Twig has a further optional dependency on WeakRef.
# However, WeakRef needs Perl 5.005_55.
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
PERL_CONFIGURE= YES
MAN3= XML::Twig.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Twig/pkg-plist b/textproc/p5-XML-Twig/pkg-plist
index a8928a63e1b7..3ed98146dbda 100644
--- a/textproc/p5-XML-Twig/pkg-plist
+++ b/textproc/p5-XML-Twig/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Twig/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/Twig.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Twig
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig/.packlist
+%%SITE_PERL%%/XML/Twig.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 3dce55061dd1..3ba604c608b8 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Modules for parsing and evaluating XPath statements
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -28,6 +28,5 @@ MAN3= XML::XPath.3 XML::XPath::Boolean.3 XML::XPath::Builder.3 \
XML::XPath::NodeSet.3 XML::XPath::Number.3 \
XML::XPath::PerlSAX.3 XML::XPath::XMLParser.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-XPath/pkg-plist b/textproc/p5-XML-XPath/pkg-plist
index 2ed7efdc42b3..5b9376390dc3 100644
--- a/textproc/p5-XML-XPath/pkg-plist
+++ b/textproc/p5-XML-XPath/pkg-plist
@@ -1,28 +1,28 @@
bin/xpath
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XPath/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Namespace.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Comment.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Attribute.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/PI.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node/Element.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Root.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Variable.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/LocationPath.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Function.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Builder.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Number.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Literal.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/NodeSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Step.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/XMLParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/PerlSAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Boolean.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPath.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/XPath/Node
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XPath 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/XPath 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath/.packlist
+%%SITE_PERL%%/XML/XPath/Node/Namespace.pm
+%%SITE_PERL%%/XML/XPath/Node/Comment.pm
+%%SITE_PERL%%/XML/XPath/Node/Attribute.pm
+%%SITE_PERL%%/XML/XPath/Node/PI.pm
+%%SITE_PERL%%/XML/XPath/Node/Text.pm
+%%SITE_PERL%%/XML/XPath/Node/Element.pm
+%%SITE_PERL%%/XML/XPath/Root.pm
+%%SITE_PERL%%/XML/XPath/Variable.pm
+%%SITE_PERL%%/XML/XPath/Node.pm
+%%SITE_PERL%%/XML/XPath/LocationPath.pm
+%%SITE_PERL%%/XML/XPath/Function.pm
+%%SITE_PERL%%/XML/XPath/Builder.pm
+%%SITE_PERL%%/XML/XPath/Number.pm
+%%SITE_PERL%%/XML/XPath/Literal.pm
+%%SITE_PERL%%/XML/XPath/Parser.pm
+%%SITE_PERL%%/XML/XPath/NodeSet.pm
+%%SITE_PERL%%/XML/XPath/Step.pm
+%%SITE_PERL%%/XML/XPath/XMLParser.pm
+%%SITE_PERL%%/XML/XPath/Expr.pm
+%%SITE_PERL%%/XML/XPath/PerlSAX.pm
+%%SITE_PERL%%/XML/XPath/Boolean.pm
+%%SITE_PERL%%/XML/XPath.pm
+@dirrm %%SITE_PERL%%/XML/XPath/Node
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/XPath 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 76118faf3fe5..296455019cab 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -23,10 +23,9 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XML::XQL.3 XML::XQL::DOM.3 XML::XQL::Date.3 \
XML::XQL::Query.3 XML::XQL::Tutorial.3
-PBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PBASE= ${SITE_PERL}
.include <bsd.port.mk>
diff --git a/textproc/p5-XML-XQL/pkg-plist b/textproc/p5-XML-XQL/pkg-plist
index 4121b6bb025e..1f640c9f45a7 100644
--- a/textproc/p5-XML-XQL/pkg-plist
+++ b/textproc/p5-XML-XQL/pkg-plist
@@ -1,14 +1,14 @@
bin/xql.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XQL/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/DOM.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/DirXQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Plus.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Query.pod
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Strict.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XQL/Tutorial.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XQL
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/XQL
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XQL/.packlist
+%%SITE_PERL%%/XML/XQL.pm
+%%SITE_PERL%%/XML/XQL/DOM.pm
+%%SITE_PERL%%/XML/XQL/Date.pm
+%%SITE_PERL%%/XML/XQL/Debug.pm
+%%SITE_PERL%%/XML/XQL/DirXQL.pm
+%%SITE_PERL%%/XML/XQL/Parser.pm
+%%SITE_PERL%%/XML/XQL/Plus.pm
+%%SITE_PERL%%/XML/XQL/Query.pod
+%%SITE_PERL%%/XML/XQL/Strict.pm
+%%SITE_PERL%%/XML/XQL/Tutorial.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XQL
+@dirrm %%SITE_PERL%%/XML/XQL
diff --git a/textproc/p5-XML-XUpdate-LibXML/Makefile b/textproc/p5-XML-XUpdate-LibXML/Makefile
index aa39e4a81d37..de92f4d9168e 100644
--- a/textproc/p5-XML-XUpdate-LibXML/Makefile
+++ b/textproc/p5-XML-XUpdate-LibXML/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lev@FreeBSD.org
COMMENT= Simple implementation of XUpdate format based on and XML::LibXML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-XUpdate-LibXML/pkg-plist b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
index 335b88c77bf4..85568936a176 100644
--- a/textproc/p5-XML-XUpdate-LibXML/pkg-plist
+++ b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
@@ -1,10 +1,10 @@
bin/xupdate
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/XUpdate/LibXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Normalize/LibXML.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XUpdate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/XUpdate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML/.packlist
+%%SITE_PERL%%/XML/XUpdate/LibXML.pm
+%%SITE_PERL%%/XML/Normalize/LibXML.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/XUpdate 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/Normalize 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/textproc/p5-dTemplate/Makefile b/textproc/p5-dTemplate/Makefile
index 5dbf9022f63a..ee03dd6e38fd 100644
--- a/textproc/p5-dTemplate/Makefile
+++ b/textproc/p5-dTemplate/Makefile
@@ -17,6 +17,5 @@ COMMENT= A powerful template handling logic with advanced features
PERL_CONFIGURE= yes
MAN3= dTemplate.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-dTemplate/pkg-plist b/textproc/p5-dTemplate/pkg-plist
index 10064d334ebb..a525be2b21aa 100644
--- a/textproc/p5-dTemplate/pkg-plist
+++ b/textproc/p5-dTemplate/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/dTemplate.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/dTemplate/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/dTemplate 2>/dev/null || true
+%%SITE_PERL%%/dTemplate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate 2>/dev/null || true
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index a4a18f7249f4..fb73afc31937 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -16,7 +16,7 @@ DISTNAME= libxml-perl-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
COMMENT= Collection of Perl5 modules for working with XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
@@ -29,6 +29,5 @@ MAN3= Data::Grove.3 Data::Grove::Parent.3 Data::Grove::Visitor.3 \
XML::PatAct::MatchName.3 XML::PatAct::PatternTempl.3 \
XML::PatAct::ToObjects.3 XML::Perl2SAX.3 XML::SAX2Perl.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/textproc/p5-libxml/pkg-plist b/textproc/p5-libxml/pkg-plist
index 2761d96a48e9..c8dee7dc6852 100644
--- a/textproc/p5-libxml/pkg-plist
+++ b/textproc/p5-libxml/pkg-plist
@@ -1,21 +1,21 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libxml-perl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Data/Grove.pm
-lib/perl5/site_perl/%%PERL_VER%%/Data/Grove/Parent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Data/Grove/Visitor.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/ESISParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/CanonXMLWriter.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/Sample.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/Subs.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Handler/XMLWriter.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Parser/PerlSAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/ActionTempl.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/Amsterdam.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/MatchName.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/PatternTempl.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/PatAct/ToObjects.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Perl2SAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/SAX2Perl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Data/Grove
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libxml-perl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-perl/.packlist
+%%SITE_PERL%%/Data/Grove.pm
+%%SITE_PERL%%/Data/Grove/Parent.pm
+%%SITE_PERL%%/Data/Grove/Visitor.pm
+%%SITE_PERL%%/XML/ESISParser.pm
+%%SITE_PERL%%/XML/Handler/CanonXMLWriter.pm
+%%SITE_PERL%%/XML/Handler/Sample.pm
+%%SITE_PERL%%/XML/Handler/Subs.pm
+%%SITE_PERL%%/XML/Handler/XMLWriter.pm
+%%SITE_PERL%%/XML/Parser/PerlSAX.pm
+%%SITE_PERL%%/XML/PatAct/ActionTempl.pm
+%%SITE_PERL%%/XML/PatAct/Amsterdam.pm
+%%SITE_PERL%%/XML/PatAct/MatchName.pm
+%%SITE_PERL%%/XML/PatAct/PatternTempl.pm
+%%SITE_PERL%%/XML/PatAct/ToObjects.pm
+%%SITE_PERL%%/XML/Perl2SAX.pm
+%%SITE_PERL%%/XML/SAX2Perl.pm
+@dirrm %%SITE_PERL%%/Data/Grove
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-perl
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index b1d13be7a621..6553cd335077 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -21,26 +21,26 @@ bin/tv_sort
bin/tv_split
bin/tv_to_latex
bin/tv_to_text
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Ask.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/AskTerm.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/AskTk.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Clumps.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Config_file.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Europe_TZ.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Get_nice.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Grab_XML.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Grep.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Gunzip.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/IMDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Memoize.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Mode.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Summarize.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/TZ.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Usage.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Version.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/ZapListings.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
+%%SITE_PERL%%/XMLTV.pm
+%%SITE_PERL%%/XMLTV/Ask.pm
+%%SITE_PERL%%/XMLTV/AskTerm.pm
+%%SITE_PERL%%/XMLTV/AskTk.pm
+%%SITE_PERL%%/XMLTV/Clumps.pm
+%%SITE_PERL%%/XMLTV/Config_file.pm
+%%SITE_PERL%%/XMLTV/Europe_TZ.pm
+%%SITE_PERL%%/XMLTV/Get_nice.pm
+%%SITE_PERL%%/XMLTV/Grab_XML.pm
+%%SITE_PERL%%/XMLTV/Grep.pm
+%%SITE_PERL%%/XMLTV/Gunzip.pm
+%%SITE_PERL%%/XMLTV/IMDB.pm
+%%SITE_PERL%%/XMLTV/Memoize.pm
+%%SITE_PERL%%/XMLTV/Mode.pm
+%%SITE_PERL%%/XMLTV/Summarize.pm
+%%SITE_PERL%%/XMLTV/TZ.pm
+%%SITE_PERL%%/XMLTV/Usage.pm
+%%SITE_PERL%%/XMLTV/Version.pm
+%%SITE_PERL%%/XMLTV/ZapListings.pm
share/doc/xmltv-%%VERSION%%/COPYING
share/doc/xmltv-%%VERSION%%/QuickStart
share/doc/xmltv-%%VERSION%%/README
@@ -102,5 +102,5 @@ share/xmltv/tv_grab_uk_rt/channel_ids
@dirrm share/xmltv/tv_grab_it
@dirrm share/xmltv
@dirrm share/doc/xmltv-%%VERSION%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XMLTV
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XMLTV
+@dirrm %%SITE_PERL%%/XMLTV
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index 52d6a98ec556..6bcbcfb6afc3 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
-PERL_ARCHLIB= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+PERL_ARCHLIB= ${SITE_PERL}/${PERL_ARCH}
WRKSRC= ${WRKDIR}/${PORTNAME}
CONFIGURE_ARGS= --with-perl-enc-map=${PERL_ARCHLIB}/XML/Parser/Encodings
diff --git a/textproc/sarep/Makefile b/textproc/sarep/Makefile
index 5ad93d2fcadf..e5fdcd1880c1 100644
--- a/textproc/sarep/Makefile
+++ b/textproc/sarep/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=
MAINTAINER= ache@FreeBSD.org
COMMENT= Command-line search and replace tool; written in Perl; handles regexps
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Text/CSV_XS.pm:${PORTSDIR}/textproc/p5-Text-CSV_XS
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/CSV_XS.pm:${PORTSDIR}/textproc/p5-Text-CSV_XS
EXTRACT_CMD= $(SED)
EXTRACT_BEFORE_ARGS= 's=^\#!/usr/bin/perl =\#!${PERL} =' <
diff --git a/textproc/sdf/pkg-plist b/textproc/sdf/pkg-plist
index f53dab4ba6ab..6a8f15e0459e 100644
--- a/textproc/sdf/pkg-plist
+++ b/textproc/sdf/pkg-plist
@@ -9,181 +9,181 @@ bin/sdfbatch
bin/sdfcli
bin/sdfget
bin/sdngen
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDF/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Diff.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Sdf.pm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/apiperl.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/app.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/app.sdf
-lib/perl5/site_perl/%%PERL_VER%%/sdf/calc.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/dict.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/filters.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/find.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/arrow.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/arrow.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/back.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/back.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bar1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bar1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bg_ball.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bg_ball.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bk_diam.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/bk_diam.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/camera1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/camera1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/constrt1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/constrt1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/dir.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/doc.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/exclam.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/exclam.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/exit1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/exit1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/folders.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/folders.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ftp1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ftp1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/greenbal.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/greenbal.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/hot_dot.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/hot_dot.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/htx.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/images.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/info1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/info1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/info2.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/info2.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/key.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/key.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/m0omo7eu.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/m0omo7eu.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mail1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mail1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mail2.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mail2.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mailto.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mailto.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/mf6.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new2.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new2.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new3.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/new3.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/news1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/news1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/next.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/next.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/pdf.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/postscript.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/pow.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/pow.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/printer.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ps.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/qsd.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ques1.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/ques1.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/rd_ball.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/rd_ball.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdf.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdfbig.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdfbig.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdflogo.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sdflogo.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/sqbull.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/square_b.bmp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/square_b.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/text.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/triangle.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images/txt.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/cz_cz.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/de_de.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/en_au.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/en_ca.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/en_uk.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/en_us.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale/ru_ru.sdl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy/fancy.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy/manual.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy/pages.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/infomap/infomap.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/infomap/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/infomap/pages.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/overhead/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/overhead/overhead.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/admin.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/covers.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/document.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/fax.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/listing.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/manual.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/memo.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/mif.sdt.keep
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/minutes.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/newslttr.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/pages.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/paper.sds
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/rtf.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple/simple.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/perl/catalog.sdf
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/perl/oracamel.gif
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/perl/perl.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdf.ini
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdf/document.reg
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdf/sdf.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdfbatch.ini
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/A4.fm4
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/A4.fm5
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/all.sdg
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/bugtrack.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/default.sdg
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/defines.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/delphi.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/hlp.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/homepage.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/html.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/langdefs.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/latex.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/macros.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/mif.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/misc.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/module.sdp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/objects.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/pages.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/pod.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/rtf.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/sdf_dir.sdr
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/sdgmacs.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/settings.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/sgml.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/simple.sdp
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/stdlib.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/testcase.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/txt.sdn
-lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib/usecases.sdm
-lib/perl5/site_perl/%%PERL_VER%%/sdf/macros.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/misc.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/name.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/parse.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/podmacs.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/post_htx.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/post_mf6.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/sdfget.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/specials.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/subs.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/table.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tests.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/toexpand.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tohtml.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tolatex.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tomif.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/topod.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/toraw.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/tosgml.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/totxt.pl
-lib/perl5/site_perl/%%PERL_VER%%/sdf/values.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF/.packlist
+%%SITE_PERL%%/Pod/Diff.pm
+%%SITE_PERL%%/Pod/Sdf.pm
+%%SITE_PERL%%/sdf/apiperl.pl
+%%SITE_PERL%%/sdf/app.pl
+%%SITE_PERL%%/sdf/app.sdf
+%%SITE_PERL%%/sdf/calc.pl
+%%SITE_PERL%%/sdf/dict.pl
+%%SITE_PERL%%/sdf/filters.pl
+%%SITE_PERL%%/sdf/find.pl
+%%SITE_PERL%%/sdf/home/images/arrow.bmp
+%%SITE_PERL%%/sdf/home/images/arrow.gif
+%%SITE_PERL%%/sdf/home/images/back.bmp
+%%SITE_PERL%%/sdf/home/images/back.gif
+%%SITE_PERL%%/sdf/home/images/bar1.bmp
+%%SITE_PERL%%/sdf/home/images/bar1.gif
+%%SITE_PERL%%/sdf/home/images/bg_ball.bmp
+%%SITE_PERL%%/sdf/home/images/bg_ball.gif
+%%SITE_PERL%%/sdf/home/images/bk_diam.bmp
+%%SITE_PERL%%/sdf/home/images/bk_diam.gif
+%%SITE_PERL%%/sdf/home/images/camera1.bmp
+%%SITE_PERL%%/sdf/home/images/camera1.gif
+%%SITE_PERL%%/sdf/home/images/constrt1.bmp
+%%SITE_PERL%%/sdf/home/images/constrt1.gif
+%%SITE_PERL%%/sdf/home/images/dir.gif
+%%SITE_PERL%%/sdf/home/images/doc.gif
+%%SITE_PERL%%/sdf/home/images/exclam.bmp
+%%SITE_PERL%%/sdf/home/images/exclam.gif
+%%SITE_PERL%%/sdf/home/images/exit1.bmp
+%%SITE_PERL%%/sdf/home/images/exit1.gif
+%%SITE_PERL%%/sdf/home/images/folders.bmp
+%%SITE_PERL%%/sdf/home/images/folders.gif
+%%SITE_PERL%%/sdf/home/images/ftp1.bmp
+%%SITE_PERL%%/sdf/home/images/ftp1.gif
+%%SITE_PERL%%/sdf/home/images/greenbal.bmp
+%%SITE_PERL%%/sdf/home/images/greenbal.gif
+%%SITE_PERL%%/sdf/home/images/hot_dot.bmp
+%%SITE_PERL%%/sdf/home/images/hot_dot.gif
+%%SITE_PERL%%/sdf/home/images/htx.gif
+%%SITE_PERL%%/sdf/home/images/images.sdm
+%%SITE_PERL%%/sdf/home/images/info1.bmp
+%%SITE_PERL%%/sdf/home/images/info1.gif
+%%SITE_PERL%%/sdf/home/images/info2.bmp
+%%SITE_PERL%%/sdf/home/images/info2.gif
+%%SITE_PERL%%/sdf/home/images/key.bmp
+%%SITE_PERL%%/sdf/home/images/key.gif
+%%SITE_PERL%%/sdf/home/images/m0omo7eu.bmp
+%%SITE_PERL%%/sdf/home/images/m0omo7eu.gif
+%%SITE_PERL%%/sdf/home/images/mail1.bmp
+%%SITE_PERL%%/sdf/home/images/mail1.gif
+%%SITE_PERL%%/sdf/home/images/mail2.bmp
+%%SITE_PERL%%/sdf/home/images/mail2.gif
+%%SITE_PERL%%/sdf/home/images/mailto.bmp
+%%SITE_PERL%%/sdf/home/images/mailto.gif
+%%SITE_PERL%%/sdf/home/images/mf6.gif
+%%SITE_PERL%%/sdf/home/images/new1.bmp
+%%SITE_PERL%%/sdf/home/images/new1.gif
+%%SITE_PERL%%/sdf/home/images/new2.bmp
+%%SITE_PERL%%/sdf/home/images/new2.gif
+%%SITE_PERL%%/sdf/home/images/new3.bmp
+%%SITE_PERL%%/sdf/home/images/new3.gif
+%%SITE_PERL%%/sdf/home/images/news1.bmp
+%%SITE_PERL%%/sdf/home/images/news1.gif
+%%SITE_PERL%%/sdf/home/images/next.bmp
+%%SITE_PERL%%/sdf/home/images/next.gif
+%%SITE_PERL%%/sdf/home/images/pdf.gif
+%%SITE_PERL%%/sdf/home/images/postscript.gif
+%%SITE_PERL%%/sdf/home/images/pow.bmp
+%%SITE_PERL%%/sdf/home/images/pow.gif
+%%SITE_PERL%%/sdf/home/images/printer.gif
+%%SITE_PERL%%/sdf/home/images/ps.gif
+%%SITE_PERL%%/sdf/home/images/qsd.gif
+%%SITE_PERL%%/sdf/home/images/ques1.bmp
+%%SITE_PERL%%/sdf/home/images/ques1.gif
+%%SITE_PERL%%/sdf/home/images/rd_ball.bmp
+%%SITE_PERL%%/sdf/home/images/rd_ball.gif
+%%SITE_PERL%%/sdf/home/images/sdf.gif
+%%SITE_PERL%%/sdf/home/images/sdfbig.bmp
+%%SITE_PERL%%/sdf/home/images/sdfbig.gif
+%%SITE_PERL%%/sdf/home/images/sdflogo.bmp
+%%SITE_PERL%%/sdf/home/images/sdflogo.gif
+%%SITE_PERL%%/sdf/home/images/sqbull.gif
+%%SITE_PERL%%/sdf/home/images/square_b.bmp
+%%SITE_PERL%%/sdf/home/images/square_b.gif
+%%SITE_PERL%%/sdf/home/images/text.gif
+%%SITE_PERL%%/sdf/home/images/triangle.gif
+%%SITE_PERL%%/sdf/home/images/txt.gif
+%%SITE_PERL%%/sdf/home/locale/cz_cz.sdl
+%%SITE_PERL%%/sdf/home/locale/de_de.sdl
+%%SITE_PERL%%/sdf/home/locale/en_au.sdl
+%%SITE_PERL%%/sdf/home/locale/en_ca.sdl
+%%SITE_PERL%%/sdf/home/locale/en_uk.sdl
+%%SITE_PERL%%/sdf/home/locale/en_us.sdl
+%%SITE_PERL%%/sdf/home/locale/ru_ru.sdl
+%%SITE_PERL%%/sdf/home/look/fancy/fancy.sdm
+%%SITE_PERL%%/sdf/home/look/fancy/manual.sds
+%%SITE_PERL%%/sdf/home/look/fancy/mif.sdn
+%%SITE_PERL%%/sdf/home/look/fancy/pages.sdm
+%%SITE_PERL%%/sdf/home/look/infomap/infomap.sdm
+%%SITE_PERL%%/sdf/home/look/infomap/mif.sdn
+%%SITE_PERL%%/sdf/home/look/infomap/pages.sdm
+%%SITE_PERL%%/sdf/home/look/overhead/mif.sdn
+%%SITE_PERL%%/sdf/home/look/overhead/overhead.sdm
+%%SITE_PERL%%/sdf/home/look/simple/admin.sds
+%%SITE_PERL%%/sdf/home/look/simple/covers.sdm
+%%SITE_PERL%%/sdf/home/look/simple/document.sds
+%%SITE_PERL%%/sdf/home/look/simple/fax.sds
+%%SITE_PERL%%/sdf/home/look/simple/listing.sds
+%%SITE_PERL%%/sdf/home/look/simple/manual.sds
+%%SITE_PERL%%/sdf/home/look/simple/memo.sds
+%%SITE_PERL%%/sdf/home/look/simple/mif.sdn
+%%SITE_PERL%%/sdf/home/look/simple/mif.sdt.keep
+%%SITE_PERL%%/sdf/home/look/simple/minutes.sds
+%%SITE_PERL%%/sdf/home/look/simple/newslttr.sds
+%%SITE_PERL%%/sdf/home/look/simple/pages.sdm
+%%SITE_PERL%%/sdf/home/look/simple/paper.sds
+%%SITE_PERL%%/sdf/home/look/simple/rtf.sdn
+%%SITE_PERL%%/sdf/home/look/simple/simple.sdm
+%%SITE_PERL%%/sdf/home/perl/catalog.sdf
+%%SITE_PERL%%/sdf/home/perl/oracamel.gif
+%%SITE_PERL%%/sdf/home/perl/perl.sdm
+%%SITE_PERL%%/sdf/home/sdf.ini
+%%SITE_PERL%%/sdf/home/sdf/document.reg
+%%SITE_PERL%%/sdf/home/sdf/sdf.sdm
+%%SITE_PERL%%/sdf/home/sdfbatch.ini
+%%SITE_PERL%%/sdf/home/stdlib/A4.fm4
+%%SITE_PERL%%/sdf/home/stdlib/A4.fm5
+%%SITE_PERL%%/sdf/home/stdlib/all.sdg
+%%SITE_PERL%%/sdf/home/stdlib/bugtrack.sdm
+%%SITE_PERL%%/sdf/home/stdlib/default.sdg
+%%SITE_PERL%%/sdf/home/stdlib/defines.sdm
+%%SITE_PERL%%/sdf/home/stdlib/delphi.sdm
+%%SITE_PERL%%/sdf/home/stdlib/hlp.sdn
+%%SITE_PERL%%/sdf/home/stdlib/homepage.sdm
+%%SITE_PERL%%/sdf/home/stdlib/html.sdn
+%%SITE_PERL%%/sdf/home/stdlib/langdefs.sdm
+%%SITE_PERL%%/sdf/home/stdlib/latex.sdn
+%%SITE_PERL%%/sdf/home/stdlib/macros.sdm
+%%SITE_PERL%%/sdf/home/stdlib/mif.sdn
+%%SITE_PERL%%/sdf/home/stdlib/misc.sdm
+%%SITE_PERL%%/sdf/home/stdlib/module.sdp
+%%SITE_PERL%%/sdf/home/stdlib/objects.sdm
+%%SITE_PERL%%/sdf/home/stdlib/pages.sdm
+%%SITE_PERL%%/sdf/home/stdlib/pod.sdn
+%%SITE_PERL%%/sdf/home/stdlib/rtf.sdn
+%%SITE_PERL%%/sdf/home/stdlib/sdf_dir.sdr
+%%SITE_PERL%%/sdf/home/stdlib/sdgmacs.sdm
+%%SITE_PERL%%/sdf/home/stdlib/settings.sdm
+%%SITE_PERL%%/sdf/home/stdlib/sgml.sdn
+%%SITE_PERL%%/sdf/home/stdlib/simple.sdp
+%%SITE_PERL%%/sdf/home/stdlib/stdlib.sdm
+%%SITE_PERL%%/sdf/home/stdlib/testcase.sdm
+%%SITE_PERL%%/sdf/home/stdlib/txt.sdn
+%%SITE_PERL%%/sdf/home/stdlib/usecases.sdm
+%%SITE_PERL%%/sdf/macros.pl
+%%SITE_PERL%%/sdf/misc.pl
+%%SITE_PERL%%/sdf/name.pl
+%%SITE_PERL%%/sdf/parse.pl
+%%SITE_PERL%%/sdf/podmacs.pl
+%%SITE_PERL%%/sdf/post_htx.pl
+%%SITE_PERL%%/sdf/post_mf6.pl
+%%SITE_PERL%%/sdf/sdfget.pl
+%%SITE_PERL%%/sdf/specials.pl
+%%SITE_PERL%%/sdf/subs.pl
+%%SITE_PERL%%/sdf/table.pl
+%%SITE_PERL%%/sdf/tests.pl
+%%SITE_PERL%%/sdf/toexpand.pl
+%%SITE_PERL%%/sdf/tohtml.pl
+%%SITE_PERL%%/sdf/tolatex.pl
+%%SITE_PERL%%/sdf/tomif.pl
+%%SITE_PERL%%/sdf/topod.pl
+%%SITE_PERL%%/sdf/toraw.pl
+%%SITE_PERL%%/sdf/tosgml.pl
+%%SITE_PERL%%/sdf/totxt.pl
+%%SITE_PERL%%/sdf/values.pl
share/doc/sdf/build
share/doc/sdf/catalog.html
share/doc/sdf/catalog.sdf
@@ -639,17 +639,17 @@ share/doc/sdf/website
@dirrm share/doc/sdf/genhtml
@dirrm share/doc/sdf/faq
@dirrm share/doc/sdf
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/stdlib
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/sdf
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/simple
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/overhead
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/infomap
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look/fancy
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/look
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/locale
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDF 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pod 2>/dev/null || true
+@dirrm %%SITE_PERL%%/sdf/home/stdlib
+@dirrm %%SITE_PERL%%/sdf/home/sdf
+@dirrm %%SITE_PERL%%/sdf/home/perl
+@dirrm %%SITE_PERL%%/sdf/home/look/simple
+@dirrm %%SITE_PERL%%/sdf/home/look/overhead
+@dirrm %%SITE_PERL%%/sdf/home/look/infomap
+@dirrm %%SITE_PERL%%/sdf/home/look/fancy
+@dirrm %%SITE_PERL%%/sdf/home/look
+@dirrm %%SITE_PERL%%/sdf/home/locale
+@dirrm %%SITE_PERL%%/sdf/home/images
+@dirrm %%SITE_PERL%%/sdf/home
+@dirrm %%SITE_PERL%%/sdf
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
diff --git a/textproc/texi2db/Makefile b/textproc/texi2db/Makefile
index bb922d01be0c..7be1acd35fb5 100644
--- a/textproc/texi2db/Makefile
+++ b/textproc/texi2db/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.tldp.org/downloads/
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts a Texinfo file into DocBook XML
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/textproc/xslint/Makefile b/textproc/xslint/Makefile
index 354d34249cb3..134b3ef32b8c 100644
--- a/textproc/xslint/Makefile
+++ b/textproc/xslint/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= XSL(T) stylesheet checker
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
+RUN_DEPENDS= ${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
USE_PERL5= yes
USE_ZIP= yes
diff --git a/www/bins/Makefile b/www/bins/Makefile
index a29c716b10f5..8549cd5038ac 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -35,7 +35,7 @@ USE_REINPLACE= yes
NO_BUILD= yes
# perlbase
-PBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PBASE= ${SITE_PERL}
# additional scripts
BINS_SCRIPTS= bins_txt2xml
diff --git a/www/cgi-lib.pl/pkg-plist b/www/cgi-lib.pl/pkg-plist
index 834510c6fceb..ee56a48cfcf1 100644
--- a/www/cgi-lib.pl/pkg-plist
+++ b/www/cgi-lib.pl/pkg-plist
@@ -1 +1 @@
-lib/perl5/site_perl/%%PERL_VER%%/cgi-lib.pl
+%%SITE_PERL%%/cgi-lib.pl
diff --git a/www/cybercalendar/Makefile b/www/cybercalendar/Makefile
index e6f4af4414fb..58a42726c9ce 100644
--- a/www/cybercalendar/Makefile
+++ b/www/cybercalendar/Makefile
@@ -13,10 +13,10 @@ DISTNAME= CyberCalendar_${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= CyberCalendar is a web based calendar program written in perl
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
+ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
+ ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
+ ${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite
WRKSRC= ${WRKDIR}/CyberCalendar
diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile
index 884e97759c8b..d8ac63480594 100644
--- a/www/html2wml/Makefile
+++ b/www/html2wml/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
USE_PERL5= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN1= html2wml.1
diff --git a/www/htmlobject/Makefile b/www/htmlobject/Makefile
index 0154ee7b90ac..a8e2c99b7782 100644
--- a/www/htmlobject/Makefile
+++ b/www/htmlobject/Makefile
@@ -18,7 +18,6 @@ COMMENT= HTML Document Object
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTMLObject::Base.3 HTMLObject::FrameSet.3 HTMLObject::GetCookie.3 \
HTMLObject::Normal.3 HTMLObject::ReadCookie.3
diff --git a/www/htmlobject/pkg-plist b/www/htmlobject/pkg-plist
index 46e1dbb5c56f..deae218c0f06 100644
--- a/www/htmlobject/pkg-plist
+++ b/www/htmlobject/pkg-plist
@@ -1,19 +1,19 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/FrameSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/GetCookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/Normal.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTMLObject/ReadCookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/Base/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/FrameSet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/GetCookie/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/Normal/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/ReadCookie/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTMLObject/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTMLObject
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/Base
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/FrameSet
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/GetCookie
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/Normal
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject/ReadCookie
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTMLObject
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTMLObject
+%%SITE_PERL%%/HTMLObject/Base.pm
+%%SITE_PERL%%/HTMLObject/FrameSet.pm
+%%SITE_PERL%%/HTMLObject/GetCookie.pm
+%%SITE_PERL%%/HTMLObject/Normal.pm
+%%SITE_PERL%%/HTMLObject/ReadCookie.pm
+%%SITE_PERL%%/auto/HTMLObject/Base/autosplit.ix
+%%SITE_PERL%%/auto/HTMLObject/FrameSet/autosplit.ix
+%%SITE_PERL%%/auto/HTMLObject/GetCookie/autosplit.ix
+%%SITE_PERL%%/auto/HTMLObject/Normal/autosplit.ix
+%%SITE_PERL%%/auto/HTMLObject/ReadCookie/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTMLObject/.packlist
+@dirrm %%SITE_PERL%%/HTMLObject
+@dirrm %%SITE_PERL%%/auto/HTMLObject/Base
+@dirrm %%SITE_PERL%%/auto/HTMLObject/FrameSet
+@dirrm %%SITE_PERL%%/auto/HTMLObject/GetCookie
+@dirrm %%SITE_PERL%%/auto/HTMLObject/Normal
+@dirrm %%SITE_PERL%%/auto/HTMLObject/ReadCookie
+@dirrm %%SITE_PERL%%/auto/HTMLObject
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTMLObject
diff --git a/www/htmlpp/pkg-plist b/www/htmlpp/pkg-plist
index d95544535a15..5178cdf916ba 100644
--- a/www/htmlpp/pkg-plist
+++ b/www/htmlpp/pkg-plist
@@ -5,12 +5,12 @@ bin/guru.def
bin/macros.def
bin/prelude.def
bin/guru.fmt
-lib/perl5/site_perl/%%PERL_VER%%/htmlpp.d
-lib/perl5/site_perl/%%PERL_VER%%/findfile.pl
-lib/perl5/site_perl/%%PERL_VER%%/sflcvdp.pl
-lib/perl5/site_perl/%%PERL_VER%%/sfldate.pl
-lib/perl5/site_perl/%%PERL_VER%%/shellwd.pl
-lib/perl5/site_perl/%%PERL_VER%%/textdb.pl
+%%SITE_PERL%%/htmlpp.d
+%%SITE_PERL%%/findfile.pl
+%%SITE_PERL%%/sflcvdp.pl
+%%SITE_PERL%%/sfldate.pl
+%%SITE_PERL%%/shellwd.pl
+%%SITE_PERL%%/textdb.pl
share/doc/htmlpp/index.htm
share/doc/htmlpp/index1.htm
share/doc/htmlpp/index2.htm
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index b77f8afc35ce..33078abf6e09 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statemen
USE_PERL5= yes
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}
MAN1= configdump.1 config_prog.1 expire.1 localize.1 \
diff --git a/www/jdresolve/Makefile b/www/jdresolve/Makefile
index 76d131e35c61..86c7a1cefa83 100644
--- a/www/jdresolve/Makefile
+++ b/www/jdresolve/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.jdrowell.com/projects/jdresolve/
MAINTAINER= christophe@labouisse.org
COMMENT= A IP addresse to hostname program for httpd log files
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
diff --git a/www/ljdeps/Makefile b/www/ljdeps/Makefile
index 72e2b6b03b2a..51f36a97da29 100644
--- a/www/ljdeps/Makefile
+++ b/www/ljdeps/Makefile
@@ -36,7 +36,7 @@ RUN_DEPENDS= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
${SITE_PERL}/Unicode/MapUTF8.pm:${PORTSDIR}/converters/p5-Unicode-MapUTF8
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
EXTRACT_ONLY= # Empty
NO_BUILD= yes
diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile
index 7f897c3851aa..65d0d7d4c163 100644
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Embeds a Perl interpreter in the Apache server
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PERL5= YES
@@ -35,7 +35,6 @@ MAN3= Apache.3 Apache::Constants.3 Apache::ExtUtils.3 \
Apache::PerlSections.3 cgi_to_mod_perl.3 \
mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \
mod_perl_tuning.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERLSITEDIR= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
APACHE_PORT?= ${PORTSDIR}/www/apache13
diff --git a/www/mod_perl/pkg-plist b/www/mod_perl/pkg-plist
index 289a934c887c..2b14814a3844 100644
--- a/www/mod_perl/pkg-plist
+++ b/www/mod_perl/pkg-plist
@@ -3,77 +3,77 @@ include/apache/modules/perl/mod_perl.h
include/apache/modules/perl/mod_perl_version.h
include/apache/modules/perl/mod_perl_xs.h
include/apache/modules/perl/perl_PL.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Connection.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants/Exports.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ExtUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/FakeRequest.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Include.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Leak.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ModuleConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/MyConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Opcode.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Options.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlRun.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlRunXS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlSections.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RedirectLogFix.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Registry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryBB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryLoader.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryNG.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SIG.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SizeLimit.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/StatINC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Status.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Symbol.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Symdump.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/URI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/httpd_conf.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/src.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/testold.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/ap_config_auto.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/apache_inc.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_version.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_xs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/perl_PL.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/mod_perl.exp
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/cgi_to_mod_perl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_cvs.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_hooks.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_hooks.pm.PL
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_method_handlers.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_traps.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_tuning.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Connection.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants/Exports.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Debug.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/ExtUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/FakeRequest.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Include.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Leak.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Log.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/ModuleConfig.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/MyConfig.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Opcode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Options.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/PerlRun.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/PerlRunXS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/PerlSections.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/RedirectLogFix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Registry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/RegistryBB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/RegistryLoader.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/RegistryNG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Resource.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SIG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/StatINC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Status.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Symbol.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Symdump.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Table.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/URI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/httpd_conf.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/src.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/testold.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Apache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/ap_config_auto.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/apache_inc.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_version.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_xs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/perl_PL.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/mod_perl.exp
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/cgi_to_mod_perl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_cvs.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_hooks.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_hooks.pm.PL
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_method_handlers.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_traps.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl_tuning.pod
libexec/apache/libperl.so
@dirrm include/apache/modules/perl
@dirrm include/apache/modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include/modules
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Leak
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
@unexec rmdir %D/etc/apache 2> /dev/null || true
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 337877356ae5..7b9436e6008a 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -29,7 +29,6 @@ MAN3= Apache::TestRequest.3 Apache::TestSmoke.3 Apache::TestRun.3 \
Apache::Test.3 Apache::TestUtil.3 Apache::Build.3 \
Bundle::Apache2.3 ModPerl::Code.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
APACHE2_PORT?= ${PORTSDIR}/www/apache2
.include <bsd.port.pre.mk>
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 2fc9a45f09a7..385b6048f662 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -15,18 +15,18 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Active Server Pages for Apache with mod_perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Filter.pm:${PORTSDIR}/www/p5-Apache-Filter \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/SSI.pm:${PORTSDIR}/www/p5-Apache-SSI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MLDBM/Sync.pm:${PORTSDIR}/databases/p5-MLDBM-Sync \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Tie/Cache.pm:${PORTSDIR}/devel/p5-Tie-Cache \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/XSLT.pm:${PORTSDIR}/textproc/p5-XML-XSLT \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron
+BUILD_DEPENDS= ${SITE_PERL}/Apache/Filter.pm:${PORTSDIR}/www/p5-Apache-Filter \
+ ${SITE_PERL}/Apache/SSI.pm:${PORTSDIR}/www/p5-Apache-SSI \
+ ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
+ ${SITE_PERL}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \
+ ${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \
+ ${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/MLDBM/Sync.pm:${PORTSDIR}/databases/p5-MLDBM-Sync \
+ ${SITE_PERL}/Tie/Cache.pm:${PORTSDIR}/devel/p5-Tie-Cache \
+ ${SITE_PERL}/XML/XSLT.pm:${PORTSDIR}/textproc/p5-XML-XSLT \
+ ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -40,10 +40,10 @@ MAN3= Apache::ASP.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
.endif
.include <bsd.port.post.mk>
diff --git a/www/p5-Apache-AddHostPath/Makefile b/www/p5-Apache-AddHostPath/Makefile
index 880dfb16fc32..2608d732d959 100644
--- a/www/p5-Apache-AddHostPath/Makefile
+++ b/www/p5-Apache-AddHostPath/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl interface for transforming a requested URI based on host/port
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::AddHostPath.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AddHostPath/pkg-plist b/www/p5-Apache-AddHostPath/pkg-plist
index 09dc462889fd..336c74ba47ff 100644
--- a/www/p5-Apache-AddHostPath/pkg-plist
+++ b/www/p5-Apache-AddHostPath/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AddHostPath.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AddHostPath/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AddHostPath
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AddHostPath.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AddHostPath/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AddHostPath
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-Admin-Config/Makefile b/www/p5-Apache-Admin-Config/Makefile
index 0ee841593ff2..fbb7b21a55d9 100644
--- a/www/p5-Apache-Admin-Config/Makefile
+++ b/www/p5-Apache-Admin-Config/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl module to manipulate Apache configuration files
PERL_CONFIGURE= yes
MAN3= Apache::Admin::Config.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
${PERL} -pi -e 's/(!\$$)/0 && $1/;' \
diff --git a/www/p5-Apache-Admin-Config/pkg-plist b/www/p5-Apache-Admin-Config/pkg-plist
index 2ae24874878d..de408c3e1b13 100644
--- a/www/p5-Apache-Admin-Config/pkg-plist
+++ b/www/p5-Apache-Admin-Config/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Admin/Config.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Admin/Config
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Admin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache/Admin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist
+%%SITE_PERL%%/Apache/Admin/Config.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache/Admin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AntiSpam/Makefile b/www/p5-Apache-AntiSpam/Makefile
index 26b9bac225a1..bfea28fd5406 100644
--- a/www/p5-Apache-AntiSpam/Makefile
+++ b/www/p5-Apache-AntiSpam/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= AntiSpam filter for web pages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Email/Find.pm:${PORTSDIR}/mail/p5-Email-Find
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
+ ${SITE_PERL}/Email/Find.pm:${PORTSDIR}/mail/p5-Email-Find
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-AntiSpam/pkg-plist b/www/p5-Apache-AntiSpam/pkg-plist
index dbee9119a782..ab0f54471da8 100644
--- a/www/p5-Apache-AntiSpam/pkg-plist
+++ b/www/p5-Apache-AntiSpam/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam/HTMLEncode.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam/NoSpam.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam/Heuristic.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AntiSpam/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AntiSpam
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/AntiSpam
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AntiSpam.pm
+%%SITE_PERL%%/Apache/AntiSpam/HTMLEncode.pm
+%%SITE_PERL%%/Apache/AntiSpam/NoSpam.pm
+%%SITE_PERL%%/Apache/AntiSpam/Heuristic.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AntiSpam/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AntiSpam
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Apache/AntiSpam
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-Archive/Makefile b/www/p5-Apache-Archive/Makefile
index a56070ece6da..5f38baeddb84 100644
--- a/www/p5-Apache-Archive/Makefile
+++ b/www/p5-Apache-Archive/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module that creates a menu to allow perusal of tarball contents
BUILD_DEPENDS= ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar
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= Apache::Archive.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-Archive/pkg-plist b/www/p5-Apache-Archive/pkg-plist
index aa78aea3a7c1..5b50a615ac23 100644
--- a/www/p5-Apache-Archive/pkg-plist
+++ b/www/p5-Apache-Archive/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Archive.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Apache/Archive/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Archive/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Archive
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Apache/Archive
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/Archive.pm
+%%SITE_PERL%%/auto/Apache/Archive/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Archive/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Archive
+@dirrm %%SITE_PERL%%/auto/Apache/Archive
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index 96a114d493b0..51248b9b27de 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl module to provide custom forms for reauthentication
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
${LOCALBASE}/sbin/apxs:${APACHE_PORT}
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -29,7 +29,6 @@ CONFIGURE_ENV+= APACHE="${PREFIX}/sbin/apache" \
TESTGRP="${CURGRP}" \
TESTPORT="${TESTPORT}"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::AuthCookie.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AuthCookie/pkg-plist b/www/p5-Apache-AuthCookie/pkg-plist
index 27577d6136b6..3cf0f8b88c9d 100644
--- a/www/p5-Apache-AuthCookie/pkg-plist
+++ b/www/p5-Apache-AuthCookie/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie/Util.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AuthCookie.pm
+%%SITE_PERL%%/Apache/AuthCookie/Util.pm
+@dirrm %%SITE_PERL%%/Apache/AuthCookie
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 1abc278d3012..8144ef4243d3 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl modules that implement a cookie-based authentication system
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/AuthCookie.pm:${PORTSDIR}/www/p5-Apache-AuthCookie
+BUILD_DEPENDS= ${SITE_PERL}/Apache/AuthCookie.pm:${PORTSDIR}/www/p5-Apache-AuthCookie
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -25,8 +25,8 @@ MAN3= Apache::AuthTicket.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
.endif
.if ${PERL_LEVEL} < 500600
diff --git a/www/p5-Apache-AuthTicket/pkg-plist b/www/p5-Apache-AuthTicket/pkg-plist
index 6ebc5c7b2d8d..6abe3abb4a32 100644
--- a/www/p5-Apache-AuthTicket/pkg-plist
+++ b/www/p5-Apache-AuthTicket/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthTicket.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthTicket/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthTicket
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AuthTicket.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AuthenCache/Makefile b/www/p5-Apache-AuthenCache/Makefile
index 5e035bcfabe8..3dc85b3c9273 100644
--- a/www/p5-Apache-AuthenCache/Makefile
+++ b/www/p5-Apache-AuthenCache/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash \
${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
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= Apache::AuthenCache.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AuthenCache/pkg-plist b/www/p5-Apache-AuthenCache/pkg-plist
index c84aea468239..5d53fbeff37f 100644
--- a/www/p5-Apache-AuthenCache/pkg-plist
+++ b/www/p5-Apache-AuthenCache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthenCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenCache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenCache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/AuthenCache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenCache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenCache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-AuthenURL/Makefile b/www/p5-Apache-AuthenURL/Makefile
index ff606f1129de..5ebfb28e29a9 100644
--- a/www/p5-Apache-AuthenURL/Makefile
+++ b/www/p5-Apache-AuthenURL/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/Apache/AuthenCache.pm:${PORTSDIR}/www/p5-Apache-AuthenCache
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= Apache::AuthenURL.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AuthenURL/pkg-plist b/www/p5-Apache-AuthenURL/pkg-plist
index 2a6ff2484440..db766e177081 100644
--- a/www/p5-Apache-AuthenURL/pkg-plist
+++ b/www/p5-Apache-AuthenURL/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthenURL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenURL/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenURL
+%%SITE_PERL%%/Apache/AuthenURL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenURL/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenURL
diff --git a/www/p5-Apache-AutoIndex/Makefile b/www/p5-Apache-AutoIndex/Makefile
index d4a309948355..c5df5dd054c1 100644
--- a/www/p5-Apache-AutoIndex/Makefile
+++ b/www/p5-Apache-AutoIndex/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl module that can completely replace mod_dir and mod_autoindex
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Icon.pm:${PORTSDIR}/www/p5-Apache-Icon \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Language.pm:${PORTSDIR}/www/p5-Apache-Language \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/${PERL_ARCH}/Apache/Icon.pm:${PORTSDIR}/www/p5-Apache-Icon \
+ ${SITE_PERL}/${PERL_ARCH}/Apache/Language.pm:${PORTSDIR}/www/p5-Apache-Language \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::AutoIndex.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-AutoIndex/pkg-plist b/www/p5-Apache-AutoIndex/pkg-plist
index dac00cee7726..6b3750c44c8d 100644
--- a/www/p5-Apache-AutoIndex/pkg-plist
+++ b/www/p5-Apache-AutoIndex/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AutoIndex.dic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AutoIndex.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/AutoIndex.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/AutoIndex.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AutoIndex
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AutoIndex.dic
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AutoIndex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/AutoIndex.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AutoIndex/AutoIndex.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AutoIndex
diff --git a/www/p5-Apache-Clean/Makefile b/www/p5-Apache-Clean/Makefile
index f19ff9930a76..267746edb89a 100644
--- a/www/p5-Apache-Clean/Makefile
+++ b/www/p5-Apache-Clean/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Clean.3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index f19ff9930a76..267746edb89a 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Clean.3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/p5-Apache-Compress/Makefile b/www/p5-Apache-Compress/Makefile
index c5641f4745ea..13fe061e5576 100644
--- a/www/p5-Apache-Compress/Makefile
+++ b/www/p5-Apache-Compress/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Compress.3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/p5-Apache-ConfigFile/pkg-plist b/www/p5-Apache-ConfigFile/pkg-plist
index 14f3936c6dd4..bdd04740a326 100644
--- a/www/p5-Apache-ConfigFile/pkg-plist
+++ b/www/p5-Apache-ConfigFile/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/ConfigFile.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/ConfigFile
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist
+%%SITE_PERL%%/Apache/ConfigFile.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-DumpHeaders/Makefile b/www/p5-Apache-DumpHeaders/Makefile
index 1e864187560c..0fc38b2285b8 100644
--- a/www/p5-Apache-DumpHeaders/Makefile
+++ b/www/p5-Apache-DumpHeaders/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
COMMENT= Watches HTTP transactions under mod_perl, looking at the headers
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
PERL_CONFIGURE= yes
MAN3= Apache::DumpHeaders.3 Apache::ProxyPassThru.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-Apache-DumpHeaders/pkg-plist b/www/p5-Apache-DumpHeaders/pkg-plist
index 2a0aee1b1544..330bdeb2352d 100644
--- a/www/p5-Apache-DumpHeaders/pkg-plist
+++ b/www/p5-Apache-DumpHeaders/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/DumpHeaders.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/ProxyPassThru.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+%%SITE_PERL%%/Apache/DumpHeaders.pm
+%%SITE_PERL%%/Apache/ProxyPassThru.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-Icon/Makefile b/www/p5-Apache-Icon/Makefile
index 0705c226b62e..95d4dfbe9e0a 100644
--- a/www/p5-Apache-Icon/Makefile
+++ b/www/p5-Apache-Icon/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl module that provides an interface for looking up icon images
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Icon.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-Icon/pkg-plist b/www/p5-Apache-Icon/pkg-plist
index 19be675b066d..4b576f953b9a 100644
--- a/www/p5-Apache-Icon/pkg-plist
+++ b/www/p5-Apache-Icon/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Icon.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Icon/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Icon/Icon.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Icon/Icon.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Icon
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Icon.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Icon/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Icon/Icon.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Icon/Icon.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Icon
diff --git a/www/p5-Apache-Language/Makefile b/www/p5-Apache-Language/Makefile
index 9fdd24d65b60..2069e1c9af46 100644
--- a/www/p5-Apache-Language/Makefile
+++ b/www/p5-Apache-Language/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= A perl module that provides language-aware object hashes
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Language.3 Apache::Language::Constants.3 \
Apache::Language::DBI.3 Apache::Language::PlainFile.3
diff --git a/www/p5-Apache-Language/pkg-plist b/www/p5-Apache-Language/pkg-plist
index 9e575bf12fa0..bca2e9e3f865 100644
--- a/www/p5-Apache-Language/pkg-plist
+++ b/www/p5-Apache-Language/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language/PlainFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Language/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Language/Language.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Language/Language.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Language
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Language
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language/PlainFile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Language/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Language/Language.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Language/Language.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Language
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Language
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index 445158e6166f..c43620b7ffb3 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -22,10 +22,9 @@ BUILD_DEPENDS= ${SITE_PERL}/Audio/Wav.pm:${PORTSDIR}/audio/p5-Audio-Wav \
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= Apache::MP3.3 \
Apache::MP3::L10N.3 \
Apache::MP3::Playlist.3 \
diff --git a/www/p5-Apache-MP3/pkg-plist b/www/p5-Apache-MP3/pkg-plist
index ec15c577fa6e..522977529696 100644
--- a/www/p5-Apache-MP3/pkg-plist
+++ b/www/p5-Apache-MP3/pkg-plist
@@ -1,49 +1,49 @@
@comment $FreeBSD$
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/Aliases.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/RightToLeft.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ca.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/cs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/de.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/en.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/es.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/fa.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/fi.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/fr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ga.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/he.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/hr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/is.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/it.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ja.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ko.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ms.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nb.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nb_no.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nl_be.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nl_nl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nn.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/nn_no.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/no.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/no_no.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/pl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/ru.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/sh.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/sk.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/sl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/sr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/tr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/uk.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/x_marklar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/zh_cn.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N/zh_tw.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/Playlist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/Resample.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/Sorted.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/MP3/.packlist
+%%SITE_PERL%%/Apache/MP3.pm
+%%SITE_PERL%%/Apache/MP3/L10N.pm
+%%SITE_PERL%%/Apache/MP3/L10N/Aliases.pm
+%%SITE_PERL%%/Apache/MP3/L10N/RightToLeft.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ar.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ca.pm
+%%SITE_PERL%%/Apache/MP3/L10N/cs.pm
+%%SITE_PERL%%/Apache/MP3/L10N/de.pm
+%%SITE_PERL%%/Apache/MP3/L10N/en.pm
+%%SITE_PERL%%/Apache/MP3/L10N/es.pm
+%%SITE_PERL%%/Apache/MP3/L10N/fa.pm
+%%SITE_PERL%%/Apache/MP3/L10N/fi.pm
+%%SITE_PERL%%/Apache/MP3/L10N/fr.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ga.pm
+%%SITE_PERL%%/Apache/MP3/L10N/he.pm
+%%SITE_PERL%%/Apache/MP3/L10N/hr.pm
+%%SITE_PERL%%/Apache/MP3/L10N/is.pm
+%%SITE_PERL%%/Apache/MP3/L10N/it.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ja.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ko.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ms.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nb.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nb_no.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nl.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nl_be.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nl_nl.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nn.pm
+%%SITE_PERL%%/Apache/MP3/L10N/nn_no.pm
+%%SITE_PERL%%/Apache/MP3/L10N/no.pm
+%%SITE_PERL%%/Apache/MP3/L10N/no_no.pm
+%%SITE_PERL%%/Apache/MP3/L10N/pl.pm
+%%SITE_PERL%%/Apache/MP3/L10N/ru.pm
+%%SITE_PERL%%/Apache/MP3/L10N/sh.pm
+%%SITE_PERL%%/Apache/MP3/L10N/sk.pm
+%%SITE_PERL%%/Apache/MP3/L10N/sl.pm
+%%SITE_PERL%%/Apache/MP3/L10N/sr.pm
+%%SITE_PERL%%/Apache/MP3/L10N/tr.pm
+%%SITE_PERL%%/Apache/MP3/L10N/uk.pm
+%%SITE_PERL%%/Apache/MP3/L10N/x_marklar.pm
+%%SITE_PERL%%/Apache/MP3/L10N/zh_cn.pm
+%%SITE_PERL%%/Apache/MP3/L10N/zh_tw.pm
+%%SITE_PERL%%/Apache/MP3/Playlist.pm
+%%SITE_PERL%%/Apache/MP3/Resample.pm
+%%SITE_PERL%%/Apache/MP3/Sorted.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3/.packlist
share/Apache-MP3/apache_mp3.css
share/Apache-MP3/apache_mp3_fig1.gif
share/Apache-MP3/apache_mp3_help.gif
@@ -54,9 +54,9 @@ share/Apache-MP3/functions.js
share/Apache-MP3/playlist.gif
share/Apache-MP3/right_arrow.gif
share/Apache-MP3/sound.gif
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/MP3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3/L10N
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/MP3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Apache/MP3/L10N
+@dirrm %%SITE_PERL%%/Apache/MP3
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
@dirrm share/Apache-MP3
diff --git a/www/p5-Apache-NNTPGateway/Makefile b/www/p5-Apache-NNTPGateway/Makefile
index a4e01ace6c2a..4e459206a4b8 100644
--- a/www/p5-Apache-NNTPGateway/Makefile
+++ b/www/p5-Apache-NNTPGateway/Makefile
@@ -15,16 +15,15 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
COMMENT= A NNTP interface for mod_perl enabled Apache web server
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
RUN_DEPENDS= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/NNTPGateway-${PORTVERSION}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::NNTPGateway.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-NNTPGateway/pkg-plist b/www/p5-Apache-NNTPGateway/pkg-plist
index f82cde879818..5fd095ccb30d 100644
--- a/www/p5-Apache-NNTPGateway/pkg-plist
+++ b/www/p5-Apache-NNTPGateway/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/NNTPGateway.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway/.packlist
+%%SITE_PERL%%/Apache/NNTPGateway.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-PageKit/Makefile b/www/p5-Apache-PageKit/Makefile
index 22d7b0c6c599..77dd551e7043 100644
--- a/www/p5-Apache-PageKit/Makefile
+++ b/www/p5-Apache-PageKit/Makefile
@@ -36,7 +36,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
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
@@ -44,7 +44,6 @@ MAN3= Apache::ErrorReport.3 \
Apache::PageKit.3 \
Apache::PageKit::Model.3 \
Apache::PageKit::Session.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/www/p5-Apache-PageKit/pkg-plist b/www/p5-Apache-PageKit/pkg-plist
index be280d74a929..25a600cd17df 100644
--- a/www/p5-Apache-PageKit/pkg-plist
+++ b/www/p5-Apache-PageKit/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/View.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Content.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Model.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Param.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Edit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/setup_eg.pl
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/ErrorReport.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
+%%SITE_PERL%%/Apache/PageKit/View.pm
+%%SITE_PERL%%/Apache/PageKit/Content.pm
+%%SITE_PERL%%/Apache/PageKit/Model.pm
+%%SITE_PERL%%/Apache/PageKit/Param.pm
+%%SITE_PERL%%/Apache/PageKit/Session.pm
+%%SITE_PERL%%/Apache/PageKit/Config.pm
+%%SITE_PERL%%/Apache/PageKit/Edit.pm
+%%SITE_PERL%%/Apache/setup_eg.pl
+%%SITE_PERL%%/Apache/PageKit.pm
+%%SITE_PERL%%/Apache/ErrorReport.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
%%PORTDOCS%%share/doc/Apache-PageKit/README
%%PORTDOCS%%share/doc/Apache-PageKit/features.xml
%%PORTDOCS%%share/doc/Apache-PageKit/manual.xml
@@ -80,8 +80,8 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Content
%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Config
%%PORTDOCS%%@dirrm share/examples/Apache-PageKit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/PageKit
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache/PageKit 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/www/p5-Apache-Peek/Makefile b/www/p5-Apache-Peek/Makefile
index 4fadea16b6d3..426d1be01add 100644
--- a/www/p5-Apache-Peek/Makefile
+++ b/www/p5-Apache-Peek/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= leo@florida.sarang.net
COMMENT= A perl5 data debugging tool for the XS programmer
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/B/Graph.pm:${PORTSDIR}/devel/p5-B-Graph
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/B/Graph.pm:${PORTSDIR}/devel/p5-B-Graph
PERL_CONFIGURE= YES
MAN3= Apache::Peek.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/www/p5-Apache-Peek/pkg-plist b/www/p5-Apache-Peek/pkg-plist
index 67f839a68cd0..310b29dd793b 100644
--- a/www/p5-Apache-Peek/pkg-plist
+++ b/www/p5-Apache-Peek/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Peek.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Peek/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Peek
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Peek.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek
diff --git a/www/p5-Apache-Radius/Makefile b/www/p5-Apache-Radius/Makefile
index a21a2ccc6888..7b733318c132 100644
--- a/www/p5-Apache-Radius/Makefile
+++ b/www/p5-Apache-Radius/Makefile
@@ -16,8 +16,8 @@ DISTNAME= Apache-AuthenRadius-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A perl5 module for providing RADIUS authentication in Apache+mod_perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-Radius/pkg-plist b/www/p5-Apache-Radius/pkg-plist
index e7236a0ae889..1a75ccc6fb03 100644
--- a/www/p5-Apache-Radius/pkg-plist
+++ b/www/p5-Apache-Radius/pkg-plist
@@ -1,2 +1,2 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthenRadius.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenRadius/.packlist
+%%SITE_PERL%%/Apache/AuthenRadius.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenRadius/.packlist
diff --git a/www/p5-Apache-Reload/Makefile b/www/p5-Apache-Reload/Makefile
index ded031f67f9d..df74a886c233 100644
--- a/www/p5-Apache-Reload/Makefile
+++ b/www/p5-Apache-Reload/Makefile
@@ -17,7 +17,6 @@ COMMENT= Reload changed modules
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Apache::Reload.3
.include <bsd.port.mk>
diff --git a/www/p5-Apache-Reload/pkg-plist b/www/p5-Apache-Reload/pkg-plist
index 4adcec1b7886..ed834e651972 100644
--- a/www/p5-Apache-Reload/pkg-plist
+++ b/www/p5-Apache-Reload/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Reload/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Reload.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Reload
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Reload/.packlist
+%%SITE_PERL%%/Apache/Reload.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Reload
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index ea62411d7237..76cefd457076 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Apache::SSI - Implement Server Side Includes in Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/SimpleParse.pm:${PORTSDIR}/www/p5-HTML-SimpleParse
+BUILD_DEPENDS= ${SITE_PERL}/HTML/SimpleParse.pm:${PORTSDIR}/www/p5-HTML-SimpleParse
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-Session-PHP/Makefile b/www/p5-Apache-Session-PHP/Makefile
index 6f3c7252ff33..b0c0c4c15541 100644
--- a/www/p5-Apache-Session-PHP/Makefile
+++ b/www/p5-Apache-Session-PHP/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
COMMENT= Glue Apache::Session with PHP::Session
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/PHP/Session.pm:${PORTSDIR}/www/p5-PHP-Session \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS= ${SITE_PERL}/PHP/Session.pm:${PORTSDIR}/www/p5-PHP-Session \
+ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
+ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Apache::Session::PHP.3 Apache::Session::Serialize::PHP.3 Apache::Session::Store::PHP.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-Apache-Session-PHP/pkg-plist b/www/p5-Apache-Session-PHP/pkg-plist
index c0f27ddcd218..aa9899fe5144 100644
--- a/www/p5-Apache-Session-PHP/pkg-plist
+++ b/www/p5-Apache-Session-PHP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/PHP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/PHP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/PHP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Session/PHP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Session/PHP
+%%SITE_PERL%%/Apache/Session/PHP.pm
+%%SITE_PERL%%/Apache/Session/Serialize/PHP.pm
+%%SITE_PERL%%/Apache/Session/Store/PHP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index 617e8fa43f20..3a9805746574 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -51,7 +51,7 @@ MAN3= Apache::Session.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
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.endif
.include <bsd.port.post.mk>
diff --git a/www/p5-Apache-Session/pkg-plist b/www/p5-Apache-Session/pkg-plist
index d930a0e6e679..9191ba40da02 100644
--- a/www/p5-Apache-Session/pkg-plist
+++ b/www/p5-Apache-Session/pkg-plist
@@ -1,35 +1,35 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Flex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Oracle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Postgres.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Sybase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Generate/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Generate/ModUniqueId.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Generate/ModUsertrack.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/File.pm.orig
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock/Semaphore.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/Base64.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/Storable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/Sybase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize/UUEncode.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/File.pm.orig
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/Oracle.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/Postgres.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store/Sybase.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Session
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Store
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Serialize
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Lock
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session/Generate
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/Session
+%%SITE_PERL%%/Apache/Session.pm
+%%SITE_PERL%%/Apache/Session/DB_File.pm
+%%SITE_PERL%%/Apache/Session/File.pm
+%%SITE_PERL%%/Apache/Session/Flex.pm
+%%SITE_PERL%%/Apache/Session/MySQL.pm
+%%SITE_PERL%%/Apache/Session/Oracle.pm
+%%SITE_PERL%%/Apache/Session/Postgres.pm
+%%SITE_PERL%%/Apache/Session/Sybase.pm
+%%SITE_PERL%%/Apache/Session/Generate/MD5.pm
+%%SITE_PERL%%/Apache/Session/Generate/ModUniqueId.pm
+%%SITE_PERL%%/Apache/Session/Generate/ModUsertrack.pm
+%%SITE_PERL%%/Apache/Session/Lock/File.pm
+%%SITE_PERL%%/Apache/Session/Lock/File.pm.orig
+%%SITE_PERL%%/Apache/Session/Lock/MySQL.pm
+%%SITE_PERL%%/Apache/Session/Lock/Null.pm
+%%SITE_PERL%%/Apache/Session/Lock/Semaphore.pm
+%%SITE_PERL%%/Apache/Session/Serialize/Base64.pm
+%%SITE_PERL%%/Apache/Session/Serialize/Storable.pm
+%%SITE_PERL%%/Apache/Session/Serialize/Sybase.pm
+%%SITE_PERL%%/Apache/Session/Serialize/UUEncode.pm
+%%SITE_PERL%%/Apache/Session/Store/DBI.pm
+%%SITE_PERL%%/Apache/Session/Store/DB_File.pm
+%%SITE_PERL%%/Apache/Session/Store/File.pm
+%%SITE_PERL%%/Apache/Session/Store/File.pm.orig
+%%SITE_PERL%%/Apache/Session/Store/MySQL.pm
+%%SITE_PERL%%/Apache/Session/Store/Oracle.pm
+%%SITE_PERL%%/Apache/Session/Store/Postgres.pm
+%%SITE_PERL%%/Apache/Session/Store/Sybase.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
+@dirrm %%SITE_PERL%%/Apache/Session/Store
+@dirrm %%SITE_PERL%%/Apache/Session/Serialize
+@dirrm %%SITE_PERL%%/Apache/Session/Lock
+@dirrm %%SITE_PERL%%/Apache/Session/Generate
+@dirrm %%SITE_PERL%%/Apache/Session
diff --git a/www/p5-Apache-SubProcess/Makefile b/www/p5-Apache-SubProcess/Makefile
index 8f865ad2b6b3..1d4b45581bc6 100644
--- a/www/p5-Apache-SubProcess/Makefile
+++ b/www/p5-Apache-SubProcess/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= larse@isi.edu
COMMENT= Forking and executing subprocesses from mod_perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-SubProcess/pkg-plist b/www/p5-Apache-SubProcess/pkg-plist
index f2718c0db3d9..03f356e980bd 100644
--- a/www/p5-Apache-SubProcess/pkg-plist
+++ b/www/p5-Apache-SubProcess/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/SubProcess/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SubProcess.pm
-@unexec %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/SubProcess 2>/dev/null || true
-@unexec %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SubProcess.pm
+@unexec %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess 2>/dev/null || true
+@unexec %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
diff --git a/www/p5-ApacheBench/pkg-plist b/www/p5-ApacheBench/pkg-plist
index 52eb3e6d031b..08cd40f033fc 100644
--- a/www/p5-ApacheBench/pkg-plist
+++ b/www/p5-ApacheBench/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Regression.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Run.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD/Bench 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTPD 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Bench 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Regression.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench/Run.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Cookie/Makefile b/www/p5-AxKit-XSP-Cookie/Makefile
index cf845212ee43..2fe166a3d4cf 100644
--- a/www/p5-AxKit-XSP-Cookie/Makefile
+++ b/www/p5-AxKit-XSP-Cookie/Makefile
@@ -17,7 +17,7 @@ COMMENT= An XSP library for setting and getting HTTP cookies
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Cookie.3
diff --git a/www/p5-AxKit-XSP-Cookie/pkg-plist b/www/p5-AxKit-XSP-Cookie/pkg-plist
index 29451e987420..0a56fc181685 100644
--- a/www/p5-AxKit-XSP-Cookie/pkg-plist
+++ b/www/p5-AxKit-XSP-Cookie/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Cookie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-ESQL/Makefile b/www/p5-AxKit-XSP-ESQL/Makefile
index c58a3a043bb4..9d84512b2086 100644
--- a/www/p5-AxKit-XSP-ESQL/Makefile
+++ b/www/p5-AxKit-XSP-ESQL/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
${SITE_PERL}/AxKit/XSP/Util.pm:${PORTSDIR}/www/p5-AxKit-XSP-Util
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::ESQL.3
diff --git a/www/p5-AxKit-XSP-ESQL/pkg-plist b/www/p5-AxKit-XSP-ESQL/pkg-plist
index f3bc1d747972..1f406480c1f8 100644
--- a/www/p5-AxKit-XSP-ESQL/pkg-plist
+++ b/www/p5-AxKit-XSP-ESQL/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/ESQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/ESQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Exception/Makefile b/www/p5-AxKit-XSP-Exception/Makefile
index 663c56b39bdf..1434d7b919ee 100644
--- a/www/p5-AxKit-XSP-Exception/Makefile
+++ b/www/p5-AxKit-XSP-Exception/Makefile
@@ -17,7 +17,7 @@ COMMENT= Exceptions taglib for eXtensible Server Pages plugin for AxKit
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Exception.3
diff --git a/www/p5-AxKit-XSP-Exception/pkg-plist b/www/p5-AxKit-XSP-Exception/pkg-plist
index 7d9bb4ad727c..c5719ed7fea0 100644
--- a/www/p5-AxKit-XSP-Exception/pkg-plist
+++ b/www/p5-AxKit-XSP-Exception/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Exception.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-IfParam/Makefile b/www/p5-AxKit-XSP-IfParam/Makefile
index 6540dbdf02ab..fb020ee719f3 100644
--- a/www/p5-AxKit-XSP-IfParam/Makefile
+++ b/www/p5-AxKit-XSP-IfParam/Makefile
@@ -17,7 +17,7 @@ COMMENT= Equivalent of XSP Param taglib, but conditional plugin for AxKit
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::IfParam.3
diff --git a/www/p5-AxKit-XSP-IfParam/pkg-plist b/www/p5-AxKit-XSP-IfParam/pkg-plist
index 11092a3bc364..7a2a491b2e6a 100644
--- a/www/p5-AxKit-XSP-IfParam/pkg-plist
+++ b/www/p5-AxKit-XSP-IfParam/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/IfParam.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/IfParam.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Param/Makefile b/www/p5-AxKit-XSP-Param/Makefile
index ea00acfc50f8..bd5c1b3d6394 100644
--- a/www/p5-AxKit-XSP-Param/Makefile
+++ b/www/p5-AxKit-XSP-Param/Makefile
@@ -17,7 +17,7 @@ COMMENT= A namespace wrapper for accessing HTTP request paramaters
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Param.3
diff --git a/www/p5-AxKit-XSP-Param/pkg-plist b/www/p5-AxKit-XSP-Param/pkg-plist
index 05ea6fd3ddd1..fb338161421e 100644
--- a/www/p5-AxKit-XSP-Param/pkg-plist
+++ b/www/p5-AxKit-XSP-Param/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Param.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Param.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-PerForm/Makefile b/www/p5-AxKit-XSP-PerForm/Makefile
index 8a4486a08543..a15732479534 100644
--- a/www/p5-AxKit-XSP-PerForm/Makefile
+++ b/www/p5-AxKit-XSP-PerForm/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
${SITE_PERL}/AxKit/XSP/WebUtils.pm:${PORTSDIR}/www/p5-AxKit-XSP-WebUtils
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::PerForm.3
diff --git a/www/p5-AxKit-XSP-PerForm/pkg-plist b/www/p5-AxKit-XSP-PerForm/pkg-plist
index c78914a38084..a7f9cdaa4b6c 100644
--- a/www/p5-AxKit-XSP-PerForm/pkg-plist
+++ b/www/p5-AxKit-XSP-PerForm/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/PerForm.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/PerForm.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Sendmail/Makefile b/www/p5-AxKit-XSP-Sendmail/Makefile
index 2b7c42f627a1..bfd0053a6d78 100644
--- a/www/p5-AxKit-XSP-Sendmail/Makefile
+++ b/www/p5-AxKit-XSP-Sendmail/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Sendmail.3
diff --git a/www/p5-AxKit-XSP-Sendmail/pkg-plist b/www/p5-AxKit-XSP-Sendmail/pkg-plist
index cad6a9736c76..9be0d56f8575 100644
--- a/www/p5-AxKit-XSP-Sendmail/pkg-plist
+++ b/www/p5-AxKit-XSP-Sendmail/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Sendmail.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Sendmail.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-Util/Makefile b/www/p5-AxKit-XSP-Util/Makefile
index 695000ece144..dfe953cef84e 100644
--- a/www/p5-AxKit-XSP-Util/Makefile
+++ b/www/p5-AxKit-XSP-Util/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
${SITE_PERL}/${PERL_ARCH}/Time/Piece.pm:${PORTSDIR}/devel/p5-Time-Piece
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::Util.3
diff --git a/www/p5-AxKit-XSP-Util/pkg-plist b/www/p5-AxKit-XSP-Util/pkg-plist
index 363bd92b2009..f017e0569600 100644
--- a/www/p5-AxKit-XSP-Util/pkg-plist
+++ b/www/p5-AxKit-XSP-Util/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit-XSP-WebUtils/Makefile b/www/p5-AxKit-XSP-WebUtils/Makefile
index 775e0c4bb91c..5511d0f46a1f 100644
--- a/www/p5-AxKit-XSP-WebUtils/Makefile
+++ b/www/p5-AxKit-XSP-WebUtils/Makefile
@@ -18,7 +18,7 @@ COMMENT= Plugin for AxKit that provide utilities for building XSP web apps
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= AxKit::XSP::WebUtils.3
diff --git a/www/p5-AxKit-XSP-WebUtils/pkg-plist b/www/p5-AxKit-XSP-WebUtils/pkg-plist
index cfb9e5f0a192..66a6e3038074 100644
--- a/www/p5-AxKit-XSP-WebUtils/pkg-plist
+++ b/www/p5-AxKit-XSP-WebUtils/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP/WebUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AxKit 2>/dev/null || true
+%%SITE_PERL%%/AxKit/XSP/WebUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
diff --git a/www/p5-AxKit/Makefile b/www/p5-AxKit/Makefile
index 869541f90c33..86ff8a988498 100644
--- a/www/p5-AxKit/Makefile
+++ b/www/p5-AxKit/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS= \
${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
# XXX Glitch in this release...
WRKSRC= ${WRKDIR}/${PORTNAME}-1.61
diff --git a/www/p5-AxKit/pkg-plist b/www/p5-AxKit/pkg-plist
index ab58c1828d57..efa1774f8b1c 100644
--- a/www/p5-AxKit/pkg-plist
+++ b/www/p5-AxKit/pkg-plist
@@ -1,44 +1,44 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Cache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.xs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/ConfigReader.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/AxPoint.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/HtmlDoc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/LibXSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/PassiveTeX.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/SAXMachines.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/Sablot.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsNITF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsRDF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XPathScript.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/SimpleTaglib.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/TaglibHelper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Makefile.PL
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser/WAPCheck.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Fragment.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Passthru.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/QueryStringCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/FileWrite.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Scalar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/FileSuffix.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/PathInfo.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/QueryString.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/AxKit.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/AxKit.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/AxKit.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Cache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.xs
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/ConfigReader.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Exception.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/AxPoint.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/HtmlDoc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/LibXSLT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/PassiveTeX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/Query.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/SAXMachines.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/Sablot.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsNITF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsRDF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XPathScript.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/SimpleTaglib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/TaglibHelper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Makefile.PL
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser/WAPCheck.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Fragment.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Passthru.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/QueryStringCache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/FileWrite.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Filter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Scalar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/Cookie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/FileSuffix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/PathInfo.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/QueryString.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/UserAgent.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/AxKit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/AxKit.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/AxKit.so
share/examples/AxKit/axkit.org/docs/associating_stylesheets.xml
share/examples/AxKit/axkit.org/docs/index.xml
share/examples/AxKit/axkit.org/docs/introduction.dkb
@@ -110,16 +110,16 @@ share/examples/AxKit/docbook_print.xps
share/examples/AxKit/docbook_screen.xps
share/examples/AxKit/docbook_tags.xps
share/examples/AxKit/index.xml
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit
@dirrm share/examples/AxKit/axkit.org/docs/xsp
@dirrm share/examples/AxKit/axkit.org/docs/presentations/tpc2001
@dirrm share/examples/AxKit/axkit.org/docs/presentations
diff --git a/www/p5-Bundle-Slash/Makefile b/www/p5-Bundle-Slash/Makefile
index c9b79c445293..0bae22528d90 100644
--- a/www/p5-Bundle-Slash/Makefile
+++ b/www/p5-Bundle-Slash/Makefile
@@ -46,12 +46,11 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-D
${SITE_PERL}/DBIx/Password.pm:${PORTSDIR}/databases/p5-DBIx-Password
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Bundle::Slash.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/www/p5-Bundle-Slash/pkg-plist b/www/p5-Bundle-Slash/pkg-plist
index 1bc1903feba3..82bda6482a5e 100644
--- a/www/p5-Bundle-Slash/pkg-plist
+++ b/www/p5-Bundle-Slash/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/Slash.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle/Slash/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle/Slash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
+%%SITE_PERL%%/Bundle/Slash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
diff --git a/www/p5-Bundle-Sledge/Makefile b/www/p5-Bundle-Sledge/Makefile
index 39e7fd687cdb..59963beeb10a 100644
--- a/www/p5-Bundle-Sledge/Makefile
+++ b/www/p5-Bundle-Sledge/Makefile
@@ -45,12 +45,11 @@ PM_DEPENDS+= ${SITE_PERL}/Data/Properties.pm:${PORTSDIR}/devel/p5-Data-Propertie
PM_DEPENDS+= ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
PM_DEPENDS+= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MAN3= Bundle::Sledge.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
diff --git a/www/p5-Bundle-Sledge/pkg-plist b/www/p5-Bundle-Sledge/pkg-plist
index 4ac92a387cdd..820f5f823258 100644
--- a/www/p5-Bundle-Sledge/pkg-plist
+++ b/www/p5-Bundle-Sledge/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/Sledge.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle/Sledge/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle/Sledge 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
+%%SITE_PERL%%/Bundle/Sledge.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 12cb00ede78f..db15bb061122 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
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= CGI::Application.3 CGI::Application::Mailform.3
.include <bsd.port.mk>
diff --git a/www/p5-CGI-Application/pkg-plist b/www/p5-CGI-Application/pkg-plist
index 54fdd2a0343c..559dc1fac363 100644
--- a/www/p5-CGI-Application/pkg-plist
+++ b/www/p5-CGI-Application/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Application.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Application/Mailform.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Application/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Application
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI/Application
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/Application.pm
+%%SITE_PERL%%/CGI/Application/Mailform.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/CGI/Application
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index ecd000f3f363..b392fecf4afa 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module implementing a cgi interface to String::Checker
BUILD_DEPENDS= ${SITE_PERL}/String/Checker.pm:${PORTSDIR}/devel/p5-String-Checker
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= CGI::ArgChecker.3
.include <bsd.port.mk>
diff --git a/www/p5-CGI-ArgChecker/pkg-plist b/www/p5-CGI-ArgChecker/pkg-plist
index b29cc79c1f68..767facd633ca 100644
--- a/www/p5-CGI-ArgChecker/pkg-plist
+++ b/www/p5-CGI-ArgChecker/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/ArgChecker.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/ArgChecker.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-Cache/Makefile b/www/p5-CGI-Cache/Makefile
index 778c332d8953..788f85969bce 100644
--- a/www/p5-CGI-Cache/Makefile
+++ b/www/p5-CGI-Cache/Makefile
@@ -27,10 +27,9 @@ BUILD_DEPENDS+= ${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Sp
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= CGI::Cache.3
.include <bsd.port.post.mk>
diff --git a/www/p5-CGI-Cache/pkg-plist b/www/p5-CGI-Cache/pkg-plist
index ebd3e2a0697d..395eaca1328f 100644
--- a/www/p5-CGI-Cache/pkg-plist
+++ b/www/p5-CGI-Cache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Cache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Cache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Cache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/Cache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 1ce8c00c8604..7ed3d66d1ba7 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl module for manage templates and parses templates
PERL_CONFIGURE= yes
MAN3= CGI::FastTemplate.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-CGI-FastTemplate/pkg-plist b/www/p5-CGI-FastTemplate/pkg-plist
index 32ac44477343..ea8c2e2f26fc 100644
--- a/www/p5-CGI-FastTemplate/pkg-plist
+++ b/www/p5-CGI-FastTemplate/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/FastTemplate.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/FastTemplate/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/FastTemplate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/FastTemplate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-Minimal/pkg-plist b/www/p5-CGI-Minimal/pkg-plist
index 45ca7bba894c..b23541379d53 100644
--- a/www/p5-CGI-Minimal/pkg-plist
+++ b/www/p5-CGI-Minimal/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Minimal/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Minimal.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Minimal.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Minimal
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal/.packlist
+%%SITE_PERL%%/CGI/Minimal.pm
+%%SITE_PERL%%/CGI/Minimal.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrm %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index 616d996267f7..6a0d92773ab7 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -36,7 +36,7 @@ MAN3= CGI::Session::DB_File.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
RUN_DEPENDS= ${BUILD_DEPENDS}
.endif
diff --git a/www/p5-CGI-Session/pkg-plist b/www/p5-CGI-Session/pkg-plist
index 0f0abf5a4256..ab2478d76d05 100644
--- a/www/p5-CGI-Session/pkg-plist
+++ b/www/p5-CGI-Session/pkg-plist
@@ -1,47 +1,47 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/BluePrint.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/PostgreSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Tutorial.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/CookBook.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Serialize/FreezeThaw.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Serialize/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Serialize/Storable.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Serialize
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/ID/Incr.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/ID/MD5.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/ID/SHA1.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/ID
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/DB_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/Example.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/remote_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/errstr.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/expire.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/_time_alias.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/name.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/header.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/sync_param.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/close.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/expires.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/ctime.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/atime.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/param_hashref.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/save_param.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/load_param.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/clear.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/error.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/delete.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/is_new.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/version.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/dump.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Session/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI/Session
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/CGI/Session 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/CGI 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Session
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/CGI 2>/dev/null || true
+%%SITE_PERL%%/CGI/Session/BluePrint.pm
+%%SITE_PERL%%/CGI/Session/PostgreSQL.pm
+%%SITE_PERL%%/CGI/Session/Tutorial.pm
+%%SITE_PERL%%/CGI/Session/CookBook.pm
+%%SITE_PERL%%/CGI/Session/Serialize/FreezeThaw.pm
+%%SITE_PERL%%/CGI/Session/Serialize/Default.pm
+%%SITE_PERL%%/CGI/Session/Serialize/Storable.pm
+@dirrm %%SITE_PERL%%/CGI/Session/Serialize
+%%SITE_PERL%%/CGI/Session/ID/Incr.pm
+%%SITE_PERL%%/CGI/Session/ID/MD5.pm
+%%SITE_PERL%%/CGI/Session/ID/SHA1.pm
+@dirrm %%SITE_PERL%%/CGI/Session/ID
+%%SITE_PERL%%/CGI/Session/DB_File.pm
+%%SITE_PERL%%/CGI/Session/Example.pm
+%%SITE_PERL%%/CGI/Session/MySQL.pm
+%%SITE_PERL%%/CGI/Session/File.pm
+%%SITE_PERL%%/CGI/Session.pm
+%%SITE_PERL%%/auto/CGI/Session/remote_addr.al
+%%SITE_PERL%%/auto/CGI/Session/errstr.al
+%%SITE_PERL%%/auto/CGI/Session/expire.al
+%%SITE_PERL%%/auto/CGI/Session/_time_alias.al
+%%SITE_PERL%%/auto/CGI/Session/name.al
+%%SITE_PERL%%/auto/CGI/Session/header.al
+%%SITE_PERL%%/auto/CGI/Session/sync_param.al
+%%SITE_PERL%%/auto/CGI/Session/close.al
+%%SITE_PERL%%/auto/CGI/Session/expires.al
+%%SITE_PERL%%/auto/CGI/Session/ctime.al
+%%SITE_PERL%%/auto/CGI/Session/atime.al
+%%SITE_PERL%%/auto/CGI/Session/param_hashref.al
+%%SITE_PERL%%/auto/CGI/Session/save_param.al
+%%SITE_PERL%%/auto/CGI/Session/load_param.al
+%%SITE_PERL%%/auto/CGI/Session/clear.al
+%%SITE_PERL%%/auto/CGI/Session/error.al
+%%SITE_PERL%%/auto/CGI/Session/delete.al
+%%SITE_PERL%%/auto/CGI/Session/is_new.al
+%%SITE_PERL%%/auto/CGI/Session/version.al
+%%SITE_PERL%%/auto/CGI/Session/dump.al
+%%SITE_PERL%%/auto/CGI/Session/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/.packlist
+@dirrm %%SITE_PERL%%/CGI/Session
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/auto/CGI/Session
+@unexec rmdir %D/%%SITE_PERL%%/auto/CGI/Session 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/CGI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/mach/auto/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-SpeedyCGI/pkg-plist b/www/p5-CGI-SpeedyCGI/pkg-plist
index 1ecddc1b1222..8d801eec2dfb 100644
--- a/www/p5-CGI-SpeedyCGI/pkg-plist
+++ b/www/p5-CGI-SpeedyCGI/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/CGI/SpeedyCGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist
+%%SITE_PERL%%/CGI/SpeedyCGI.pm
bin/speedy
bin/speedy_backend
bin/speedy_suid
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-Upload/Makefile b/www/p5-CGI-Upload/Makefile
index 64bcefe24f02..baeab954c0a8 100644
--- a/www/p5-CGI-Upload/Makefile
+++ b/www/p5-CGI-Upload/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports-freebsd@FreeBSDsecurity.com
COMMENT= CGI class for handling browser file uploads
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/BrowserDetect.pm:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
+BUILD_DEPENDS= ${SITE_PERL}/HTTP/BrowserDetect.pm:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
+ ${SITE_PERL}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
PERL_CONFIGURE= yes
MAN3= CGI::Upload.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-CGI-Upload/pkg-plist b/www/p5-CGI-Upload/pkg-plist
index c819cef38beb..c803b8e5128d 100644
--- a/www/p5-CGI-Upload/pkg-plist
+++ b/www/p5-CGI-Upload/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Upload.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Upload
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist
+%%SITE_PERL%%/CGI/Upload.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload
+@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 7df0a8ca1a47..088a72167643 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Modules for perl5, for use in writing CGI scripts
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
PERL_CONFIGURE= yes
MAN3= CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
CGI::MiniSvr.3 CGI::Request.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
@${RM} ${WRKSRC}/CGI/*.orig
diff --git a/www/p5-CGI-modules/pkg-plist b/www/p5-CGI-modules/pkg-plist
index 822174c9c235..949636b3fa66 100644
--- a/www/p5-CGI-modules/pkg-plist
+++ b/www/p5-CGI-modules/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/BasePlus.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Carp.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Form.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/MiniSvr.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Request.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI
+%%SITE_PERL%%/CGI/Base.pm
+%%SITE_PERL%%/CGI/BasePlus.pm
+%%SITE_PERL%%/CGI/Carp.pm
+%%SITE_PERL%%/CGI/Form.pm
+%%SITE_PERL%%/CGI/MiniSvr.pm
+%%SITE_PERL%%/CGI/Request.pm
+%%SITE_PERL%%/CGI/test.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrm %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index 8738a1d1cf14..bc6d2cb97d0a 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -26,8 +26,8 @@ MAN3= CGI.3 CGI::Apache.3 CGI::Carp.3 CGI::Cookie.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
.endif
.include <bsd.port.post.mk>
diff --git a/www/p5-FastCGI/Makefile b/www/p5-FastCGI/Makefile
index bc1a8a7b14fb..7c02319a66f4 100644
--- a/www/p5-FastCGI/Makefile
+++ b/www/p5-FastCGI/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= fcgi.0:${PORTSDIR}/www/fcgi
PERL_CONFIGURE= yes
CONFIGURE_ARGS+= --use-installed=${LOCALBASE}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= FCGI.3
.include <bsd.port.mk>
diff --git a/www/p5-FastCGI/pkg-plist b/www/p5-FastCGI/pkg-plist
index 4c1360cc6da0..493244a5fffc 100644
--- a/www/p5-FastCGI/pkg-plist
+++ b/www/p5-FastCGI/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/FCGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FCGI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FCGI/FCGI.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FCGI/FCGI.bs
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FCGI
+%%SITE_PERL%%/%%PERL_ARCH%%/FCGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/FCGI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/FCGI.bs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
diff --git a/www/p5-GtkHTML/Makefile b/www/p5-GtkHTML/Makefile
index 94ec7663e81c..f7de913d3d4b 100644
--- a/www/p5-GtkHTML/Makefile
+++ b/www/p5-GtkHTML/Makefile
@@ -17,8 +17,8 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Gtk HTML module of Gtk-Perl
-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}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
+ ${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= gnomeprefix gtkhtml
diff --git a/www/p5-GtkHTML/pkg-plist b/www/p5-GtkHTML/pkg-plist
index ccd114247624..7b6d6232977e 100644
--- a/www/p5-GtkHTML/pkg-plist
+++ b/www/p5-GtkHTML/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/GtkHTMLDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/GtkHTMLTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/PerlGtkHTMLInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/HTML/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/HTML/HTML.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/HTML/HTML.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/HTML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/HTML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/GtkHTMLDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/GtkHTMLTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/PerlGtkHTMLInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Simple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/HTML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/HTML/HTML.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/HTML/HTML.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/HTML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/HTML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
diff --git a/www/p5-HTML-CalendarMonthSimple/Makefile b/www/p5-HTML-CalendarMonthSimple/Makefile
index 165dd45faa01..57c869a6942c 100644
--- a/www/p5-HTML-CalendarMonthSimple/Makefile
+++ b/www/p5-HTML-CalendarMonthSimple/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= HTML::CalendarMonthSimple - Perl Module for Generating HTML Calendars
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-CalendarMonthSimple/pkg-plist b/www/p5-HTML-CalendarMonthSimple/pkg-plist
index f528846c8880..e2e10efe7ca1 100644
--- a/www/p5-HTML-CalendarMonthSimple/pkg-plist
+++ b/www/p5-HTML-CalendarMonthSimple/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/CalendarMonthSimple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/CalendarMonthSimple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Clean/pkg-plist b/www/p5-HTML-Clean/pkg-plist
index d159c6df1c52..e31ee7128e86 100644
--- a/www/p5-HTML-Clean/pkg-plist
+++ b/www/p5-HTML-Clean/pkg-plist
@@ -1,10 +1,10 @@
bin/htmlclean
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Clean.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Clean/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Clean
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/auto/HTML/Clean/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTML/Clean
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Clean.pm
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/auto/HTML/Clean/autosplit.ix
+@dirrm %%SITE_PERL%%/auto/HTML/Clean
+@unexec rmdir %D/%%SITE_PERL%%/auto/HTML 2>/dev/null || true
@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true
diff --git a/www/p5-HTML-Element-Extended/Makefile b/www/p5-HTML-Element-Extended/Makefile
index 39aee007db12..3585f4b0ae3f 100644
--- a/www/p5-HTML-Element-Extended/Makefile
+++ b/www/p5-HTML-Element-Extended/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= wollman@FreeBSD.org
COMMENT= An extended interface to HTML::Tree's HTML::Element class
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS= ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Element-Extended/pkg-plist b/www/p5-HTML-Element-Extended/pkg-plist
index e48663877f64..b0e1579763cf 100644
--- a/www/p5-HTML-Element-Extended/pkg-plist
+++ b/www/p5-HTML-Element-Extended/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/ElementGlob.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/ElementRaw.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/ElementSuper.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/ElementTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Element-Extended/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Element-Extended
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/ElementGlob.pm
+%%SITE_PERL%%/HTML/ElementRaw.pm
+%%SITE_PERL%%/HTML/ElementSuper.pm
+%%SITE_PERL%%/HTML/ElementTable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 730d43e31fdf..7652d81d776d 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -16,9 +16,9 @@ MAINTAINER= kapr@crosswinds.net
COMMENT= A module to allow embedded perl in HTML documents
.if !defined(WITHOUT_APACHE)
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
.endif
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Embperl/pkg-plist b/www/p5-HTML-Embperl/pkg-plist
index 2a0403d858ba..e5ed0fd0569c 100644
--- a/www/p5-HTML-Embperl/pkg-plist
+++ b/www/p5-HTML-Embperl/pkg-plist
@@ -1,24 +1,24 @@
bin/embpexec.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Faq.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Features.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/FeaturesD.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Intro.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/IntroD.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Mail.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Module.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/TipsAndTricks.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/embpcgi.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/epocgi.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/EmbperlD.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/EmbperlObject.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/IntroEmbperlObject.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Faq.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Features.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/FeaturesD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Intro.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/IntroD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Mail.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Module.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Session.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/TipsAndTricks.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/embpcgi.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/epocgi.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/EmbperlD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/EmbperlObject.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/IntroEmbperlObject.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-FromText/Makefile b/www/p5-HTML-FromText/Makefile
index 5d31d1949ad6..770fd9f20d90 100644
--- a/www/p5-HTML-FromText/Makefile
+++ b/www/p5-HTML-FromText/Makefile
@@ -18,6 +18,5 @@ COMMENT= Mark up text as HTML
PERL_CONFIGURE= yes
MAN3= HTML::FromText.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTML-FromText/pkg-plist b/www/p5-HTML-FromText/pkg-plist
index 8a004a100859..320aed257482 100644
--- a/www/p5-HTML-FromText/pkg-plist
+++ b/www/p5-HTML-FromText/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
-lib/perl5/site_perl/%%PERL_VER%%/HTML/FromText.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/FromText/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/FromText 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/FromText.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Navigation/Makefile b/www/p5-HTML-Navigation/Makefile
index 96748c168622..8b1b0859ed8e 100644
--- a/www/p5-HTML-Navigation/Makefile
+++ b/www/p5-HTML-Navigation/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/CGI/Base.pm:${PORTSDIR}/www/p5-CGI-modules \
${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
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= HTML::Navigation.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Navigation/pkg-plist b/www/p5-HTML-Navigation/pkg-plist
index c4dbb0c60e0a..b66c9151f1aa 100644
--- a/www/p5-HTML-Navigation/pkg-plist
+++ b/www/p5-HTML-Navigation/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Navigation.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Navigation/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Navigation
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Navigation.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Navigation/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Navigation
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index 2915e28ec65e..83a3de3d18c1 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -18,10 +18,9 @@ COMMENT= Perl module for handling CGI HTML paging of arbitrary data
BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
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= HTML::Pager.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Pager/pkg-plist b/www/p5-HTML-Pager/pkg-plist
index 3bac259f1145..fa21cd92f3dc 100644
--- a/www/p5-HTML-Pager/pkg-plist
+++ b/www/p5-HTML-Pager/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Pager.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Pager/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Pager
+%%SITE_PERL%%/HTML/Pager.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Pager/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Pager
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index f5d30ae3c080..2eb747ad276c 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -18,6 +18,5 @@ COMMENT= A simple and fast HTML syntax checking package for perl 4 and perl 5
PERL_CONFIGURE= yes
MAN3= HTML::QuickCheck.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTML-QuickCheck/pkg-plist b/www/p5-HTML-QuickCheck/pkg-plist
index 90c625da34c6..abef439bded9 100644
--- a/www/p5-HTML-QuickCheck/pkg-plist
+++ b/www/p5-HTML-QuickCheck/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/QuickCheck.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/QuickCheck/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/QuickCheck
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/QuickCheck.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-SimpleParse/Makefile b/www/p5-HTML-SimpleParse/Makefile
index b4e4114fda41..4ee3ca3bfe3d 100644
--- a/www/p5-HTML-SimpleParse/Makefile
+++ b/www/p5-HTML-SimpleParse/Makefile
@@ -17,7 +17,6 @@ COMMENT= HTML::SimpleParse - a bare-bones HTML parser
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::SimpleParse.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 1db61c5ac306..eb895b0d3008 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 HTML output stream class, and some markup utilities
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::Stream.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Stream/pkg-plist b/www/p5-HTML-Stream/pkg-plist
index c8f4f4f1d95e..aaffda928919 100644
--- a/www/p5-HTML-Stream/pkg-plist
+++ b/www/p5-HTML-Stream/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Stream.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Stream/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Stream
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Stream.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index bf3aa24b92ad..25516148f56e 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Produces summaries from the textual content of web pages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS= ${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Summary/pkg-plist b/www/p5-HTML-Summary/pkg-plist
index 89d8227ba5fe..43a4c01c56d8 100644
--- a/www/p5-HTML-Summary/pkg-plist
+++ b/www/p5-HTML-Summary/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Summary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/Sentence.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/JA/Jcode.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/JA/Jtruncate.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Summary/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Summary
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua/JA
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Summary.pm
+%%SITE_PERL%%/Text/Sentence.pm
+%%SITE_PERL%%/Lingua/JA/Jcode.pm
+%%SITE_PERL%%/Lingua/JA/Jtruncate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Summary/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Summary
+@dirrm %%SITE_PERL%%/Lingua/JA
+@dirrm %%SITE_PERL%%/Lingua
+@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Table/pkg-plist b/www/p5-HTML-Table/pkg-plist
index 6a90ccda5c94..c9313f4af599 100644
--- a/www/p5-HTML-Table/pkg-plist
+++ b/www/p5-HTML-Table/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Table/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Table
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Table.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index d323ca6f74da..c1aab4a842b2 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Extract text contained in tables within an HTML document
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= HTML::TableExtract.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTML-TableExtract/pkg-plist b/www/p5-HTML-TableExtract/pkg-plist
index bbd330f6b124..478c8f3c75c1 100644
--- a/www/p5-HTML-TableExtract/pkg-plist
+++ b/www/p5-HTML-TableExtract/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableExtract.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-TableExtract/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-TableExtract
+%%SITE_PERL%%/HTML/TableExtract.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-TableExtract/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-TableExtract
diff --git a/www/p5-HTML-TableLayout/pkg-plist b/www/p5-HTML-TableLayout/pkg-plist
index 2a0b20b29a6d..cb24d8d16e06 100644
--- a/www/p5-HTML-TableLayout/pkg-plist
+++ b/www/p5-HTML-TableLayout/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout/TLCore.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout/Component.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout/Form.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/TableLayout/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/TableLayout
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/TableLayout
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/TableLayout/TLCore.pm
+%%SITE_PERL%%/HTML/TableLayout/Symbols.pm
+%%SITE_PERL%%/HTML/TableLayout/Component.pm
+%%SITE_PERL%%/HTML/TableLayout/Form.pm
+%%SITE_PERL%%/HTML/TableLayout.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout/.packlist
+@dirrm %%SITE_PERL%%/HTML/TableLayout
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Tagset/pkg-plist b/www/p5-HTML-Tagset/pkg-plist
index f5c34fc1d66e..1da36d193566 100644
--- a/www/p5-HTML-Tagset/pkg-plist
+++ b/www/p5-HTML-Tagset/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tagset.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Tagset/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Tagset
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Tagset.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Template-Associate/Makefile b/www/p5-HTML-Template-Associate/Makefile
index 95f55b8a5960..94ea52ec087b 100644
--- a/www/p5-HTML-Template-Associate/Makefile
+++ b/www/p5-HTML-Template-Associate/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::Template::Associate.3 \
HTML::Template::Associate::FormValidator.3
diff --git a/www/p5-HTML-Template-Expr/Makefile b/www/p5-HTML-Template-Expr/Makefile
index 69b5a2b5c557..48afcc604453 100644
--- a/www/p5-HTML-Template-Expr/Makefile
+++ b/www/p5-HTML-Template-Expr/Makefile
@@ -15,11 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= nork@FreeBSD.org
COMMENT= Perl module to use HTML Templates which allows expressions
-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}
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+RUN_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
+ ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
+ ${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Template-Expr/pkg-plist b/www/p5-HTML-Template-Expr/pkg-plist
index 37bbdac100f6..e95da97a3f45 100644
--- a/www/p5-HTML-Template-Expr/pkg-plist
+++ b/www/p5-HTML-Template-Expr/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Template/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template/Expr/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template/Expr 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Template/Expr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Template/pkg-plist b/www/p5-HTML-Template/pkg-plist
index 498fa08e680f..0d7c0878a683 100644
--- a/www/p5-HTML-Template/pkg-plist
+++ b/www/p5-HTML-Template/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Template
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Template.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 442f35ad4dbe..aa945ba946f7 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= A collection of modules to manupulate HTML syntax trees
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Tree/pkg-plist b/www/p5-HTML-Tree/pkg-plist
index bc9fbcfc8186..bd7ab6577d15 100644
--- a/www/p5-HTML-Tree/pkg-plist
+++ b/www/p5-HTML-Tree/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/AsSubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Element.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Parse.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/TreeBuilder.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Element/traverse.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree/AboutObjects.pod
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree/AboutTrees.pod
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree/Scanning.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Tree/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML-Tree
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Element
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Tree
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/AsSubs.pm
+%%SITE_PERL%%/HTML/Element.pm
+%%SITE_PERL%%/HTML/Parse.pm
+%%SITE_PERL%%/HTML/TreeBuilder.pm
+%%SITE_PERL%%/HTML/Element/traverse.pm
+%%SITE_PERL%%/HTML/Tree.pm
+%%SITE_PERL%%/HTML/Tree/AboutObjects.pod
+%%SITE_PERL%%/HTML/Tree/AboutTrees.pod
+%%SITE_PERL%%/HTML/Tree/Scanning.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Tree/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Tree
+@dirrm %%SITE_PERL%%/HTML/Element
+@dirrm %%SITE_PERL%%/HTML/Tree
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML-Webmake/Makefile b/www/p5-HTML-Webmake/Makefile
index 08b20aa819ce..2cb388148c1a 100644
--- a/www/p5-HTML-Webmake/Makefile
+++ b/www/p5-HTML-Webmake/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jkoshy@FreeBSD.org
COMMENT= A simple perl based website content management system
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/EtText.pm:${PORTSDIR}/textproc/p5-Text-EtText \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+ ${SITE_PERL}/Text/EtText.pm:${PORTSDIR}/textproc/p5-Text-EtText \
+ ${SITE_PERL}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Webmake/pkg-plist b/www/p5-HTML-Webmake/pkg-plist
index 7b09356d4d3d..a7f977acc5a5 100644
--- a/www/p5-HTML-Webmake/pkg-plist
+++ b/www/p5-HTML-Webmake/pkg-plist
@@ -1,66 +1,66 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/editbuttons.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/safe_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/thumbnail_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/rssbox.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/DownloadTag.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/sitetree.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/wwwtable_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/csvtable_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/dump_vars.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/download_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/SiteTree.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/navtree.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/xsl.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/lang_tag.wmk
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/CSVTableTag.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/NavTree.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib/ThumbnailTag.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/SubstCtx.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGIGlue.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Metadata.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlCodeLibrary.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Main.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSourceBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSource.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/MSHTMLtoHTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlCode.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/HTMLCleaner.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/CGIBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/Del.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/RWMetaTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/Dir.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/EditFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/Edit.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/CVS.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/EditBlock.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/Site.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI/FindWmkf.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Out.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Content.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/MediaContent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/MetadataContent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Media.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/NormalContent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/WMLinkGlossary.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/SiteCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/FormatConvert.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/UserTags.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Contents.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/WmkFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/MetaTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/SiteMap.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSources/DirOfFiles.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSources/SVFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/WebMake/.packlist
+%%SITE_PERL%%/HTML/WebMake/PerlLib/editbuttons.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/safe_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/thumbnail_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/rssbox.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/DownloadTag.pm
+%%SITE_PERL%%/HTML/WebMake/PerlLib/sitetree.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/wwwtable_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/csvtable_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/dump_vars.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/download_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/SiteTree.pm
+%%SITE_PERL%%/HTML/WebMake/PerlLib/navtree.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/xsl.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/lang_tag.wmk
+%%SITE_PERL%%/HTML/WebMake/PerlLib/CSVTableTag.pm
+%%SITE_PERL%%/HTML/WebMake/PerlLib/NavTree.pm
+%%SITE_PERL%%/HTML/WebMake/PerlLib/ThumbnailTag.pm
+%%SITE_PERL%%/HTML/WebMake/SubstCtx.pm
+%%SITE_PERL%%/HTML/WebMake/CGIGlue.pm
+%%SITE_PERL%%/HTML/WebMake/Metadata.pm
+%%SITE_PERL%%/HTML/WebMake/PerlCodeLibrary.pm
+%%SITE_PERL%%/HTML/WebMake/Main.pm
+%%SITE_PERL%%/HTML/WebMake/DataSourceBase.pm
+%%SITE_PERL%%/HTML/WebMake/DataSource.pm
+%%SITE_PERL%%/HTML/WebMake/MSHTMLtoHTML.pm
+%%SITE_PERL%%/HTML/WebMake/PerlCode.pm
+%%SITE_PERL%%/HTML/WebMake/HTMLCleaner.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/CGIBase.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/Del.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/RWMetaTable.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/Dir.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/EditFile.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/Edit.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/CVS.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/EditBlock.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/Site.pm
+%%SITE_PERL%%/HTML/WebMake/CGI/FindWmkf.pm
+%%SITE_PERL%%/HTML/WebMake/Out.pm
+%%SITE_PERL%%/HTML/WebMake/Content.pm
+%%SITE_PERL%%/HTML/WebMake/MediaContent.pm
+%%SITE_PERL%%/HTML/WebMake/MetadataContent.pm
+%%SITE_PERL%%/HTML/WebMake/Media.pm
+%%SITE_PERL%%/HTML/WebMake/File.pm
+%%SITE_PERL%%/HTML/WebMake/NormalContent.pm
+%%SITE_PERL%%/HTML/WebMake/WMLinkGlossary.pm
+%%SITE_PERL%%/HTML/WebMake/SiteCache.pm
+%%SITE_PERL%%/HTML/WebMake/FormatConvert.pm
+%%SITE_PERL%%/HTML/WebMake/UserTags.pm
+%%SITE_PERL%%/HTML/WebMake/Contents.pm
+%%SITE_PERL%%/HTML/WebMake/WmkFile.pm
+%%SITE_PERL%%/HTML/WebMake/MetaTable.pm
+%%SITE_PERL%%/HTML/WebMake/SiteMap.pm
+%%SITE_PERL%%/HTML/WebMake/DataSources/DirOfFiles.pm
+%%SITE_PERL%%/HTML/WebMake/DataSources/SVFile.pm
+%%SITE_PERL%%/HTML/WebMake/Util.pm
+%%SITE_PERL%%/HTML/WebMake.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WebMake/.packlist
bin/webmake_cvs_import
bin/webmake
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/CGI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/DataSources
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake/PerlLib
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/WebMake
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/WebMake
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2> /dev/null || true
+@dirrm %%SITE_PERL%%/HTML/WebMake/CGI
+@dirrm %%SITE_PERL%%/HTML/WebMake/DataSources
+@dirrm %%SITE_PERL%%/HTML/WebMake/PerlLib
+@dirrm %%SITE_PERL%%/HTML/WebMake
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WebMake
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2> /dev/null || true
diff --git a/www/p5-HTML-Widgets-SelectLayers/Makefile b/www/p5-HTML-Widgets-SelectLayers/Makefile
index 0bea2cd267cb..51cf38dc1f1c 100644
--- a/www/p5-HTML-Widgets-SelectLayers/Makefile
+++ b/www/p5-HTML-Widgets-SelectLayers/Makefile
@@ -17,7 +17,6 @@ COMMENT= Implements an HTML widget with multiple layers
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTML::Widgets::SelectLayers.3
.include <bsd.port.mk>
diff --git a/www/p5-HTML-Widgets-SelectLayers/pkg-plist b/www/p5-HTML-Widgets-SelectLayers/pkg-plist
index 7ff88bfbca19..c5294704d0f8 100644
--- a/www/p5-HTML-Widgets-SelectLayers/pkg-plist
+++ b/www/p5-HTML-Widgets-SelectLayers/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Widgets/SelectLayers.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Widgets/homepage.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Widgets 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML/Widgets 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Widgets/SelectLayers.pm
+%%SITE_PERL%%/HTML/Widgets/homepage.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML/Widgets 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTML/pkg-plist b/www/p5-HTML/pkg-plist
index daf1ba65f323..390a88d58588 100644
--- a/www/p5-HTML/pkg-plist
+++ b/www/p5-HTML/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/html_base.pod
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/HTML/Base.pm
+%%SITE_PERL%%/html_base.pod
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
diff --git a/www/p5-HTTP-BrowserDetect/pkg-plist b/www/p5-HTTP-BrowserDetect/pkg-plist
index dd73e79cf036..38cb7cc4e558 100644
--- a/www/p5-HTTP-BrowserDetect/pkg-plist
+++ b/www/p5-HTTP-BrowserDetect/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/BrowserDetect.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect/.packlist
+%%SITE_PERL%%/HTTP/BrowserDetect.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect
+@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 78a19f1e64b9..b7f4ce213d33 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Perl interface to the gnome ghttp library
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM \
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTTP-DAV/pkg-plist b/www/p5-HTTP-DAV/pkg-plist
index 57fdb3c08ead..342914b2abc9 100644
--- a/www/p5-HTTP-DAV/pkg-plist
+++ b/www/p5-HTTP-DAV/pkg-plist
@@ -1,13 +1,13 @@
bin/dave
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/DAV/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Comms.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Lock.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/ResourceList.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Response.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV/Utils.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTP/DAV
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/DAV
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/DAV/.packlist
+%%SITE_PERL%%/HTTP/DAV.pm
+%%SITE_PERL%%/HTTP/DAV/Comms.pm
+%%SITE_PERL%%/HTTP/DAV/Lock.pm
+%%SITE_PERL%%/HTTP/DAV/Resource.pm
+%%SITE_PERL%%/HTTP/DAV/ResourceList.pm
+%%SITE_PERL%%/HTTP/DAV/Response.pm
+%%SITE_PERL%%/HTTP/DAV/Utils.pm
+@dirrm %%SITE_PERL%%/HTTP/DAV
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/DAV
+@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
diff --git a/www/p5-HTTP-GHTTP/Makefile b/www/p5-HTTP-GHTTP/Makefile
index 0937acb34e73..b959eef7db1b 100644
--- a/www/p5-HTTP-GHTTP/Makefile
+++ b/www/p5-HTTP-GHTTP/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp
PERL_CONFIGURE= yes
CONFIGURE_ARGS= LIBS="-L${LOCALBASE}/lib -lghttp" INC="-I${LOCALBASE}/include"
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= HTTP::GHTTP.3
.include <bsd.port.mk>
diff --git a/www/p5-HTTP-GHTTP/pkg-plist b/www/p5-HTTP-GHTTP/pkg-plist
index 9132b55e0f7d..1631ac674433 100644
--- a/www/p5-HTTP-GHTTP/pkg-plist
+++ b/www/p5-HTTP-GHTTP/pkg-plist
@@ -1,8 +1,8 @@
bin/g-request
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTP/GHTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/GHTTP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/HTTP/GHTTP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
diff --git a/www/p5-HTTP-MobileAgent/Makefile b/www/p5-HTTP-MobileAgent/Makefile
index 0958e812c8ed..67294b7f4849 100644
--- a/www/p5-HTTP-MobileAgent/Makefile
+++ b/www/p5-HTTP-MobileAgent/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/HTTP/Headers.pm:${PORTSDIR}/www/p5-libwww
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-HTTP-MobileAgent/pkg-plist b/www/p5-HTTP-MobileAgent/pkg-plist
index 5c6f4361ebfa..18882e565d8f 100644
--- a/www/p5-HTTP-MobileAgent/pkg-plist
+++ b/www/p5-HTTP-MobileAgent/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/AirHPhone.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/Display.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/DoCoMo.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/DoCoMoDisplayMap.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/EZweb.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/JPhone.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/NonMobile.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent/Request.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTP/MobileAgent
+%%SITE_PERL%%/HTTP/MobileAgent.pm
+%%SITE_PERL%%/HTTP/MobileAgent/AirHPhone.pm
+%%SITE_PERL%%/HTTP/MobileAgent/Display.pm
+%%SITE_PERL%%/HTTP/MobileAgent/DoCoMo.pm
+%%SITE_PERL%%/HTTP/MobileAgent/DoCoMoDisplayMap.pm
+%%SITE_PERL%%/HTTP/MobileAgent/EZweb.pm
+%%SITE_PERL%%/HTTP/MobileAgent/JPhone.pm
+%%SITE_PERL%%/HTTP/MobileAgent/NonMobile.pm
+%%SITE_PERL%%/HTTP/MobileAgent/Request.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent
+@dirrm %%SITE_PERL%%/HTTP/MobileAgent
diff --git a/www/p5-HTTPD-Log-Filter/Makefile b/www/p5-HTTPD-Log-Filter/Makefile
index 0c72f9d4a9a7..d8ba8bb15334 100644
--- a/www/p5-HTTPD-Log-Filter/Makefile
+++ b/www/p5-HTTPD-Log-Filter/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl module to filter entries out of an httpd log
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib
+BUILD_DEPENDS= ${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib
+RUN_DEPENDS= ${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib
PERL_CONFIGURE= yes
MAN1= exclude_robots.1
diff --git a/www/p5-HTTPD-Log-Filter/pkg-plist b/www/p5-HTTPD-Log-Filter/pkg-plist
index fa264d176cc2..22421ec66487 100644
--- a/www/p5-HTTPD-Log-Filter/pkg-plist
+++ b/www/p5-HTTPD-Log-Filter/pkg-plist
@@ -1,8 +1,8 @@
bin/exclude_robots
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/Log/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD/Log 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD/Log 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
+%%SITE_PERL%%/HTTPD/Log/Filter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter
+@unexec rmdir %D/%%SITE_PERL%%/HTTPD/Log 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index 046df57f1aa4..f4cdc3d5008b 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module for a HTTP server authentication class
PERL_CONFIGURE= yes
MAN3= HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTTPD-Tools/pkg-plist b/www/p5-HTTPD-Tools/pkg-plist
index 0dc8c087be18..7975c095ef3a 100644
--- a/www/p5-HTTPD-Tools/pkg-plist
+++ b/www/p5-HTTPD-Tools/pkg-plist
@@ -1,20 +1,20 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/AdminBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/Authen.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM/apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text/cern.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/DBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/SQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text/cern.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD 2>/dev/null || true
+%%SITE_PERL%%/HTTPD/AdminBase.pm
+%%SITE_PERL%%/HTTPD/Authen.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/DBM.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/DBM/apache.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/Text.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/Text/cern.pm
+%%SITE_PERL%%/HTTPD/UserAdmin.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/DBM.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/SQL.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/Text.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/Text/cern.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
+@dirrm %%SITE_PERL%%/HTTPD/UserAdmin/Text
+@dirrm %%SITE_PERL%%/HTTPD/UserAdmin
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/Text
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/DBM
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-Tools
+@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 046df57f1aa4..f4cdc3d5008b 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module for a HTTP server authentication class
PERL_CONFIGURE= yes
MAN3= HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-HTTPD-User-Manage/pkg-plist b/www/p5-HTTPD-User-Manage/pkg-plist
index 0dc8c087be18..7975c095ef3a 100644
--- a/www/p5-HTTPD-User-Manage/pkg-plist
+++ b/www/p5-HTTPD-User-Manage/pkg-plist
@@ -1,20 +1,20 @@
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/AdminBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/Authen.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM/apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text/cern.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/DBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/SQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text/cern.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD 2>/dev/null || true
+%%SITE_PERL%%/HTTPD/AdminBase.pm
+%%SITE_PERL%%/HTTPD/Authen.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/DBM.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/DBM/apache.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/Text.pm
+%%SITE_PERL%%/HTTPD/GroupAdmin/Text/cern.pm
+%%SITE_PERL%%/HTTPD/UserAdmin.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/DBM.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/SQL.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/Text.pm
+%%SITE_PERL%%/HTTPD/UserAdmin/Text/cern.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
+@dirrm %%SITE_PERL%%/HTTPD/UserAdmin/Text
+@dirrm %%SITE_PERL%%/HTTPD/UserAdmin
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/Text
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/DBM
+@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-Tools
+@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true
diff --git a/www/p5-MasonX-Request-WithApacheSession/pkg-plist b/www/p5-MasonX-Request-WithApacheSession/pkg-plist
index e0ad7cf46cab..0d7ddafb783e 100644
--- a/www/p5-MasonX-Request-WithApacheSession/pkg-plist
+++ b/www/p5-MasonX-Request-WithApacheSession/pkg-plist
@@ -5,4 +5,4 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX
@dirrm %%SITE_PERL%%/MasonX/Request
@dirrm %%SITE_PERL%%/MasonX
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MasonX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 3891dad3b39c..017cee345a10 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -17,9 +17,9 @@ DISTNAME= ParallelUserAgent-${PORTVERSION}
MAINTAINER= ache@FreeBSD.org
COMMENT= Perl5 Parallel LWP User Agent for WWW access
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-ParallelUA/pkg-plist b/www/p5-ParallelUA/pkg-plist
index bc4930413dd2..d122d0cc841f 100644
--- a/www/p5-ParallelUA/pkg-plist
+++ b/www/p5-ParallelUA/pkg-plist
@@ -1,18 +1,18 @@
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/ParallelUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol/file.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol/ftp.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol/http.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol/https.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/RobotUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/ParallelUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/RobotPUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LWP/Parallel/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel/Protocol
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP/Parallel
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LWP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LWP/Parallel
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LWP
+%%SITE_PERL%%/Bundle/ParallelUA.pm
+%%SITE_PERL%%/LWP/Parallel.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol/file.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol/ftp.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol/http.pm
+%%SITE_PERL%%/LWP/Parallel/Protocol/https.pm
+%%SITE_PERL%%/LWP/Parallel/RobotUA.pm
+%%SITE_PERL%%/LWP/Parallel/UserAgent.pm
+%%SITE_PERL%%/LWP/ParallelUA.pm
+%%SITE_PERL%%/LWP/RobotPUA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel/.packlist
+@dirrm %%SITE_PERL%%/LWP/Parallel/Protocol
+@dirrm %%SITE_PERL%%/LWP/Parallel
+@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
diff --git a/www/p5-Sledge-Plugin-CacheContent/Makefile b/www/p5-Sledge-Plugin-CacheContent/Makefile
index b2bbff1048d2..98c9bba26f8c 100644
--- a/www/p5-Sledge-Plugin-CacheContent/Makefile
+++ b/www/p5-Sledge-Plugin-CacheContent/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-CacheContent/pkg-plist b/www/p5-Sledge-Plugin-CacheContent/pkg-plist
index 6451b49a9ec7..922c52e92033 100644
--- a/www/p5-Sledge-Plugin-CacheContent/pkg-plist
+++ b/www/p5-Sledge-Plugin-CacheContent/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/CacheContent.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/CacheContent.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-Download/Makefile b/www/p5-Sledge-Plugin-Download/Makefile
index b7b382566682..836bb04f1c71 100644
--- a/www/p5-Sledge-Plugin-Download/Makefile
+++ b/www/p5-Sledge-Plugin-Download/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-Download/pkg-plist b/www/p5-Sledge-Plugin-Download/pkg-plist
index 34030d926160..038c9a8203a2 100644
--- a/www/p5-Sledge-Plugin-Download/pkg-plist
+++ b/www/p5-Sledge-Plugin-Download/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/Download.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/Download.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-Dumper/Makefile b/www/p5-Sledge-Plugin-Dumper/Makefile
index 5c3da5e3604d..aa79cbb282a7 100644
--- a/www/p5-Sledge-Plugin-Dumper/Makefile
+++ b/www/p5-Sledge-Plugin-Dumper/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-Dumper/pkg-plist b/www/p5-Sledge-Plugin-Dumper/pkg-plist
index 6f7ac77c6fdb..a6bb543299ca 100644
--- a/www/p5-Sledge-Plugin-Dumper/pkg-plist
+++ b/www/p5-Sledge-Plugin-Dumper/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/Dumper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/Dumper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-HTML2HDML/Makefile b/www/p5-Sledge-Plugin-HTML2HDML/Makefile
index eb5670e2ce13..c7445ad863ff 100644
--- a/www/p5-Sledge-Plugin-HTML2HDML/Makefile
+++ b/www/p5-Sledge-Plugin-HTML2HDML/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PM_DEPENDS} \
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
PM_DEPENDS+= ${SITE_PERL}/HTTP/MobileAgent.pm:${PORTSDIR}/www/p5-HTTP-MobileAgent
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist b/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
index 2ab41e77d45e..84e0ccc50f31 100644
--- a/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
+++ b/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/HTML2HDML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/HTML2HDML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-Log/Makefile b/www/p5-Sledge-Plugin-Log/Makefile
index a680e858e780..36cdeef4a544 100644
--- a/www/p5-Sledge-Plugin-Log/Makefile
+++ b/www/p5-Sledge-Plugin-Log/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
PM_DEPENDS+= ${SITE_PERL}/Log/Dispatch/Config.pm:${PORTSDIR}/devel/p5-Log-Dispatch-Config
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-Log/pkg-plist b/www/p5-Sledge-Plugin-Log/pkg-plist
index 3a9159fe1e13..dabfc3739f93 100644
--- a/www/p5-Sledge-Plugin-Log/pkg-plist
+++ b/www/p5-Sledge-Plugin-Log/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/Log.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-NoCache/Makefile b/www/p5-Sledge-Plugin-NoCache/Makefile
index 35473af9a5da..9321194a1a26 100644
--- a/www/p5-Sledge-Plugin-NoCache/Makefile
+++ b/www/p5-Sledge-Plugin-NoCache/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-NoCache/pkg-plist b/www/p5-Sledge-Plugin-NoCache/pkg-plist
index de726c596da5..fa4a5d85fb8a 100644
--- a/www/p5-Sledge-Plugin-NoCache/pkg-plist
+++ b/www/p5-Sledge-Plugin-NoCache/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/NoCache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/NoCache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-SaveUpload/Makefile b/www/p5-Sledge-Plugin-SaveUpload/Makefile
index 740f2f470a16..fe097dd60dce 100644
--- a/www/p5-Sledge-Plugin-SaveUpload/Makefile
+++ b/www/p5-Sledge-Plugin-SaveUpload/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-SaveUpload/pkg-plist b/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
index 81de994830eb..7ebb314b2957 100644
--- a/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
+++ b/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/SaveUpload.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/SaveUpload.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-ScratchPad/Makefile b/www/p5-Sledge-Plugin-ScratchPad/Makefile
index 25be14493ce7..a7a0d9c8c4ed 100644
--- a/www/p5-Sledge-Plugin-ScratchPad/Makefile
+++ b/www/p5-Sledge-Plugin-ScratchPad/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-ScratchPad/pkg-plist b/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
index cc860276c7b0..dc0fd60a2002 100644
--- a/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
+++ b/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/ScratchPad.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/ScratchPad.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile b/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
index 8742d861e04d..875443e06ac4 100644
--- a/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
+++ b/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist b/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
index 6c6448e39971..a3e59ed4fd6e 100644
--- a/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
+++ b/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/SessionAutoCleanup.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/SessionAutoCleanup.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-Plugin-XSLT/Makefile b/www/p5-Sledge-Plugin-XSLT/Makefile
index 2c74f74ed548..43d6957b23bc 100644
--- a/www/p5-Sledge-Plugin-XSLT/Makefile
+++ b/www/p5-Sledge-Plugin-XSLT/Makefile
@@ -22,7 +22,7 @@ PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Plugin-XSLT/pkg-plist b/www/p5-Sledge-Plugin-XSLT/pkg-plist
index ad303e9b7f22..9c72b38b119f 100644
--- a/www/p5-Sledge-Plugin-XSLT/pkg-plist
+++ b/www/p5-Sledge-Plugin-XSLT/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin/XSLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Plugin 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Plugin/XSLT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
diff --git a/www/p5-Sledge-SessionManager-CookieStore/Makefile b/www/p5-Sledge-SessionManager-CookieStore/Makefile
index 355d6001a399..b89dabfa9e74 100644
--- a/www/p5-Sledge-SessionManager-CookieStore/Makefile
+++ b/www/p5-Sledge-SessionManager-CookieStore/Makefile
@@ -23,7 +23,7 @@ PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5
PM_DEPENDS+= ${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC
PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-SessionManager-CookieStore/pkg-plist b/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
index 5f1d64a34309..659fec08334b 100644
--- a/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
+++ b/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager/CookieStore.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/SessionManager 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager 2>/dev/null || true
+%%SITE_PERL%%/Sledge/SessionManager/CookieStore.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/SessionManager 2>/dev/null || true
diff --git a/www/p5-Sledge-Template-Expr/Makefile b/www/p5-Sledge-Template-Expr/Makefile
index 88e5027ca5d7..6f19717df7eb 100644
--- a/www/p5-Sledge-Template-Expr/Makefile
+++ b/www/p5-Sledge-Template-Expr/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
PM_DEPENDS+= ${SITE_PERL}/HTML/Template/Expr.pm:${PORTSDIR}/www/p5-HTML-Template-Expr
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge-Template-Expr/pkg-plist b/www/p5-Sledge-Template-Expr/pkg-plist
index c025181d689f..db87ea04f737 100644
--- a/www/p5-Sledge-Template-Expr/pkg-plist
+++ b/www/p5-Sledge-Template-Expr/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template/Expr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/Template 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template 2>/dev/null || true
+%%SITE_PERL%%/Sledge/Template/Expr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Sledge/Template 2>/dev/null || true
diff --git a/www/p5-Sledge/Makefile b/www/p5-Sledge/Makefile
index 67cb9e2b3c0f..7550d6a7c86d 100644
--- a/www/p5-Sledge/Makefile
+++ b/www/p5-Sledge/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PM_DEPENDS}
PM_DEPENDS= ${SITE_PERL}/Bundle/Sledge.pm:${PORTSDIR}/www/p5-Bundle-Sledge
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
diff --git a/www/p5-Sledge/pkg-plist b/www/p5-Sledge/pkg-plist
index a3d4d4a1c825..4b512a3422b5 100644
--- a/www/p5-Sledge/pkg-plist
+++ b/www/p5-Sledge/pkg-plist
@@ -1,50 +1,50 @@
bin/sledge-setup
-lib/perl5/site_perl/%%PERL_VER%%/Sledge.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Authorizer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Authorizer/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset/Shift_JIS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc/FAQ.pod
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc/Hooks.pod
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc/Install.pod
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc/Tutorial.pod
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Exceptions.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/FillInForm.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Install.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Install/Stub.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages/CGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages/Compat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Registrar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Request/CGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Request/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Request/Upload.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session/MySQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session/Pg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session/SQLite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager/Rewrite.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager/StickyQuery.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template/TT.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sledge
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Template
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/SessionManager
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Session
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Request
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Pages
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Doc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Charset
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge/Authorizer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Sledge
+%%SITE_PERL%%/Sledge.pm
+%%SITE_PERL%%/Sledge/Authorizer.pm
+%%SITE_PERL%%/Sledge/Authorizer/Null.pm
+%%SITE_PERL%%/Sledge/Charset.pm
+%%SITE_PERL%%/Sledge/Charset/Default.pm
+%%SITE_PERL%%/Sledge/Charset/Null.pm
+%%SITE_PERL%%/Sledge/Charset/Shift_JIS.pm
+%%SITE_PERL%%/Sledge/Config.pm
+%%SITE_PERL%%/Sledge/Constants.pm
+%%SITE_PERL%%/Sledge/Doc/FAQ.pod
+%%SITE_PERL%%/Sledge/Doc/Hooks.pod
+%%SITE_PERL%%/Sledge/Doc/Install.pod
+%%SITE_PERL%%/Sledge/Doc/Tutorial.pod
+%%SITE_PERL%%/Sledge/Exception.pm
+%%SITE_PERL%%/Sledge/Exceptions.pm
+%%SITE_PERL%%/Sledge/FillInForm.pm
+%%SITE_PERL%%/Sledge/Install.pm
+%%SITE_PERL%%/Sledge/Install/Stub.pm
+%%SITE_PERL%%/Sledge/Pages/Apache.pm
+%%SITE_PERL%%/Sledge/Pages/Base.pm
+%%SITE_PERL%%/Sledge/Pages/CGI.pm
+%%SITE_PERL%%/Sledge/Pages/Compat.pm
+%%SITE_PERL%%/Sledge/Registrar.pm
+%%SITE_PERL%%/Sledge/Request/CGI.pm
+%%SITE_PERL%%/Sledge/Request/Table.pm
+%%SITE_PERL%%/Sledge/Request/Upload.pm
+%%SITE_PERL%%/Sledge/Session.pm
+%%SITE_PERL%%/Sledge/Session/DBI.pm
+%%SITE_PERL%%/Sledge/Session/MySQL.pm
+%%SITE_PERL%%/Sledge/Session/Pg.pm
+%%SITE_PERL%%/Sledge/Session/SQLite.pm
+%%SITE_PERL%%/Sledge/SessionManager.pm
+%%SITE_PERL%%/Sledge/SessionManager/Cookie.pm
+%%SITE_PERL%%/Sledge/SessionManager/Rewrite.pm
+%%SITE_PERL%%/Sledge/SessionManager/StickyQuery.pm
+%%SITE_PERL%%/Sledge/Template.pm
+%%SITE_PERL%%/Sledge/Template/TT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge
+@dirrm %%SITE_PERL%%/Sledge/Template
+@dirrm %%SITE_PERL%%/Sledge/SessionManager
+@dirrm %%SITE_PERL%%/Sledge/Session
+@dirrm %%SITE_PERL%%/Sledge/Request
+@dirrm %%SITE_PERL%%/Sledge/Pages
+@dirrm %%SITE_PERL%%/Sledge/Install
+@dirrm %%SITE_PERL%%/Sledge/Doc
+@dirrm %%SITE_PERL%%/Sledge/Charset
+@dirrm %%SITE_PERL%%/Sledge/Authorizer
+@dirrm %%SITE_PERL%%/Sledge
diff --git a/www/p5-Template-Plugin-Comma/Makefile b/www/p5-Template-Plugin-Comma/Makefile
index fcff11c70ab3..f1a8c39e0f0c 100644
--- a/www/p5-Template-Plugin-Comma/Makefile
+++ b/www/p5-Template-Plugin-Comma/Makefile
@@ -21,6 +21,5 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Template::Plugin::Comma.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index ddbac095e1a9..7a02d583e62d 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
MASTER_SITE_BACKUP+= http://www.template-toolkit.org/download/
diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist
index 210e3ef501d2..aa12466dc233 100644
--- a/www/p5-Template-Toolkit/pkg-plist
+++ b/www/p5-Template-Toolkit/pkg-plist
@@ -1,92 +1,92 @@
bin/tpage
bin/ttree
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Context.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Directive.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Document.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/FAQ.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Filters.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Grammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Iterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Library/HTML.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Library/PostScript.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Library/Splash.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Config.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Credits.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Directives.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Filters.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Internals.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Intro.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Plugins.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Refs.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Syntax.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/VMethods.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Variables.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual/Views.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Modules.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Namespace/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Autoformat.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/CGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Datafile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Directory.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Dumper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Format.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/area.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/linespoints.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/mixed.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie3d.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/points.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Image.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Polygon.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Align.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Wrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Iterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Pod.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/String.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/URL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/View.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/Wrap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/DOM.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/RSS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/Style.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML/XPath.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugins.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Provider.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Service.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Stash.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Stash/Context.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Stash/XS.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tools/tpage.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tools/ttree.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tutorial.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tutorial/Datafile.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tutorial/Web.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/View.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Template.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Base.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Config.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Context.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Directive.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Document.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Exception.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/FAQ.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Filters.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Grammar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Iterator.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Library/HTML.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Library/PostScript.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Library/Splash.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Config.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Credits.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Directives.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Filters.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Internals.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Intro.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Plugins.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Refs.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Syntax.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/VMethods.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Variables.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual/Views.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Modules.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Namespace/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Autoformat.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/CGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Datafile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Date.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Directory.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Dumper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Filter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Format.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/area.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars3d.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines3d.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/linespoints.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/mixed.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie3d.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/points.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Image.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Polygon.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Align.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Wrap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/HTML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Iterator.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Pod.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/String.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Table.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/URL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/View.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Wrap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/DOM.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/RSS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/Simple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/Style.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/XPath.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugins.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Provider.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Service.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash/Context.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash/XS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Test.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools/tpage.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools/ttree.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial/Datafile.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial/Web.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/View.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.so
share/tt2/docs/README
share/tt2/docs/html/FAQ/FAQ.html
share/tt2/docs/html/FAQ/index.html
@@ -1364,21 +1364,21 @@ share/tt2/templates/splash/tabset
share/tt2/templates/splash/text
share/tt2/templates/splash/ttdotorg
share/tt2/templates/splash/ttpower
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/Stash/XS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template/Stash
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Template
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tools
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Stash
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Library
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Tutorial
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Namespace
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Manual
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/XML
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Text
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin/GD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template/Plugin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Template
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Library
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Namespace
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template
@dirrm share/tt2/docs/html/Tools
@dirrm share/tt2/docs/html/Tutorial
@dirrm share/tt2/docs/html/Library
diff --git a/www/p5-URI-Sequin/Makefile b/www/p5-URI-Sequin/Makefile
index fec65cbc3179..780346b25f01 100644
--- a/www/p5-URI-Sequin/Makefile
+++ b/www/p5-URI-Sequin/Makefile
@@ -18,7 +18,6 @@ COMMENT= Extract information from the URLs of Search-Engines
PERL_CONFIGURE= yes
MAN3= URI::Sequin.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.ifndef (NOPORTDOCS)
post-install:
diff --git a/www/p5-URI-Sequin/pkg-plist b/www/p5-URI-Sequin/pkg-plist
index f5c9464d12be..dbfc90a04ba0 100644
--- a/www/p5-URI-Sequin/pkg-plist
+++ b/www/p5-URI-Sequin/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/Sequin/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin.pm
-%%PORTDOCS%%lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin/examples/example.pl
-%%PORTDOCS%%lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin/examples/ref1.log
-%%PORTDOCS%%lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin/examples/ref2.log
-%%PORTDOCS%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin/examples
-%%PORTDOCS%%@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/Sequin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/Sequin
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/URI 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Sequin/.packlist
+%%SITE_PERL%%/URI/Sequin.pm
+%%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/example.pl
+%%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/ref1.log
+%%PORTDOCS%%%%SITE_PERL%%/URI/Sequin/examples/ref2.log
+%%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin/examples
+%%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Sequin
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
diff --git a/www/p5-WWW-Automate/Makefile b/www/p5-WWW-Automate/Makefile
index 03a98358fdb5..8602309fe47a 100644
--- a/www/p5-WWW-Automate/Makefile
+++ b/www/p5-WWW-Automate/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= WWW::Automate.3
diff --git a/www/p5-WWW-Automate/pkg-plist b/www/p5-WWW-Automate/pkg-plist
index 7c9e801e3852..9246757bb73f 100644
--- a/www/p5-WWW-Automate/pkg-plist
+++ b/www/p5-WWW-Automate/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Automate/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Automate.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Automate
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Automate/.packlist
+%%SITE_PERL%%/WWW/Automate.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Automate
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
diff --git a/www/p5-WWW-IMDb/Makefile b/www/p5-WWW-IMDb/Makefile
index 12a738a27587..a136611f24a9 100644
--- a/www/p5-WWW-IMDb/Makefile
+++ b/www/p5-WWW-IMDb/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= IMDb.3
.include <bsd.port.mk>
diff --git a/www/p5-WWW-IMDb/pkg-plist b/www/p5-WWW-IMDb/pkg-plist
index bd349d038bee..907b1dee6cb1 100644
--- a/www/p5-WWW-IMDb/pkg-plist
+++ b/www/p5-WWW-IMDb/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/IMDb/Title.pm
-lib/perl5/site_perl/%%PERL_VER%%/IMDb/Generique.pm
-lib/perl5/site_perl/%%PERL_VER%%/IMDb/People.pm
-lib/perl5/site_perl/%%PERL_VER%%/IMDb.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMDb/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IMDb
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/IMDb
+%%SITE_PERL%%/IMDb/Title.pm
+%%SITE_PERL%%/IMDb/Generique.pm
+%%SITE_PERL%%/IMDb/People.pm
+%%SITE_PERL%%/IMDb.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDb/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDb
+@dirrm %%SITE_PERL%%/IMDb
diff --git a/www/p5-WWW-Robot/Makefile b/www/p5-WWW-Robot/Makefile
index 6fa3272adad9..a6cf752d7fec 100644
--- a/www/p5-WWW-Robot/Makefile
+++ b/www/p5-WWW-Robot/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
${SITE_PERL}/HTTP/Status.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= WWW::Robot.3
.include <bsd.port.mk>
diff --git a/www/p5-WWW-Robot/pkg-plist b/www/p5-WWW-Robot/pkg-plist
index 7ac63322a5ce..8830191ca0ed 100644
--- a/www/p5-WWW-Robot/pkg-plist
+++ b/www/p5-WWW-Robot/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Robot.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Robot/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Robot
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW 2>/dev/null || true
+%%SITE_PERL%%/WWW/Robot.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
diff --git a/www/p5-WWW-Search-Google/Makefile b/www/p5-WWW-Search-Google/Makefile
index b3df700e7a5d..c2ba343a001c 100644
--- a/www/p5-WWW-Search-Google/Makefile
+++ b/www/p5-WWW-Search-Google/Makefile
@@ -16,9 +16,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Perl WWW::Search class for searching Google
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/WWW/Search.pm:${PORTSDIR}/www/p5-WWW-Search \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Google.pm:${PORTSDIR}/net/p5-Net-Google
+BUILD_DEPENDS= ${SITE_PERL}/WWW/Search.pm:${PORTSDIR}/www/p5-WWW-Search \
+ ${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
+ ${SITE_PERL}/Net/Google.pm:${PORTSDIR}/net/p5-Net-Google
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/www/p5-WWW-Search-Google/pkg-plist b/www/p5-WWW-Search-Google/pkg-plist
index b621dcdfe6aa..d06f7bc143a5 100644
--- a/www/p5-WWW-Search-Google/pkg-plist
+++ b/www/p5-WWW-Search-Google/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Google.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search/Google/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search/Google
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search 2>&1 || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW 2>&1 || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW/Search 2>&1 || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW 2>&1 || true
+%%SITE_PERL%%/WWW/Search/Google.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>&1 || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>&1 || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>&1 || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>&1 || true
diff --git a/www/p5-libservlet/Makefile b/www/p5-libservlet/Makefile
index aad31f28b30c..9d4770c33f0a 100644
--- a/www/p5-libservlet/Makefile
+++ b/www/p5-libservlet/Makefile
@@ -16,12 +16,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Servlet API for Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS= ${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Servlet.3 \
Servlet::Http::Cookie.3 \
Servlet::Http::HttpServlet.3 \
diff --git a/www/p5-libservlet/pkg-plist b/www/p5-libservlet/pkg-plist
index 10cee5fc0cd1..6b53771c815d 100644
--- a/www/p5-libservlet/pkg-plist
+++ b/www/p5-libservlet/pkg-plist
@@ -1,44 +1,44 @@
-lib/perl5/site_perl/%%PERL_VER%%/Servlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSession.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServletRequestWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServletResponse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionEvent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionAttributesListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServletResponseWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpServletRequest.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionBindingEvent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionActivationListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http/HttpSessionBindingListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Util/Event.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Util/Exception.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Util/Principal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/FilterChain.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/FilterConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/GenericServlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/RequestDispatcher.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/Servlet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContext.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContextAttributeEvent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContextAttributeListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContextEvent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletContextListener.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletException.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletInputStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletOutputStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletRequest.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletRequestWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletResponse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/ServletResponseWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/SingleThreadModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/Servlet/UnavailableException.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Servlet/Http
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Servlet/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Servlet
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libservlet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libservlet
+%%SITE_PERL%%/Servlet.pm
+%%SITE_PERL%%/Servlet/Http/HttpSession.pm
+%%SITE_PERL%%/Servlet/Http/HttpServletRequestWrapper.pm
+%%SITE_PERL%%/Servlet/Http/HttpServletResponse.pm
+%%SITE_PERL%%/Servlet/Http/HttpServlet.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionEvent.pm
+%%SITE_PERL%%/Servlet/Http/Cookie.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionAttributesListener.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionListener.pm
+%%SITE_PERL%%/Servlet/Http/HttpServletResponseWrapper.pm
+%%SITE_PERL%%/Servlet/Http/HttpServletRequest.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionBindingEvent.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionActivationListener.pm
+%%SITE_PERL%%/Servlet/Http/HttpSessionBindingListener.pm
+%%SITE_PERL%%/Servlet/Util/Event.pm
+%%SITE_PERL%%/Servlet/Util/Exception.pm
+%%SITE_PERL%%/Servlet/Util/Principal.pm
+%%SITE_PERL%%/Servlet/Config.pm
+%%SITE_PERL%%/Servlet/Filter.pm
+%%SITE_PERL%%/Servlet/FilterChain.pm
+%%SITE_PERL%%/Servlet/FilterConfig.pm
+%%SITE_PERL%%/Servlet/GenericServlet.pm
+%%SITE_PERL%%/Servlet/RequestDispatcher.pm
+%%SITE_PERL%%/Servlet/Servlet.pm
+%%SITE_PERL%%/Servlet/ServletConfig.pm
+%%SITE_PERL%%/Servlet/ServletContext.pm
+%%SITE_PERL%%/Servlet/ServletContextAttributeEvent.pm
+%%SITE_PERL%%/Servlet/ServletContextAttributeListener.pm
+%%SITE_PERL%%/Servlet/ServletContextEvent.pm
+%%SITE_PERL%%/Servlet/ServletContextListener.pm
+%%SITE_PERL%%/Servlet/ServletException.pm
+%%SITE_PERL%%/Servlet/ServletInputStream.pm
+%%SITE_PERL%%/Servlet/ServletOutputStream.pm
+%%SITE_PERL%%/Servlet/ServletRequest.pm
+%%SITE_PERL%%/Servlet/ServletRequestWrapper.pm
+%%SITE_PERL%%/Servlet/ServletResponse.pm
+%%SITE_PERL%%/Servlet/ServletResponseWrapper.pm
+%%SITE_PERL%%/Servlet/SingleThreadModel.pm
+%%SITE_PERL%%/Servlet/UnavailableException.pm
+@dirrm %%SITE_PERL%%/Servlet/Http
+@dirrm %%SITE_PERL%%/Servlet/Util
+@dirrm %%SITE_PERL%%/Servlet
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libservlet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libservlet
diff --git a/www/reportmagic/Makefile b/www/reportmagic/Makefile
index ab5780d45e5a..9ca9ea8c0e07 100644
--- a/www/reportmagic/Makefile
+++ b/www/reportmagic/Makefile
@@ -18,10 +18,10 @@ MAINTAINER= jeremy@external.org
COMMENT= A web site statistics post-processor for Analog
RUN_DEPENDS= analog:${PORTSDIR}/www/analog \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+ ${SITE_PERL}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d \
+ ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+ ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
+ ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
WRKSRC= ${WRKDIR}/${DISTNAME}
NO_BUILD= YES
diff --git a/www/rt2/Makefile b/www/rt2/Makefile
index 91f58655ec8c..2d47b2a620a8 100644
--- a/www/rt2/Makefile
+++ b/www/rt2/Makefile
@@ -56,7 +56,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-serv
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
USE_REINPLACE= yes
USE_PERL5= yes
diff --git a/www/rt3/Makefile b/www/rt3/Makefile
index 1762ae0e3bd0..c278af267e90 100644
--- a/www/rt3/Makefile
+++ b/www/rt3/Makefile
@@ -103,7 +103,7 @@ DB_TYPE= mysql
BUILD_DEPENDS+= ${LOCALBASE}/bin/mysql_config:${PORTSDIR}/databases/mysql40-server
.endif
-SITE_PERL:= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL:= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}/
USE_PERL5= yes
RT_PATH?= ${PREFIX}/rt3
diff --git a/www/rt32/Makefile b/www/rt32/Makefile
index 1762ae0e3bd0..c278af267e90 100644
--- a/www/rt32/Makefile
+++ b/www/rt32/Makefile
@@ -103,7 +103,7 @@ DB_TYPE= mysql
BUILD_DEPENDS+= ${LOCALBASE}/bin/mysql_config:${PORTSDIR}/databases/mysql40-server
.endif
-SITE_PERL:= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL:= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}/
USE_PERL5= yes
RT_PATH?= ${PREFIX}/rt3
diff --git a/www/rt34/Makefile b/www/rt34/Makefile
index 1762ae0e3bd0..c278af267e90 100644
--- a/www/rt34/Makefile
+++ b/www/rt34/Makefile
@@ -103,7 +103,7 @@ DB_TYPE= mysql
BUILD_DEPENDS+= ${LOCALBASE}/bin/mysql_config:${PORTSDIR}/databases/mysql40-server
.endif
-SITE_PERL:= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL:= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}/
USE_PERL5= yes
RT_PATH?= ${PREFIX}/rt3
diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index 1762ae0e3bd0..c278af267e90 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -103,7 +103,7 @@ DB_TYPE= mysql
BUILD_DEPENDS+= ${LOCALBASE}/bin/mysql_config:${PORTSDIR}/databases/mysql40-server
.endif
-SITE_PERL:= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL:= ${SITE_PERL}
ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}/
USE_PERL5= yes
RT_PATH?= ${PREFIX}/rt3
diff --git a/www/smb2www/Makefile b/www/smb2www/Makefile
index bccec7fa4fd3..8b800bcae840 100644
--- a/www/smb2www/Makefile
+++ b/www/smb2www/Makefile
@@ -22,7 +22,7 @@ COMMENT= Windows Network client that is accessible through a web browser
RUN_DEPENDS= httpd:${PORTSDIR}/www/apache13 \
smbclient:${PORTSDIR}/net/samba \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
IS_INTERACTIVE= yes
NO_BUILD= yes
diff --git a/www/swish++/pkg-plist b/www/swish++/pkg-plist
index 964f62e86873..e5bfa7b94b8a 100644
--- a/www/swish++/pkg-plist
+++ b/www/swish++/pkg-plist
@@ -7,4 +7,4 @@ bin/searchmonitor
bin/splitmail
etc/swish++.conf
etc/rc.d/swish++.sh
-lib/perl5/site_perl/%%PERL_VER%%/WWW.pm
+%%SITE_PERL%%/WWW.pm
diff --git a/www/w3mir/Makefile b/www/w3mir/Makefile
index 6c5ebed77bc0..7f8bac1aa7f5 100644
--- a/www/w3mir/Makefile
+++ b/www/w3mir/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://langfeldt.net/w3mir/
MAINTAINER= ache@freebsd.org
COMMENT= All-purpose HTTP copying and mirroring tool
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
USE_PERL5= yes
diff --git a/www/w3mir/pkg-plist b/www/w3mir/pkg-plist
index aa9222e3382c..9d0ba142ddab 100644
--- a/www/w3mir/pkg-plist
+++ b/www/w3mir/pkg-plist
@@ -1,13 +1,13 @@
bin/w3mfix
bin/w3mir
-lib/perl5/site_perl/%%PERL_VER%%/htmlop.pm
-lib/perl5/site_perl/%%PERL_VER%%/w3http.pm
-lib/perl5/site_perl/%%PERL_VER%%/w3pdfuri.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/w3mir/.packlist
+%%SITE_PERL%%/htmlop.pm
+%%SITE_PERL%%/w3http.pm
+%%SITE_PERL%%/w3pdfuri.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/w3mir/.packlist
share/doc/w3mir/Artistic
share/doc/w3mir/README
share/doc/w3mir/example.cfg
share/doc/w3mir/multiscope.cfg
share/doc/w3mir/w3mir-HOWTO.html
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/w3mir
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/w3mir
@dirrm share/doc/w3mir
diff --git a/www/wwwstat/pkg-plist b/www/wwwstat/pkg-plist
index c16d074b5371..e5178924d5c5 100644
--- a/www/wwwstat/pkg-plist
+++ b/www/wwwstat/pkg-plist
@@ -3,6 +3,6 @@ bin/oldlog2new
bin/splitlog
bin/wwwerrs
bin/wwwstat
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/domains.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/splitlog.rc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/wwwstat.rc
+%%SITE_PERL%%/%%PERL_ARCH%%/domains.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/splitlog.rc
+%%SITE_PERL%%/%%PERL_ARCH%%/wwwstat.rc
diff --git a/x11-fm/cfm/Makefile b/x11-fm/cfm/Makefile
index b6876ae56544..fe14aa53d15d 100644
--- a/x11-fm/cfm/Makefile
+++ b/x11-fm/cfm/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.rpi.edu/~mullr/cfm/dist/
MAINTAINER= petef@FreeBSD.org
COMMENT= Quick Perl/Tk file manager with support for regular expressions
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
NO_BUILD= yes
USE_PERL5= yes
diff --git a/x11-fonts/p5-Font-AFM/Makefile b/x11-fonts/p5-Font-AFM/Makefile
index 9c1a7a3c87d4..edd2dc9a5dc7 100644
--- a/x11-fonts/p5-Font-AFM/Makefile
+++ b/x11-fonts/p5-Font-AFM/Makefile
@@ -17,7 +17,6 @@ COMMENT= An interface to Adobe font metrics files
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Font::AFM.3
.include <bsd.port.mk>
diff --git a/x11-fonts/p5-Font-AFM/pkg-plist b/x11-fonts/p5-Font-AFM/pkg-plist
index 853f74be0545..9e5cea97f473 100644
--- a/x11-fonts/p5-Font-AFM/pkg-plist
+++ b/x11-fonts/p5-Font-AFM/pkg-plist
@@ -1,18 +1,18 @@
-lib/perl5/site_perl/%%PERL_VER%%/Font/AFM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/Courier.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/CourierBold.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/CourierBoldOblique.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/CourierOblique.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/Helvetica.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/HelveticaBold.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/HelveticaBoldOblique.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/HelveticaOblique.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/TimesBold.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/TimesBoldItalic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/TimesItalic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics/TimesRoman.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Font/AFM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Font/AFM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Font 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Font/Metrics
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Font 2>/dev/null || true
+%%SITE_PERL%%/Font/AFM.pm
+%%SITE_PERL%%/Font/Metrics/Courier.pm
+%%SITE_PERL%%/Font/Metrics/CourierBold.pm
+%%SITE_PERL%%/Font/Metrics/CourierBoldOblique.pm
+%%SITE_PERL%%/Font/Metrics/CourierOblique.pm
+%%SITE_PERL%%/Font/Metrics/Helvetica.pm
+%%SITE_PERL%%/Font/Metrics/HelveticaBold.pm
+%%SITE_PERL%%/Font/Metrics/HelveticaBoldOblique.pm
+%%SITE_PERL%%/Font/Metrics/HelveticaOblique.pm
+%%SITE_PERL%%/Font/Metrics/TimesBold.pm
+%%SITE_PERL%%/Font/Metrics/TimesBoldItalic.pm
+%%SITE_PERL%%/Font/Metrics/TimesItalic.pm
+%%SITE_PERL%%/Font/Metrics/TimesRoman.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/AFM/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/AFM
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Font/Metrics
+@unexec rmdir %D/%%SITE_PERL%%/Font 2>/dev/null || true
diff --git a/x11-fonts/p5-Font-TTF/pkg-plist b/x11-fonts/p5-Font-TTF/pkg-plist
index 2b97e273831f..2761c9a24e82 100644
--- a/x11-fonts/p5-Font-TTF/pkg-plist
+++ b/x11-fonts/p5-Font-TTF/pkg-plist
@@ -5,71 +5,71 @@ bin/psfix.plx
bin/ttfbuilder.plx
bin/ttfname.plx
bin/ttfremap.plx
-lib/perl5/site_perl/%%PERL_VER%%/ttfmod.pl
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/AATKern.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/AATutils.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Anchor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Bsln.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Changes
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Cmap.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Coverage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Cvt_.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Delta.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Fdsc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Feat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Fmtx.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Font.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Fpgm.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/GDEF.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/GPOS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/GSUB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Glyf.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Glyph.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Hdmx.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Head.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Hhea.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Hmtx.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Kern/ClassArray.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Kern/CompactClassArray.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Kern/Subtable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Kern/OrderedList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Kern/StateTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Kern.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/LTSH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Loca.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Manual.pod
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Maxp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort/Rearrangement.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort/Noncontextual.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort/Chain.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort/Subtable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort/Ligature.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort/Contextual.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort/Insertion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Name.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/OS_2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/OldCmap.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/OldMort.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/PCLT.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/PSNames.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Post.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Prep.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Prop.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Segarr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Ttc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Ttopen.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Useall.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Utils.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Vhea.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Vmtx.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Win32.pm
-lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/XMLparse.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Font/TTF/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Kern
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Font/TTF/Mort
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Font/TTF
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Font/TTF
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Font 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Font 2>/dev/null || true
+%%SITE_PERL%%/ttfmod.pl
+%%SITE_PERL%%/Font/TTF/AATKern.pm
+%%SITE_PERL%%/Font/TTF/AATutils.pm
+%%SITE_PERL%%/Font/TTF/Anchor.pm
+%%SITE_PERL%%/Font/TTF/Bsln.pm
+%%SITE_PERL%%/Font/TTF/Changes
+%%SITE_PERL%%/Font/TTF/Cmap.pm
+%%SITE_PERL%%/Font/TTF/Coverage.pm
+%%SITE_PERL%%/Font/TTF/Cvt_.pm
+%%SITE_PERL%%/Font/TTF/Delta.pm
+%%SITE_PERL%%/Font/TTF/Fdsc.pm
+%%SITE_PERL%%/Font/TTF/Feat.pm
+%%SITE_PERL%%/Font/TTF/Fmtx.pm
+%%SITE_PERL%%/Font/TTF/Font.pm
+%%SITE_PERL%%/Font/TTF/Fpgm.pm
+%%SITE_PERL%%/Font/TTF/GDEF.pm
+%%SITE_PERL%%/Font/TTF/GPOS.pm
+%%SITE_PERL%%/Font/TTF/GSUB.pm
+%%SITE_PERL%%/Font/TTF/Glyf.pm
+%%SITE_PERL%%/Font/TTF/Glyph.pm
+%%SITE_PERL%%/Font/TTF/Hdmx.pm
+%%SITE_PERL%%/Font/TTF/Head.pm
+%%SITE_PERL%%/Font/TTF/Hhea.pm
+%%SITE_PERL%%/Font/TTF/Hmtx.pm
+%%SITE_PERL%%/Font/TTF/Kern/ClassArray.pm
+%%SITE_PERL%%/Font/TTF/Kern/CompactClassArray.pm
+%%SITE_PERL%%/Font/TTF/Kern/Subtable.pm
+%%SITE_PERL%%/Font/TTF/Kern/OrderedList.pm
+%%SITE_PERL%%/Font/TTF/Kern/StateTable.pm
+%%SITE_PERL%%/Font/TTF/Kern.pm
+%%SITE_PERL%%/Font/TTF/LTSH.pm
+%%SITE_PERL%%/Font/TTF/Loca.pm
+%%SITE_PERL%%/Font/TTF/Manual.pod
+%%SITE_PERL%%/Font/TTF/Maxp.pm
+%%SITE_PERL%%/Font/TTF/Mort/Rearrangement.pm
+%%SITE_PERL%%/Font/TTF/Mort/Noncontextual.pm
+%%SITE_PERL%%/Font/TTF/Mort/Chain.pm
+%%SITE_PERL%%/Font/TTF/Mort/Subtable.pm
+%%SITE_PERL%%/Font/TTF/Mort/Ligature.pm
+%%SITE_PERL%%/Font/TTF/Mort/Contextual.pm
+%%SITE_PERL%%/Font/TTF/Mort/Insertion.pm
+%%SITE_PERL%%/Font/TTF/Mort.pm
+%%SITE_PERL%%/Font/TTF/Name.pm
+%%SITE_PERL%%/Font/TTF/OS_2.pm
+%%SITE_PERL%%/Font/TTF/OldCmap.pm
+%%SITE_PERL%%/Font/TTF/OldMort.pm
+%%SITE_PERL%%/Font/TTF/PCLT.pm
+%%SITE_PERL%%/Font/TTF/PSNames.pm
+%%SITE_PERL%%/Font/TTF/Post.pm
+%%SITE_PERL%%/Font/TTF/Prep.pm
+%%SITE_PERL%%/Font/TTF/Prop.pm
+%%SITE_PERL%%/Font/TTF/Segarr.pm
+%%SITE_PERL%%/Font/TTF/Table.pm
+%%SITE_PERL%%/Font/TTF/Ttc.pm
+%%SITE_PERL%%/Font/TTF/Ttopen.pm
+%%SITE_PERL%%/Font/TTF/Useall.pm
+%%SITE_PERL%%/Font/TTF/Utils.pm
+%%SITE_PERL%%/Font/TTF/Vhea.pm
+%%SITE_PERL%%/Font/TTF/Vmtx.pm
+%%SITE_PERL%%/Font/TTF/Win32.pm
+%%SITE_PERL%%/Font/TTF/XMLparse.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/TTF/.packlist
+@dirrm %%SITE_PERL%%/Font/TTF/Kern
+@dirrm %%SITE_PERL%%/Font/TTF/Mort
+@dirrm %%SITE_PERL%%/Font/TTF
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/TTF
+@unexec rmdir %D/%%SITE_PERL%%/Font 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font 2>/dev/null || true
diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile
index 3a2c7908b253..cbb1578ea90f 100644
--- a/x11-toolkits/p5-GdkImlib/Makefile
+++ b/x11-toolkits/p5-GdkImlib/Makefile
@@ -16,7 +16,7 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Imlib module of Gtk-Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-GdkImlib/pkg-plist b/x11-toolkits/p5-GdkImlib/pkg-plist
index 5c304cc794ea..6a82bac6790d 100644
--- a/x11-toolkits/p5-GdkImlib/pkg-plist
+++ b/x11-toolkits/p5-GdkImlib/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install/GdkImlibTypes.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage/ImlibImage.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage/ImlibImage.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install/GdkImlibTypes.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage/ImlibImage.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage/ImlibImage.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
diff --git a/x11-toolkits/p5-GdkPixbuf/Makefile b/x11-toolkits/p5-GdkPixbuf/Makefile
index 3cd033268d40..3514b4d4ed91 100644
--- a/x11-toolkits/p5-GdkPixbuf/Makefile
+++ b/x11-toolkits/p5-GdkPixbuf/Makefile
@@ -16,7 +16,7 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Pixbuf module of Gtk-Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
RUN_DEPENDS= ${BUILD_DEPENDS}
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
diff --git a/x11-toolkits/p5-GdkPixbuf/pkg-plist b/x11-toolkits/p5-GdkPixbuf/pkg-plist
index c07e310d42a9..0c9cd916f5ef 100644
--- a/x11-toolkits/p5-GdkPixbuf/pkg-plist
+++ b/x11-toolkits/p5-GdkPixbuf/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/GdkPixbufDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/GdkPixbufTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/PerlGdkPixbufInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/Pixbuf.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/Pixbuf.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/GdkPixbufDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/GdkPixbufTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/PerlGdkPixbufInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/Pixbuf.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/Pixbuf.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Glade/Makefile b/x11-toolkits/p5-Glade/Makefile
index 0b61d6113c09..238b246b2363 100644
--- a/x11-toolkits/p5-Glade/Makefile
+++ b/x11-toolkits/p5-Glade/Makefile
@@ -16,7 +16,7 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Glade interface files of Gtk-Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= yes
diff --git a/x11-toolkits/p5-Glade/pkg-plist b/x11-toolkits/p5-Glade/pkg-plist
index 0ea6f1ae1a02..2923e218f41e 100644
--- a/x11-toolkits/p5-Glade/pkg-plist
+++ b/x11-toolkits/p5-Glade/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/GtkGladeXMLTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/GtkGladeXMLDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/PerlGtkGladeXMLInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/GladeXML.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/GladeXML.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/GtkGladeXMLTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/GtkGladeXMLDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/PerlGtkGladeXMLInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/GladeXML.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/GladeXML.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 0b61d6113c09..238b246b2363 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -16,7 +16,7 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Glade interface files of Gtk-Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= yes
diff --git a/x11-toolkits/p5-Glade2/pkg-plist b/x11-toolkits/p5-Glade2/pkg-plist
index 0ea6f1ae1a02..2923e218f41e 100644
--- a/x11-toolkits/p5-Glade2/pkg-plist
+++ b/x11-toolkits/p5-Glade2/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/GtkGladeXMLTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/GtkGladeXMLDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/PerlGtkGladeXMLInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/GladeXML.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/GladeXML.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GladeXML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/GladeXML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/GtkGladeXMLTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/GtkGladeXMLDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/PerlGtkGladeXMLInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/GladeXML.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/GladeXML.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/GladeXML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/GladeXML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Gnome/Makefile b/x11-toolkits/p5-Gnome/Makefile
index 2991e400885f..276ce6243b8a 100644
--- a/x11-toolkits/p5-Gnome/Makefile
+++ b/x11-toolkits/p5-Gnome/Makefile
@@ -16,8 +16,8 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The main Gnome module of Gtk-Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk/ImlibImage.pm:${PORTSDIR}/x11-toolkits/p5-GdkImlib \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk/Gdk/ImlibImage.pm:${PORTSDIR}/x11-toolkits/p5-GdkImlib \
+ ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= gnomelibs
diff --git a/x11-toolkits/p5-Gnome/pkg-plist b/x11-toolkits/p5-Gnome/pkg-plist
index 0a7154ddeac3..ce91d3ff494f 100644
--- a/x11-toolkits/p5-Gnome/pkg-plist
+++ b/x11-toolkits/p5-Gnome/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeTypes.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/PerlGnomeInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/TypesLazy.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Gnome.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Gnome.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Install/GnomeDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Install/GnomeTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Install/GnomeTypes.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Install/PerlGnomeInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome/TypesLazy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome/Gnome.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome/Gnome.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 673ffebd14b7..ec240afcaefa 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The base module of Gtk-Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS= ${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
USE_GNOME= gtk12
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Gtk/pkg-plist b/x11-toolkits/p5-Gtk/pkg-plist
index 8884a64133bc..e8d49b817d5a 100644
--- a/x11-toolkits/p5-Gtk/pkg-plist
+++ b/x11-toolkits/p5-Gtk/pkg-plist
@@ -1,47 +1,47 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Atoms.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/CListModel.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/ColorSelectButton.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Keysyms.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GdkTypes.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkTypes.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/MiscTypes.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkExt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gendefs.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gendoc.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/genext.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gpdoc2pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.0.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.1.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.3.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.4.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.6.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/ppport.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LWP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LWP/http.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LogHandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/TypesLazy.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/io.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/lazy.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gtk.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gtk.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/base/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LWP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/base
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Atoms.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/CListModel.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/ColorSelectButton.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Keysyms.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GdkTypes.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkTypes.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/MiscTypes.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkExt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gendefs.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gendoc.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/genext.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gpdoc2pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.defs
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.0.defs
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.1.defs
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.3.defs
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.4.defs
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.6.defs
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.defs
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.defs
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/ppport.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP/http.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LogHandler.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/TypesLazy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/io.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/lazy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gtk.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gtk.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/base/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/base
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk
diff --git a/x11-toolkits/p5-GtkXmHTML/Makefile b/x11-toolkits/p5-GtkXmHTML/Makefile
index 2a98eb31bac7..7dc35f34a87c 100644
--- a/x11-toolkits/p5-GtkXmHTML/Makefile
+++ b/x11-toolkits/p5-GtkXmHTML/Makefile
@@ -16,7 +16,7 @@ DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= The HTML widget module of Gtk-Perl
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= gnomelibs
diff --git a/x11-toolkits/p5-GtkXmHTML/pkg-plist b/x11-toolkits/p5-GtkXmHTML/pkg-plist
index 046f8c0f6002..dcb497a57285 100644
--- a/x11-toolkits/p5-GtkXmHTML/pkg-plist
+++ b/x11-toolkits/p5-GtkXmHTML/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GXHTypes.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GtkXmHTMLDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GtkXmHTMLTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/PerlGtkXmHTMLInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/XmHTML.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/XmHTML.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/XmHTML
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GXHTypes.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GtkXmHTMLDefs.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GtkXmHTMLTypemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/PerlGtkXmHTMLInt.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/pkg.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/XmHTML.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/XmHTML.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/XmHTML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Prima/pkg-plist b/x11-toolkits/p5-Prima/pkg-plist
index a7452da90a41..7add8b18d80d 100644
--- a/x11-toolkits/p5-Prima/pkg-plist
+++ b/x11-toolkits/p5-Prima/pkg-plist
@@ -1,210 +1,210 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Prima/Prima.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Application.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Buttons.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Calendar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Classes.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/ColorDialog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/ComboBox.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Const.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/DetailedList.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/DockManager.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Docks.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Edit.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/EditDialog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/ExtLists.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/FileDialog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/FontDialog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/FrameSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Gencls.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Header.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/HelpViewer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/HelpViewer.fm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/ImageDialog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/ImageViewer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/IniFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/InputLine.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/IntUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/KeySelector.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Label.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Lists.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/MDI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Make.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/MsgBox.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Notebooks.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Outlines.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PodView.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PrintDialog.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/ScrollBar.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/ScrollWidget.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Sliders.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/StartupWindow.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/StdBitmap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/StdDlg.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Stress.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Terminals.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/TextView.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Utils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Widgets.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/sysimage.gif
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Image/GBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Image/TransparencyControl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Image/gif.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Image/jpeg.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/Drawable.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/Encodings.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/Fonts.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/Printer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/Setup.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/setup.fm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-Book
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-BookOblique
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-Demi
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-DemiOblique
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-Demi
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-DemiItalic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-Light
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-LightItalic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-Bold
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-BoldOblique
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-Oblique
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Bold
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-BoldOblique
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-Bold
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-BoldOblique
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-Oblique
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Oblique
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Bold
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-BoldItalic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Italic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Roman
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Bold
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-BoldItalic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Italic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Roman
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Symbol
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Bold
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-BoldItalic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Italic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Roman
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/ZapfChancery-MediumItalic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts/ZapfDingbats
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/ascii
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/ibm-cp437
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/ibm-cp850
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-1
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-10
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-13
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-14
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-15
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-2
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-4
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-7
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-9
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/ps-iso-latin1
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/ps-standart
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/win-cp1250
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale/win-cp1252
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/CfgMaint.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/Classes.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/CoreClasses.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/VB.gif
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/VBControls.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/VBLoader.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/classes.gif
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/starter.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/examples/Sample.fm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/examples/Widgety.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/Hand.gif
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/amba
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/buttons
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/buttons2
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/calendar
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/cv
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/dock
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/drivecombo
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/e
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/edit
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/editor
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/extlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/eyes
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/f_fill
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/frames
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/fontdlg
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/generic
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/grip
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/iv
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/keys
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/label
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/launch
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/listbox
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/macro
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/matrix.gif
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/matrix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/mdi
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/menu
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/notebk
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/outline
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/ownerchange
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/palette
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/pitch
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/pointers
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/print
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/ps_setup
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/rot
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/rtc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/scrollbar
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/sheet
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/socket
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/transparent
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples/triangle
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/apricot.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/gbm.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/guts.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/img.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/img_conv.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/AbstractMenu.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/AccelTable.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Application.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Clipboard.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Component.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/DeviceBitmap.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Drawable.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/File.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Icon.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Image.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Menu.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Object.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Popup.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Printer.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Timer.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Types.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Utils.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Widget.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/Window.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic/config.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/unix/guts.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/gencls.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/gp-problems.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/codecs.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/image-load.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/internals.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Clipboard.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Drawable.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/File.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Image.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Menu.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Object.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Printer.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Timer.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Widget.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Window.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima/Prima.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Application.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Buttons.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Calendar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Classes.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ColorDialog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ComboBox.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Config.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Const.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/DetailedList.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/DockManager.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Docks.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Edit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/EditDialog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ExtLists.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/FileDialog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/FontDialog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/FrameSet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Gencls.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Header.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/HelpViewer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/HelpViewer.fm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ImageDialog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ImageViewer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/IniFile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/InputLine.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/IntUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/KeySelector.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Label.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Lists.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/MDI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Make.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/MsgBox.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Notebooks.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Outlines.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PodView.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PrintDialog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ScrollBar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/ScrollWidget.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Sliders.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/StartupWindow.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/StdBitmap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/StdDlg.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Stress.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Terminals.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/TextView.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Utils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widgets.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/sysimage.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/GBM.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/TransparencyControl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/gif.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image/jpeg.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Drawable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Encodings.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Fonts.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Printer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/Setup.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/setup.fm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-Book
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-BookOblique
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-Demi
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/AvantGarde-DemiOblique
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-Demi
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-DemiItalic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-Light
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Bookman-LightItalic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-Bold
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-BoldOblique
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Courier-Oblique
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Bold
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-BoldOblique
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-Bold
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-BoldOblique
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Narrow-Oblique
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Helvetica-Oblique
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Bold
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-BoldItalic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Italic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/NewCenturySchlbk-Roman
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Bold
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-BoldItalic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Italic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Palatino-Roman
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Symbol
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Bold
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-BoldItalic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Italic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/Times-Roman
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/ZapfChancery-MediumItalic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts/ZapfDingbats
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ascii
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ibm-cp437
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ibm-cp850
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-1
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-10
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-13
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-14
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-15
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-2
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-3
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-4
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-7
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/iso8859-9
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ps-iso-latin1
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/ps-standart
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/win-cp1250
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale/win-cp1252
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/CfgMaint.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/Classes.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/Config.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/CoreClasses.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VB.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VBControls.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VBLoader.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/classes.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/starter.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples/Sample.fm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples/Widgety.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/Hand.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/amba
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/buttons
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/buttons2
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/calendar
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/cv
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/dock
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/drivecombo
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/e
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/edit
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/editor
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/extlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/eyes
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/f_fill
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/frames
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/fontdlg
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/generic
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/grip
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/iv
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/keys
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/label
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/launch
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/listbox
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/macro
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/matrix.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/matrix
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/mdi
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/menu
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/notebk
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/outline
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/ownerchange
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/palette
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/pitch
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/pointers
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/print
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/ps_setup
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/rot
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/rtc
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/scrollbar
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/sheet
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/socket
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/transparent
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/triangle
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/apricot.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/gbm.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/guts.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/img.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/img_conv.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/AbstractMenu.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/AccelTable.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Application.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Clipboard.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Component.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/DeviceBitmap.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Drawable.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/File.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Icon.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Image.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Menu.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Object.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Popup.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Printer.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Timer.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Types.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Utils.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Widget.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/Window.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic/config.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/unix/guts.h
+%%SITE_PERL%%/%%PERL_ARCH%%/gencls.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/gp-problems.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/codecs.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/image-load.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/internals.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Clipboard.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/File.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Menu.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Object.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Printer.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Timer.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Window.pod
man/man1/gencls.1.gz
man/man1/VB.1.gz
man/man1/cfgmaint.1.gz
@@ -279,15 +279,15 @@ bin/tmlink
bin/VB
bin/cfgmaint
bin/podview
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/unix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE/generic
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/CORE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/fonts
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS/locale
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/PS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB/examples
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/VB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/examples
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima/Image
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Prima
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Prima
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/unix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index cc37be21a3cf..424a521f5af9 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl5 module to access to Tk via the Tcl extension
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tcl::Tk.3
post-patch:
diff --git a/x11-toolkits/p5-Tcl-Tk/pkg-plist b/x11-toolkits/p5-Tcl-Tk/pkg-plist
index 6d095c88ee73..cea0dd9d11da 100644
--- a/x11-toolkits/p5-Tcl-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tcl-Tk/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tcl/Tk.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tk
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tcl 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Tcl/Tk.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tcl 2>/dev/null || true
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index cc37be21a3cf..424a521f5af9 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl5 module to access to Tk via the Tcl extension
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tcl::Tk.3
post-patch:
diff --git a/x11-toolkits/p5-TclTk/pkg-plist b/x11-toolkits/p5-TclTk/pkg-plist
index 6d095c88ee73..cea0dd9d11da 100644
--- a/x11-toolkits/p5-TclTk/pkg-plist
+++ b/x11-toolkits/p5-TclTk/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tcl/Tk.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tcl/Tk
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tcl 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Tcl/Tk.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tcl 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 133186dd55ef..649186fdbd9a 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Tk::Autoscroll - space invaders-like scrolling
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
index dcbc18198ee3..68758a4310f0 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
+++ b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tk/Autoscroll.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Autoscroll/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Autoscroll
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tk 2>/dev/null || true
+%%SITE_PERL%%/Tk/Autoscroll.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index 21199f486902..b1208ea9b607 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl/Tk module providing a Colour selection dialogue box
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
index aa55dda123d2..776aa7758a92 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
+++ b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tk/ColourChooser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/ColourChooser/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/ColourChooser
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tk 2>/dev/null || true
+%%SITE_PERL%%/Tk/ColourChooser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index c487d3fdfdf5..d2f1b7bd74e5 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Tk::Date - a date/time widget for perl/Tk
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk/FireButton.pm:${PORTSDIR}/x11-toolkits/p5-Tk-GBARR
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk/FireButton.pm:${PORTSDIR}/x11-toolkits/p5-Tk-GBARR
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Tk-Date/pkg-plist b/x11-toolkits/p5-Tk-Date/pkg-plist
index 3bede4d635df..a1ac370c536f 100644
--- a/x11-toolkits/p5-Tk-Date/pkg-plist
+++ b/x11-toolkits/p5-Tk-Date/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos/widtrib/date.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Date/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos/widtrib 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Date
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Date.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/date.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index c9a73b875eea..a1e700bcbdf4 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Tk::Enscript - a text-to-postscript converter using Tk::Canvas
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Tk-Enscript/pkg-plist b/x11-toolkits/p5-Tk-Enscript/pkg-plist
index c5af15059ad2..c3c30122d792 100644
--- a/x11-toolkits/p5-Tk-Enscript/pkg-plist
+++ b/x11-toolkits/p5-Tk-Enscript/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tk/Enscript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Tk/enscript.cfg
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Enscript/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Enscript
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tk 2>/dev/null || true
+%%SITE_PERL%%/Tk/Enscript.pm
+%%SITE_PERL%%/Tk/enscript.cfg
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index 9c888338993f..f2bc57cff567 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= Tk
MAINTAINER= minter@lunenburg.org
COMMENT= Tk::FileDialog - A file selector dialog for perl/Tk
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
PERL_CONFIGURE= yes
MAN3PREFIX= ${LOCALBASE}/lib/perl5/${PERL_VERSION}
diff --git a/x11-toolkits/p5-Tk-FileDialog/pkg-plist b/x11-toolkits/p5-Tk-FileDialog/pkg-plist
index d7506675cf23..1d1691894e83 100644
--- a/x11-toolkits/p5-Tk-FileDialog/pkg-plist
+++ b/x11-toolkits/p5-Tk-FileDialog/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/FileDialog/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Tk/FileDialog.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/FileDialog
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FileDialog/.packlist
+%%SITE_PERL%%/Tk/FileDialog.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FileDialog
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index b81feff28f4c..4159ee15618f 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Some collection of Tk Widgets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Tk-GBARR/pkg-plist b/x11-toolkits/p5-Tk-GBARR/pkg-plist
index 4fa6e99b7c79..392bdc6e6faf 100644
--- a/x11-toolkits/p5-Tk-GBARR/pkg-plist
+++ b/x11-toolkits/p5-Tk-GBARR/pkg-plist
@@ -1,16 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/TFrame.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/NumEntry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/NumEntryPlain.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/FireButton.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/Cloth.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos/widtrib/cloth.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos/widtrib/firebutton.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos/widtrib/numentry.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos/widtrib/numentryplain.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos/widtrib/tframe.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/GBARR/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/GBARR
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos/widtrib 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TFrame.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/NumEntry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/NumEntryPlain.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/FireButton.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Cloth.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/cloth.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/firebutton.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/numentry.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/numentryplain.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/tframe.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 3d69cb1d67d6..90f6698f9cc8 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= User configuration window for Tk with interface to Getopt::Long
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Tk-Getopt/pkg-plist b/x11-toolkits/p5-Tk-Getopt/pkg-plist
index b3f809d0e15a..0648f843ccf3 100644
--- a/x11-toolkits/p5-Tk-Getopt/pkg-plist
+++ b/x11-toolkits/p5-Tk-Getopt/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tk/Getopt.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Getopt/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Getopt
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tk 2>/dev/null || true
+%%SITE_PERL%%/Tk/Getopt.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index 32f819fa45a8..0c091aad99b2 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Tk::HistEntry - Entry widget with history capability
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Tk-HistEntry/pkg-plist b/x11-toolkits/p5-Tk-HistEntry/pkg-plist
index 22057bb13e56..b2b7ff69f8de 100644
--- a/x11-toolkits/p5-Tk-HistEntry/pkg-plist
+++ b/x11-toolkits/p5-Tk-HistEntry/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Tk/HistEntry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/HistEntry/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/HistEntry
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tk 2>/dev/null || true
+%%SITE_PERL%%/Tk/HistEntry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index f17f9a3b4f72..e41b8d8f8cf1 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lioux@FreeBSD.org
COMMENT= Table/matrix extension to perl/tk for displaying table formatted data
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Tk::TableMatrix.3 \
Tk::TableMatrix::Spreadsheet.3 \
Tk::TableMatrix::SpreadsheetHideRows.3
diff --git a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
index 8649f14feed1..710bebdacca3 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
+++ b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
@@ -1,13 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/TableMatrix.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/TableMatrix.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/TableMatrix/Spreadsheet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/TableMatrix/SpreadsheetHideRows.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/pTk/mm.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/pTk/tkTable.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/pTk/tkTableversion.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/TableMatrix.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/TableMatrix.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tk/TableMatrix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Tk/TableMatrix
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix/Spreadsheet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix/SpreadsheetHideRows.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/mm.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkTable.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tkTableversion.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/TableMatrix.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/TableMatrix.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index e91067120c3c..1720864a8e0b 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -24,7 +24,7 @@ MAKE_ARGS= X11BASE="${X11BASE}" X11PREFIX="${PREFIX}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}"
.if defined(WITH_GUI)
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
PLIST_SUB= GUI=""
MAKE_ARGS+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
.else