Some OCD cleanups on some of the perl@ ports.

- Remove dependencies in core
- Put testing depends in TEST_DEPENDS
- Remove unnecessary bsd.port.options.mk inclusions
- Remove checks for Perl versions that no longer exist in the ports tree
- Sort plists, some of which were so jumbled that I have to assume
  the plist was randomized before committing

A lot of the plist changes in this commit are moving PERL5_MAN3 after
SITE_PERL. It's repo churn now, but it makes updating the ports later
far easier.

14 files changed, 29 insertions, 30 deletions

diff --git a/audio/p5-Audio-MPD/Makefile b/audio/p5-Audio-MPD/Makefile
index 630c977dd414..71ab9812bfa5 100644
--- a/audio/p5-Audio-MPD/Makefile
+++ b/audio/p5-Audio-MPD/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	p5-Audio-MPD-Common>=0:${PORTSDIR}/audio/p5-Audio-MPD-Common \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-Has-Sugar>=0:${PORTSDIR}/devel/p5-MooseX-Has-Sugar \
 		p5-MooseX-SemiAffordanceAccessor>=0:${PORTSDIR}/devel/p5-MooseX-SemiAffordanceAccessor \
-		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
+		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Corpus-Audio-MPD>=1.113282:${PORTSDIR}/audio/p5-Test-Corpus-Audio-MPD
 
diff --git a/audio/p5-Audio-MPD/pkg-plist b/audio/p5-Audio-MPD/pkg-plist
index fe554fcd9bc9..e469122508f6 100644
--- a/audio/p5-Audio-MPD/pkg-plist
+++ b/audio/p5-Audio-MPD/pkg-plist
@@ -1,12 +1,12 @@
 bin/mpd-dynamic
 bin/mpd-rate
-%%PERL5_MAN3%%/Audio::MPD.3.gz
-%%PERL5_MAN3%%/Audio::MPD::Collection.3.gz
-%%PERL5_MAN3%%/Audio::MPD::Playlist.3.gz
-%%PERL5_MAN3%%/Audio::MPD::Types.3.gz
 %%SITE_PERL%%/Audio/MPD.pm
 %%SITE_PERL%%/Audio/MPD/Collection.pm
 %%SITE_PERL%%/Audio/MPD/Playlist.pm
 %%SITE_PERL%%/Audio/MPD/Types.pm
+%%PERL5_MAN3%%/Audio::MPD.3.gz
+%%PERL5_MAN3%%/Audio::MPD::Collection.3.gz
+%%PERL5_MAN3%%/Audio::MPD::Playlist.3.gz
+%%PERL5_MAN3%%/Audio::MPD::Types.3.gz
 man/man1/mpd-dynamic.1.gz
 man/man1/mpd-rate.1.gz
diff --git a/audio/p5-Audio-Musepack/pkg-plist b/audio/p5-Audio-Musepack/pkg-plist
index 8c0dabb63fae..106c3a509274 100644
--- a/audio/p5-Audio-Musepack/pkg-plist
+++ b/audio/p5-Audio-Musepack/pkg-plist
@@ -1,5 +1,5 @@
-%%PERL5_MAN3%%/Audio::APE.3.gz
-%%PERL5_MAN3%%/Audio::Musepack.3.gz
 %%SITE_PERL%%/Audio/APE.pm
 %%SITE_PERL%%/Audio/APETags.pm
 %%SITE_PERL%%/Audio/Musepack.pm
+%%PERL5_MAN3%%/Audio::APE.3.gz
+%%PERL5_MAN3%%/Audio::Musepack.3.gz
diff --git a/audio/p5-Audio-Scan/pkg-plist b/audio/p5-Audio-Scan/pkg-plist
index c1c85e9886a1..04387e9d10b8 100644
--- a/audio/p5-Audio-Scan/pkg-plist
+++ b/audio/p5-Audio-Scan/pkg-plist
@@ -1,3 +1,3 @@
-%%PERL5_MAN3%%/Audio::Scan.3.gz
 %%SITE_ARCH%%/Audio/Scan.pm
 %%SITE_ARCH%%/auto/Audio/Scan/Scan.so
+%%PERL5_MAN3%%/Audio::Scan.3.gz
diff --git a/audio/p5-Audio-Wav/pkg-plist b/audio/p5-Audio-Wav/pkg-plist
index b89d13983dc4..921ac65fb463 100644
--- a/audio/p5-Audio-Wav/pkg-plist
+++ b/audio/p5-Audio-Wav/pkg-plist
@@ -1,8 +1,8 @@
-%%PERL5_MAN3%%/Audio::Wav.3.gz
-%%PERL5_MAN3%%/Audio::Wav::Read.3.gz
-%%PERL5_MAN3%%/Audio::Wav::Write.3.gz
 %%SITE_PERL%%/Audio/Wav.pm
 %%SITE_PERL%%/Audio/Wav/Read.pm
 %%SITE_PERL%%/Audio/Wav/Tools.pm
 %%SITE_PERL%%/Audio/Wav/Write.pm
 %%SITE_PERL%%/Audio/Wav/Write/Header.pm
+%%PERL5_MAN3%%/Audio::Wav.3.gz
+%%PERL5_MAN3%%/Audio::Wav::Read.3.gz
+%%PERL5_MAN3%%/Audio::Wav::Write.3.gz
diff --git a/audio/p5-CDDB-File/pkg-plist b/audio/p5-CDDB-File/pkg-plist
index 009d012b5093..80422c29b8d3 100644
--- a/audio/p5-CDDB-File/pkg-plist
+++ b/audio/p5-CDDB-File/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/CDDB::File.3.gz
 %%SITE_PERL%%/CDDB/File.pm
+%%PERL5_MAN3%%/CDDB::File.3.gz
diff --git a/audio/p5-CDDB/pkg-plist b/audio/p5-CDDB/pkg-plist
index 2efaf348f33b..db15df61486b 100644
--- a/audio/p5-CDDB/pkg-plist
+++ b/audio/p5-CDDB/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/CDDB.3.gz
 %%SITE_PERL%%/CDDB.pm
+%%PERL5_MAN3%%/CDDB.3.gz
diff --git a/audio/p5-CDDB_get/pkg-plist b/audio/p5-CDDB_get/pkg-plist
index 0ff8cdd55532..09185e79fb56 100644
--- a/audio/p5-CDDB_get/pkg-plist
+++ b/audio/p5-CDDB_get/pkg-plist
@@ -1,7 +1,7 @@
 bin/cddb.pl
-%%PERL5_MAN3%%/CDDB_get.3.gz
 %%SITE_PERL%%/CDDB_cache.pm
 %%SITE_PERL%%/CDDB_get.pm
 %%SITE_PERL%%/auto/CDDB_cache/autosplit.ix
 %%SITE_PERL%%/auto/CDDB_get/autosplit.ix
 %%SITE_PERL%%/cddb.pl
+%%PERL5_MAN3%%/CDDB_get.3.gz
diff --git a/audio/p5-MIDI/pkg-plist b/audio/p5-MIDI/pkg-plist
index 7ec0187e82fb..cbad7721faa3 100644
--- a/audio/p5-MIDI/pkg-plist
+++ b/audio/p5-MIDI/pkg-plist
@@ -1,10 +1,3 @@
-%%PERL5_MAN3%%/MIDI.3.gz
-%%PERL5_MAN3%%/MIDI::Event.3.gz
-%%PERL5_MAN3%%/MIDI::Filespec.3.gz
-%%PERL5_MAN3%%/MIDI::Opus.3.gz
-%%PERL5_MAN3%%/MIDI::Score.3.gz
-%%PERL5_MAN3%%/MIDI::Simple.3.gz
-%%PERL5_MAN3%%/MIDI::Track.3.gz
 %%SITE_PERL%%/MIDI.pm
 %%SITE_PERL%%/MIDI/Event.pm
 %%SITE_PERL%%/MIDI/Filespec.pod
@@ -12,3 +5,10 @@
 %%SITE_PERL%%/MIDI/Score.pm
 %%SITE_PERL%%/MIDI/Simple.pm
 %%SITE_PERL%%/MIDI/Track.pm
+%%PERL5_MAN3%%/MIDI.3.gz
+%%PERL5_MAN3%%/MIDI::Event.3.gz
+%%PERL5_MAN3%%/MIDI::Filespec.3.gz
+%%PERL5_MAN3%%/MIDI::Opus.3.gz
+%%PERL5_MAN3%%/MIDI::Score.3.gz
+%%PERL5_MAN3%%/MIDI::Simple.3.gz
+%%PERL5_MAN3%%/MIDI::Track.3.gz
diff --git a/audio/p5-MPEG-ID3v2Tag/pkg-plist b/audio/p5-MPEG-ID3v2Tag/pkg-plist
index a124033633af..7fc855d710d4 100644
--- a/audio/p5-MPEG-ID3v2Tag/pkg-plist
+++ b/audio/p5-MPEG-ID3v2Tag/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/MPEG::ID3v2Tag.3.gz
 %%SITE_PERL%%/MPEG/ID3v2Tag.pm
+%%PERL5_MAN3%%/MPEG::ID3v2Tag.3.gz
diff --git a/audio/p5-Test-Corpus-Audio-MPD/pkg-plist b/audio/p5-Test-Corpus-Audio-MPD/pkg-plist
index 7c2898e2685f..ffc932c039a9 100644
--- a/audio/p5-Test-Corpus-Audio-MPD/pkg-plist
+++ b/audio/p5-Test-Corpus-Audio-MPD/pkg-plist
@@ -1,4 +1,3 @@
-%%PERL5_MAN3%%/Test::Corpus::Audio::MPD.3.gz
 %%SITE_PERL%%/Test/Corpus/Audio/MPD.pm
 %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/mpd.conf.template
 %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music/dir1/title-artist-album.ogg
@@ -7,3 +6,4 @@
 %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music/title-artist-album-genre.ogg
 %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music/title.ogg
 %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/playlists/test.m3u
+%%PERL5_MAN3%%/Test::Corpus::Audio::MPD.3.gz
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index 6cdf6b957274..b0b794e691e6 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -15,7 +15,6 @@ COMMENT=	Perl extension for Ogg Vorbis streams
 
 LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/audio/p5-libvorbis/pkg-plist b/audio/p5-libvorbis/pkg-plist
index 13901733df82..743c2885be49 100644
--- a/audio/p5-libvorbis/pkg-plist
+++ b/audio/p5-libvorbis/pkg-plist
@@ -1,4 +1,4 @@
-%%PERL5_MAN3%%/Ogg::Vorbis.3.gz
 %%SITE_ARCH%%/Ogg/Vorbis.pm
 %%SITE_ARCH%%/auto/Ogg/Vorbis/Vorbis.so
 %%SITE_ARCH%%/auto/Ogg/Vorbis/autosplit.ix
+%%PERL5_MAN3%%/Ogg::Vorbis.3.gz
diff --git a/audio/p5-tagged/pkg-plist b/audio/p5-tagged/pkg-plist
index 84fd0e4890a7..c893c9ee138a 100644
--- a/audio/p5-tagged/pkg-plist
+++ b/audio/p5-tagged/pkg-plist
@@ -1,9 +1,9 @@
+%%SITE_PERL%%/MP3/Tag.pm
+%%SITE_PERL%%/MP3/Tag/File.pm
+%%SITE_PERL%%/MP3/Tag/ID3v1.pm
+%%SITE_PERL%%/MP3/Tag/ID3v2.pm
 %%PERL5_MAN3%%/MP3::Tag.3.gz
 %%PERL5_MAN3%%/MP3::Tag::File.3.gz
 %%PERL5_MAN3%%/MP3::Tag::ID3v1.3.gz
 %%PERL5_MAN3%%/MP3::Tag::ID3v2-Data.3.gz
 %%PERL5_MAN3%%/MP3::Tag::ID3v2.3.gz
-%%SITE_PERL%%/MP3/Tag.pm
-%%SITE_PERL%%/MP3/Tag/File.pm
-%%SITE_PERL%%/MP3/Tag/ID3v1.pm
-%%SITE_PERL%%/MP3/Tag/ID3v2.pm