support STAGEDIR.

37 files changed, 78 insertions, 106 deletions

diff --git a/audio/p5-Audio-Beep/Makefile b/audio/p5-Audio-Beep/Makefile
index 03c97a3882a2..9f25becfb093 100644
--- a/audio/p5-Audio-Beep/Makefile
+++ b/audio/p5-Audio-Beep/Makefile
@@ -14,9 +14,6 @@ BUILD_DEPENDS=	beep:${PORTSDIR}/audio/beep
 RUN_DEPENDS=	beep:${PORTSDIR}/audio/beep
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		Audio::Beep.3 Audio::Beep::BSD::beep.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Audio-Beep/pkg-plist b/audio/p5-Audio-Beep/pkg-plist
index 58b962ad3628..a547cf94421c 100644
--- a/audio/p5-Audio-Beep/pkg-plist
+++ b/audio/p5-Audio-Beep/pkg-plist
@@ -1,9 +1,11 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Beep/.packlist
+%%PERL5_MAN3%%/Audio::Beep.3.gz
+%%PERL5_MAN3%%/Audio::Beep::BSD::beep.3.gz
 %%SITE_PERL%%/Audio/Beep.pm
 %%SITE_PERL%%/Audio/Beep.pod
 %%SITE_PERL%%/Audio/Beep/BSD/beep.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Beep
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Beep/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Beep
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
-@dirrmtry %%SITE_PERL%%/Audio/Beep/BSD
-@dirrmtry %%SITE_PERL%%/Audio/Beep
+@dirrm %%SITE_PERL%%/Audio/Beep/BSD
+@dirrm %%SITE_PERL%%/Audio/Beep
 @dirrmtry %%SITE_PERL%%/Audio
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index 53c2ca7ca5bd..3fbc00155b0f 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -14,11 +14,8 @@ COMMENT=	Perl interface to libcdaudio (cd + cddb)
 LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 CONFIGURE_ARGS=	INC="-I${LOCALBASE}/include " \
 		LIBS="-L${LOCALBASE}/lib -lcdaudio"
 
-MAN3=		Audio::CD.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Audio-CD/pkg-plist b/audio/p5-Audio-CD/pkg-plist
index 972a296aedc3..dc97a966ffde 100644
--- a/audio/p5-Audio-CD/pkg-plist
+++ b/audio/p5-Audio-CD/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Audio::CD.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Audio/CD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/.packlist
 %%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
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio
diff --git a/audio/p5-Audio-MPD/Makefile b/audio/p5-Audio-MPD/Makefile
index 139f41cb159e..8d4f3739a35c 100644
--- a/audio/p5-Audio-MPD/Makefile
+++ b/audio/p5-Audio-MPD/Makefile
@@ -22,18 +22,9 @@ BUILD_DEPENDS=	p5-Audio-MPD-Common>=0:${PORTSDIR}/audio/p5-Audio-MPD-Common \
 		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
 		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 TEST_DEPENDS=	p5-Test-Corpus-Audio-MPD>=1.113282:${PORTSDIR}/audio/p5-Test-Corpus-Audio-MPD
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	modbuild
 
-MAN1=		mpd-dynamic.1 \
-		mpd-rate.1
-MAN3=		Audio::MPD.3 \
-		Audio::MPD::Collection.3 \
-		Audio::MPD::Playlist.3 \
-		Audio::MPD::Types.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Audio-MPD/pkg-plist b/audio/p5-Audio-MPD/pkg-plist
index 3cb68d4c382b..1b1f0751637d 100644
--- a/audio/p5-Audio-MPD/pkg-plist
+++ b/audio/p5-Audio-MPD/pkg-plist
@@ -1,8 +1,14 @@
+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
-bin/mpd-dynamic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/MPD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
+man/man1/mpd-dynamic.1.gz
+man/man1/mpd-rate.1.gz
+@dirrmtry %%SITE_PERL%%/Audio/MPD
+@dirrmtry %%SITE_PERL%%/Audio
diff --git a/audio/p5-Audio-Musepack/Makefile b/audio/p5-Audio-Musepack/Makefile
index 384520fd2d45..d84ef3de1a76 100644
--- a/audio/p5-Audio-Musepack/Makefile
+++ b/audio/p5-Audio-Musepack/Makefile
@@ -15,9 +15,6 @@ BUILD_DEPENDS=	p5-MP3-Info>=1.20:${PORTSDIR}/audio/p5-MP3-Info \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		Audio::APE.3 Audio::Musepack.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Audio-Musepack/pkg-plist b/audio/p5-Audio-Musepack/pkg-plist
index fb07a1a44992..3a34addb06df 100644
--- a/audio/p5-Audio-Musepack/pkg-plist
+++ b/audio/p5-Audio-Musepack/pkg-plist
@@ -1,7 +1,9 @@
+%%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
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Musepack/.packlist
-@dirrmtry %%SITE_PERL%%/Audio
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Musepack
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Musepack
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
+@dirrmtry %%SITE_PERL%%/Audio
diff --git a/audio/p5-Audio-Scan/Makefile b/audio/p5-Audio-Scan/Makefile
index 19b1062f1db1..4743dc974f08 100644
--- a/audio/p5-Audio-Scan/Makefile
+++ b/audio/p5-Audio-Scan/Makefile
@@ -16,9 +16,6 @@ LICENSE=	GPLv2
 TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		Audio::Scan.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Audio-Scan/pkg-plist b/audio/p5-Audio-Scan/pkg-plist
index 429e737f9c6b..441c11aeb3e2 100644
--- a/audio/p5-Audio-Scan/pkg-plist
+++ b/audio/p5-Audio-Scan/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan/Scan.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan/Scan.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan/.packlist
+%%PERL5_MAN3%%/Audio::Scan.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Audio/Scan.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan/Scan.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan/Scan.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scan
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio
diff --git a/audio/p5-Audio-Scrobbler/Makefile b/audio/p5-Audio-Scrobbler/Makefile
index 05a145baceff..d4cde5c95657 100644
--- a/audio/p5-Audio-Scrobbler/Makefile
+++ b/audio/p5-Audio-Scrobbler/Makefile
@@ -16,10 +16,6 @@ BUILD_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN1=		scrobbler-helper.1
-MAN3=		Audio::Scrobbler.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Audio-Scrobbler/pkg-plist b/audio/p5-Audio-Scrobbler/pkg-plist
index 683ca435e02f..1fe9658f8ff3 100644
--- a/audio/p5-Audio-Scrobbler/pkg-plist
+++ b/audio/p5-Audio-Scrobbler/pkg-plist
@@ -1,7 +1,8 @@
 bin/scrobbler-helper
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scrobbler/.packlist
+%%PERL5_MAN3%%/Audio::Scrobbler.3.gz
 %%SITE_PERL%%/Audio/Scrobbler.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scrobbler
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scrobbler/.packlist
+man/man1/scrobbler-helper.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scrobbler
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
-@dirrmtry %%SITE_PERL%%/mach
 @dirrmtry %%SITE_PERL%%/Audio
diff --git a/audio/p5-Audio-WMA/Makefile b/audio/p5-Audio-WMA/Makefile
index 6e44b6d51b15..66494311413a 100644
--- a/audio/p5-Audio-WMA/Makefile
+++ b/audio/p5-Audio-WMA/Makefile
@@ -11,9 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fetch info from WMA audio files
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		Audio::WMA.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Audio-WMA/pkg-plist b/audio/p5-Audio-WMA/pkg-plist
index 2bfe79723099..ec41c264eeae 100644
--- a/audio/p5-Audio-WMA/pkg-plist
+++ b/audio/p5-Audio-WMA/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Audio::WMA.3.gz
 %%SITE_PERL%%/Audio/WMA.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/WMA/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/WMA
diff --git a/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
index 9a3d4dbb3228..73f7f77e32e3 100644
--- a/audio/p5-Audio-Wav/Makefile
+++ b/audio/p5-Audio-Wav/Makefile
@@ -14,9 +14,6 @@ BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		Audio::Wav.3 Audio::Wav::Read.3 Audio::Wav::Write.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Audio-Wav/pkg-plist b/audio/p5-Audio-Wav/pkg-plist
index cf6042db09d8..df50a26dd2e9 100644
--- a/audio/p5-Audio-Wav/pkg-plist
+++ b/audio/p5-Audio-Wav/pkg-plist
@@ -1,11 +1,14 @@
+%%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/Write.pm
-%%SITE_PERL%%/Audio/Wav/Write/Header.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
 %%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
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
+@dirrm %%SITE_PERL%%/Audio/Wav/Write
+@dirrm %%SITE_PERL%%/Audio/Wav
 @dirrmtry %%SITE_PERL%%/Audio
diff --git a/audio/p5-CDDB-File/Makefile b/audio/p5-CDDB-File/Makefile
index fe679fb2521c..0c7da1e336f7 100644
--- a/audio/p5-CDDB-File/Makefile
+++ b/audio/p5-CDDB-File/Makefile
@@ -12,9 +12,6 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse a CDDB/freedb data file
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		CDDB::File.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-CDDB-File/pkg-plist b/audio/p5-CDDB-File/pkg-plist
index 2c936d15d2b7..c6fd0452ad5d 100644
--- a/audio/p5-CDDB-File/pkg-plist
+++ b/audio/p5-CDDB-File/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/CDDB::File.3.gz
 %%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
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB
+@dirrmtry %%SITE_PERL%%/CDDB
diff --git a/audio/p5-CDDB/Makefile b/audio/p5-CDDB/Makefile
index ad83736ecce2..c62ce1e3e858 100644
--- a/audio/p5-CDDB/Makefile
+++ b/audio/p5-CDDB/Makefile
@@ -11,9 +11,6 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	High-level interface to the Compact Disc Database
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		CDDB.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-CDDB/pkg-plist b/audio/p5-CDDB/pkg-plist
index 4d3bcf673860..53cc27a0bf24 100644
--- a/audio/p5-CDDB/pkg-plist
+++ b/audio/p5-CDDB/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CDDB.3.gz
 %%SITE_PERL%%/CDDB.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB
diff --git a/audio/p5-CDDB_get/Makefile b/audio/p5-CDDB_get/Makefile
index d7e3a2604c05..39ecf512d427 100644
--- a/audio/p5-CDDB_get/Makefile
+++ b/audio/p5-CDDB_get/Makefile
@@ -17,9 +17,6 @@ LICENSE=	GPLv2
 PORTSCOUT=	skipv:2.28.1
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		CDDB_get.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-CDDB_get/pkg-plist b/audio/p5-CDDB_get/pkg-plist
index f46ae7a84323..d9be12c8755e 100644
--- a/audio/p5-CDDB_get/pkg-plist
+++ b/audio/p5-CDDB_get/pkg-plist
@@ -1,4 +1,5 @@
 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
@@ -6,5 +7,5 @@ bin/cddb.pl
 %%SITE_PERL%%/cddb.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB_get/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB_get
-@dirrm %%SITE_PERL%%/auto/CDDB_cache
 @dirrm %%SITE_PERL%%/auto/CDDB_get
+@dirrm %%SITE_PERL%%/auto/CDDB_cache
diff --git a/audio/p5-MIDI/Makefile b/audio/p5-MIDI/Makefile
index 679e75bbb16b..65ff3d63c3be 100644
--- a/audio/p5-MIDI/Makefile
+++ b/audio/p5-MIDI/Makefile
@@ -14,12 +14,8 @@ COMMENT=	Perl5 module for handling MIDI files
 OPTIONS_DEFINE=	GD
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		MIDI.3 MIDI::Event.3 MIDI::Filespec.3 MIDI::Opus.3 MIDI::Score.3 \
-		MIDI::Simple.3 MIDI::Track.3
-
 GD_BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 GD_RUN_DEPENDS=		p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 
diff --git a/audio/p5-MIDI/pkg-plist b/audio/p5-MIDI/pkg-plist
index b09cf4370b7e..51934114a2cd 100644
--- a/audio/p5-MIDI/pkg-plist
+++ b/audio/p5-MIDI/pkg-plist
@@ -1,3 +1,10 @@
+%%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
diff --git a/audio/p5-MP3-ID3v1Tag/Makefile b/audio/p5-MP3-ID3v1Tag/Makefile
index b14c8c525962..79e7c1087afc 100644
--- a/audio/p5-MP3-ID3v1Tag/Makefile
+++ b/audio/p5-MP3-ID3v1Tag/Makefile
@@ -11,9 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit ID3v1 Tags from an Audio MPEG Layer 3
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		MP3::ID3v1Tag.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-MP3-ID3v1Tag/pkg-plist b/audio/p5-MP3-ID3v1Tag/pkg-plist
index 5271028aab42..601276c6a5bf 100644
--- a/audio/p5-MP3-ID3v1Tag/pkg-plist
+++ b/audio/p5-MP3-ID3v1Tag/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/MP3::ID3v1Tag.3.gz
 %%SITE_PERL%%/MP3/ID3v1Tag.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag
diff --git a/audio/p5-MPEG-ID3v2Tag/Makefile b/audio/p5-MPEG-ID3v2Tag/Makefile
index c9d4818025ca..8d6b9d9222d2 100644
--- a/audio/p5-MPEG-ID3v2Tag/Makefile
+++ b/audio/p5-MPEG-ID3v2Tag/Makefile
@@ -11,9 +11,6 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that provides a way to write/read ID3 v2.3 tags
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		MPEG::ID3v2Tag.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-MPEG-ID3v2Tag/pkg-plist b/audio/p5-MPEG-ID3v2Tag/pkg-plist
index 5e0ddc515d60..a835467580f6 100644
--- a/audio/p5-MPEG-ID3v2Tag/pkg-plist
+++ b/audio/p5-MPEG-ID3v2Tag/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/MPEG::ID3v2Tag.3.gz
 %%SITE_PERL%%/MPEG/ID3v2Tag.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MPEG/ID3v2Tag/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MPEG/ID3v2Tag
diff --git a/audio/p5-Net-FreeDB/Makefile b/audio/p5-Net-FreeDB/Makefile
index b5379325edc7..d4361c11000a 100644
--- a/audio/p5-Net-FreeDB/Makefile
+++ b/audio/p5-Net-FreeDB/Makefile
@@ -15,9 +15,6 @@ BUILD_DEPENDS=	p5-CDDB-File>=0:${PORTSDIR}/audio/p5-CDDB-File
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		Net::FreeDB.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Test-Corpus-Audio-MPD/Makefile b/audio/p5-Test-Corpus-Audio-MPD/Makefile
index 92c751c66a58..8df128a8de1f 100644
--- a/audio/p5-Test-Corpus-Audio-MPD/Makefile
+++ b/audio/p5-Test-Corpus-Audio-MPD/Makefile
@@ -16,9 +16,6 @@ BUILD_DEPENDS=	p5-File-ShareDir-PathClass>0:${PORTSDIR}/devel/p5-File-ShareDir-P
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	modbuild
 
-MAN3=		Test::Corpus::Audio::MPD.3
-
 .include <bsd.port.mk>
diff --git a/audio/p5-Test-Corpus-Audio-MPD/pkg-plist b/audio/p5-Test-Corpus-Audio-MPD/pkg-plist
index 30451778da40..62c8d5996478 100644
--- a/audio/p5-Test-Corpus-Audio-MPD/pkg-plist
+++ b/audio/p5-Test-Corpus-Audio-MPD/pkg-plist
@@ -1,17 +1,19 @@
+%%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
 %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music/dir1/title-artist.ogg
 %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music/dir2/album.ogg
 %%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
-%%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/mpd.conf.template
-@dirrm %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music/dir1
+@dirrm %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/playlists
 @dirrm %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music/dir2
+@dirrm %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music/dir1
 @dirrm %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/music
-@dirrm %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD/playlists
 @dirrm %%SITE_PERL%%/auto/share/dist/Test-Corpus-Audio-MPD
 @dirrmtry %%SITE_PERL%%/auto/share/dist
+@dirrmtry %%SITE_PERL%%/auto/share
 @dirrm %%SITE_PERL%%/Test/Corpus/Audio
 @dirrm %%SITE_PERL%%/Test/Corpus
 @dirrmtry %%SITE_PERL%%/Test
diff --git a/audio/p5-Xmms/Makefile b/audio/p5-Xmms/Makefile
index 1de0c0a0c2c3..3ecd15ac9cec 100644
--- a/audio/p5-Xmms/Makefile
+++ b/audio/p5-Xmms/Makefile
@@ -17,16 +17,9 @@ BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms \
 		p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 REINPLACE_ARGS=	-i ''
 
-MAN3=		Bundle::Xmms.3 \
-		Xmms.3 \
-		Xmms::Config.3 \
-		Xmms::Remote.3 \
-		Xmms::SongChange.3
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|MPEG::MP3Info|MP3::Info|g' \
 		${WRKSRC}/Makefile.PL ${WRKSRC}/Remote/Remote.pm \
diff --git a/audio/p5-Xmms/pkg-plist b/audio/p5-Xmms/pkg-plist
index 5d7d23024fd9..6b03e1c8da36 100644
--- a/audio/p5-Xmms/pkg-plist
+++ b/audio/p5-Xmms/pkg-plist
@@ -1,3 +1,8 @@
+%%PERL5_MAN3%%/Bundle::Xmms.3.gz
+%%PERL5_MAN3%%/Xmms.3.gz
+%%PERL5_MAN3%%/Xmms::Config.3.gz
+%%PERL5_MAN3%%/Xmms::Remote.3.gz
+%%PERL5_MAN3%%/Xmms::SongChange.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Xmms.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Xmms.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Xmms/Config.pm
@@ -11,10 +16,10 @@
 %%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/Remote
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Config
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms-Perl
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xmms
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Xmms
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index 8abfbe863957..f4a911654ae0 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -17,11 +17,8 @@ LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=		Ogg::Vorbis.3
-
 post-extract:
 	@${RM} -rf ${WRKSRC}/blib ${WRKSRC}/pm_to_blib
 
diff --git a/audio/p5-libvorbis/pkg-plist b/audio/p5-libvorbis/pkg-plist
index cd888ba6e4f7..85bb39f81a7e 100644
--- a/audio/p5-libvorbis/pkg-plist
+++ b/audio/p5-libvorbis/pkg-plist
@@ -1,8 +1,9 @@
+%%PERL5_MAN3%%/Ogg::Vorbis.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Ogg/Vorbis.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Vorbis.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Vorbis.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Vorbis.so
 %%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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Ogg
diff --git a/audio/p5-tagged/Makefile b/audio/p5-tagged/Makefile
index 18d151fcbcbf..5866124ee18d 100644
--- a/audio/p5-tagged/Makefile
+++ b/audio/p5-tagged/Makefile
@@ -12,12 +12,8 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read, change, and write different tags of MP3 audio files
 
 USES=		perl5
-NO_STAGE=	yes
 USE_PERL5=	configure
 
-MAN3=	MP3::Tag::ID3v2.3 MP3::Tag.3 MP3::Tag::File.3 \
-	MP3::Tag::ID3v2-Data.3 MP3::Tag::ID3v1.3
-
 CONFLICTS=	p5-MP3-Tag-0.*
 
 .include <bsd.port.mk>
diff --git a/audio/p5-tagged/pkg-plist b/audio/p5-tagged/pkg-plist
index 68b2a9ba90ef..b131985a6009 100644
--- a/audio/p5-tagged/pkg-plist
+++ b/audio/p5-tagged/pkg-plist
@@ -1,9 +1,14 @@
+%%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
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3
 @dirrmtry %%SITE_PERL%%/MP3/Tag
 @dirrmtry %%SITE_PERL%%/MP3