Support STAGEDIR.

32 files changed, 131 insertions, 150 deletions

diff --git a/sysutils/p5-Brackup/Makefile b/sysutils/p5-Brackup/Makefile
index f543b01..6b3b25b 100644
--- a/sysutils/p5-Brackup/Makefile
+++ b/sysutils/p5-Brackup/Makefile
@@ -26,30 +26,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		brackup.1 \
-		brackup-mount.1 \
-		brackup-restore.1 \
-		brackup-target.1 \
-		brackup-verify-inventory.1
-MAN3=		Brackup.3 \
-		Brackup::Chunker::MP3.3 \
-		Brackup::Config.3 \
-		Brackup::Dict::Null.3 \
-		Brackup::Dict::SQLite.3 \
-		Brackup::Dict::SQLite2.3 \
-		Brackup::DigestCache.3 \
-		Brackup::InventoryDatabase.3 \
-		Brackup::Manual::Overview.3 \
-		Brackup::Mount.3 \
-		Brackup::Root.3 \
-		Brackup::Target.3 \
-		Brackup::Target::Amazon.3 \
-		Brackup::Target::CloudFiles.3 \
-		Brackup::Target::Filesystem.3 \
-		Brackup::Target::Ftp.3 \
-		Brackup::Target::GoogleAppEngine.3 \
-		Brackup::Target::Riak.3 \
-		Brackup::Target::Sftp.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Brackup/pkg-plist b/sysutils/p5-Brackup/pkg-plist
index 1af8d37..8230b8d 100644
--- a/sysutils/p5-Brackup/pkg-plist
+++ b/sysutils/p5-Brackup/pkg-plist
@@ -1,4 +1,27 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Brackup/.packlist
+bin/brackup
+bin/brackup-mount
+bin/brackup-restore
+bin/brackup-target
+bin/brackup-verify-inventory
+%%PERL5_MAN3%%/Brackup.3.gz
+%%PERL5_MAN3%%/Brackup::Chunker::MP3.3.gz
+%%PERL5_MAN3%%/Brackup::Config.3.gz
+%%PERL5_MAN3%%/Brackup::Dict::Null.3.gz
+%%PERL5_MAN3%%/Brackup::Dict::SQLite.3.gz
+%%PERL5_MAN3%%/Brackup::Dict::SQLite2.3.gz
+%%PERL5_MAN3%%/Brackup::DigestCache.3.gz
+%%PERL5_MAN3%%/Brackup::InventoryDatabase.3.gz
+%%PERL5_MAN3%%/Brackup::Manual::Overview.3.gz
+%%PERL5_MAN3%%/Brackup::Mount.3.gz
+%%PERL5_MAN3%%/Brackup::Root.3.gz
+%%PERL5_MAN3%%/Brackup::Target.3.gz
+%%PERL5_MAN3%%/Brackup::Target::Amazon.3.gz
+%%PERL5_MAN3%%/Brackup::Target::CloudFiles.3.gz
+%%PERL5_MAN3%%/Brackup::Target::Filesystem.3.gz
+%%PERL5_MAN3%%/Brackup::Target::Ftp.3.gz
+%%PERL5_MAN3%%/Brackup::Target::GoogleAppEngine.3.gz
+%%PERL5_MAN3%%/Brackup::Target::Riak.3.gz
+%%PERL5_MAN3%%/Brackup::Target::Sftp.3.gz
 %%SITE_PERL%%/Brackup.pm
 %%SITE_PERL%%/Brackup/Backup.pm
 %%SITE_PERL%%/Brackup/BackupStats.pm
@@ -10,10 +33,10 @@
 %%SITE_PERL%%/Brackup/ConfigSection.pm
 %%SITE_PERL%%/Brackup/Decrypt.pm
 %%SITE_PERL%%/Brackup/DecryptedFile.pm
-%%SITE_PERL%%/Brackup/Dict/SQLite.pm
-%%SITE_PERL%%/Brackup/Dict/SQLite2.pm
 %%SITE_PERL%%/Brackup/Dict/DBM.pm
 %%SITE_PERL%%/Brackup/Dict/Null.pm
+%%SITE_PERL%%/Brackup/Dict/SQLite.pm
+%%SITE_PERL%%/Brackup/Dict/SQLite2.pm
 %%SITE_PERL%%/Brackup/DigestCache.pm
 %%SITE_PERL%%/Brackup/File.pm
 %%SITE_PERL%%/Brackup/GPGProcManager.pm
@@ -38,14 +61,15 @@
 %%SITE_PERL%%/Brackup/TargetBackupStatInfo.pm
 %%SITE_PERL%%/Brackup/Test.pm
 %%SITE_PERL%%/Brackup/Util.pm
-bin/brackup
-bin/brackup-mount
-bin/brackup-restore
-bin/brackup-target
-bin/brackup-verify-inventory
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Brackup/.packlist
+man/man1/brackup-mount.1.gz
+man/man1/brackup-restore.1.gz
+man/man1/brackup-target.1.gz
+man/man1/brackup-verify-inventory.1.gz
+man/man1/brackup.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Brackup
 @dirrmtry %%SITE_PERL%%/Brackup/Target
 @dirrmtry %%SITE_PERL%%/Brackup/Manual
 @dirrmtry %%SITE_PERL%%/Brackup/Dict
 @dirrmtry %%SITE_PERL%%/Brackup/Chunker
 @dirrmtry %%SITE_PERL%%/Brackup
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Brackup
diff --git a/sysutils/p5-File-DirCompare/Makefile b/sysutils/p5-File-DirCompare/Makefile
index da934df..3fab392 100644
--- a/sysutils/p5-File-DirCompare/Makefile
+++ b/sysutils/p5-File-DirCompare/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module to compare two directories using callbacks
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		File::DirCompare.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-File-DirCompare/pkg-plist b/sysutils/p5-File-DirCompare/pkg-plist
index 37563d5..38bfd3a 100644
--- a/sysutils/p5-File-DirCompare/pkg-plist
+++ b/sysutils/p5-File-DirCompare/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/File::DirCompare.3.gz
 %%SITE_PERL%%/File/DirCompare.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirCompare/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirCompare
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirCompare
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
 @dirrmtry %%SITE_PERL%%/File
diff --git a/sysutils/p5-File-Listing/Makefile b/sysutils/p5-File-Listing/Makefile
index b01350c..7c35241 100644
--- a/sysutils/p5-File-Listing/Makefile
+++ b/sysutils/p5-File-Listing/Makefile
@@ -21,7 +21,4 @@ CONFLICTS=	p5-libwww-5*
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		File::Listing.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-File-Listing/pkg-plist b/sysutils/p5-File-Listing/pkg-plist
index 34a9dce..e377510 100644
--- a/sysutils/p5-File-Listing/pkg-plist
+++ b/sysutils/p5-File-Listing/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/File::Listing.3.gz
 %%SITE_PERL%%/File/Listing.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Listing/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Listing
-@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Listing
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/sysutils/p5-File-Next/Makefile b/sysutils/p5-File-Next/Makefile
index 58b79a3..52f46a6 100644
--- a/sysutils/p5-File-Next/Makefile
+++ b/sysutils/p5-File-Next/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		File::Next.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-File-Next/pkg-plist b/sysutils/p5-File-Next/pkg-plist
index fe1c956..52d0ae9 100644
--- a/sysutils/p5-File-Next/pkg-plist
+++ b/sysutils/p5-File-Next/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/File::Next.3.gz
 %%SITE_PERL%%/File/Next.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Next/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Next
diff --git a/sysutils/p5-Filesys-DiskFree/Makefile b/sysutils/p5-Filesys-DiskFree/Makefile
index 3c5c020..fb568bf 100644
--- a/sysutils/p5-Filesys-DiskFree/Makefile
+++ b/sysutils/p5-Filesys-DiskFree/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Perl equivalent of df(2)
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Filesys::DiskFree.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Filesys-DiskFree/pkg-plist b/sysutils/p5-Filesys-DiskFree/pkg-plist
index 02acd58..c2d33f6 100644
--- a/sysutils/p5-Filesys-DiskFree/pkg-plist
+++ b/sysutils/p5-Filesys-DiskFree/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskFree/.packlist
+%%PERL5_MAN3%%/Filesys::DiskFree.3.gz
 %%SITE_PERL%%/Filesys/DiskFree.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskFree
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
-@dirrm %%SITE_PERL%%/Filesys
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskFree/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/DiskFree
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
+@dirrmtry %%SITE_PERL%%/Filesys
diff --git a/sysutils/p5-Iterator-File/Makefile b/sysutils/p5-Iterator-File/Makefile
index aea7869..8439e03 100644
--- a/sysutils/p5-Iterator-File/Makefile
+++ b/sysutils/p5-Iterator-File/Makefile
@@ -12,14 +12,5 @@ COMMENT=	File iterator, optionally stateful and verbose
 
 USES=		perl5
 USE_PERL5=	configure
-MAN3=		Iterator::File::Status.3 \
-		Iterator::File::Source::FlatFile.3 \
-		Iterator::File::Utility.3 \
-		Iterator::File::State::Interface.3 \
-		Iterator::File::Source::Interface.3 \
-		Iterator::File::State::TempFile.3 \
-		Iterator::File.3 \
-		Iterator::File::State::IPCShareable.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Iterator-File/pkg-plist b/sysutils/p5-Iterator-File/pkg-plist
index 4b9313d..40cadb8 100644
--- a/sysutils/p5-Iterator-File/pkg-plist
+++ b/sysutils/p5-Iterator-File/pkg-plist
@@ -1,12 +1,20 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/File/.packlist
+%%PERL5_MAN3%%/Iterator::File.3.gz
+%%PERL5_MAN3%%/Iterator::File::Source::FlatFile.3.gz
+%%PERL5_MAN3%%/Iterator::File::Source::Interface.3.gz
+%%PERL5_MAN3%%/Iterator::File::State::IPCShareable.3.gz
+%%PERL5_MAN3%%/Iterator::File::State::Interface.3.gz
+%%PERL5_MAN3%%/Iterator::File::State::TempFile.3.gz
+%%PERL5_MAN3%%/Iterator::File::Status.3.gz
+%%PERL5_MAN3%%/Iterator::File::Utility.3.gz
 %%SITE_PERL%%/Iterator/File.pm
-%%SITE_PERL%%/Iterator/File/Status.pm
-%%SITE_PERL%%/Iterator/File/Utility.pm
 %%SITE_PERL%%/Iterator/File/Source/FlatFile.pm
 %%SITE_PERL%%/Iterator/File/Source/Interface.pm
+%%SITE_PERL%%/Iterator/File/State/IPCShareable.pm
 %%SITE_PERL%%/Iterator/File/State/Interface.pm
 %%SITE_PERL%%/Iterator/File/State/TempFile.pm
-%%SITE_PERL%%/Iterator/File/State/IPCShareable.pm
+%%SITE_PERL%%/Iterator/File/Status.pm
+%%SITE_PERL%%/Iterator/File/Utility.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/File/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/File
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator
 @dirrmtry %%SITE_PERL%%/Iterator/File/State
diff --git a/sysutils/p5-Schedule-Load/Makefile b/sysutils/p5-Schedule-Load/Makefile
index 60f3603..615e3d6 100644
--- a/sysutils/p5-Schedule-Load/Makefile
+++ b/sysutils/p5-Schedule-Load/Makefile
@@ -23,23 +23,11 @@ MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		rschedule.1 slchoosed.1 slpolice.1 slreportd.1 slrsh.1 \
-		slchoosed_watchd.1
-MAN3=		Schedule::Load.3 Schedule::Load::Chooser.3 \
-		Schedule::Load::FakeReporter.3 Schedule::Load::Hold.3 \
-		Schedule::Load::Hosts.3 Schedule::Load::Hosts::Host.3 \
-		Schedule::Load::Hosts::Proc.3 Schedule::Load::Reporter.3 \
-		Schedule::Load::ResourceReq.3 Schedule::Load::Safe.3 \
-		Schedule::Load::Schedule.3 \
-		Schedule::Load::Reporter::Disk.3 Schedule::Load::Reporter::Filesys.3 \
-		Schedule::Load::Reporter::Network.3
-
-NO_STAGE=	yes
 post-install:
 .ifndef(NOPORTEXAMPLES)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}/init.d
-	${INSTALL_SCRIPT} ${WRKSRC}/init.d/* ${EXAMPLESDIR}/init.d
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/init.d
+	${INSTALL_SCRIPT} ${WRKSRC}/init.d/* ${STAGEDIR}${EXAMPLESDIR}/init.d
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Schedule-Load/pkg-plist b/sysutils/p5-Schedule-Load/pkg-plist
index ce69413..d9076d9 100644
--- a/sysutils/p5-Schedule-Load/pkg-plist
+++ b/sysutils/p5-Schedule-Load/pkg-plist
@@ -1,10 +1,23 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Load/.packlist
 bin/rschedule
 bin/slchoosed
 bin/slchoosed_watchd
 bin/slpolice
 bin/slreportd
 bin/slrsh
+%%PERL5_MAN3%%/Schedule::Load.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Chooser.3.gz
+%%PERL5_MAN3%%/Schedule::Load::FakeReporter.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Hold.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Hosts.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Hosts::Host.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Hosts::Proc.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Reporter.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Reporter::Disk.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Reporter::Filesys.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Reporter::Network.3.gz
+%%PERL5_MAN3%%/Schedule::Load::ResourceReq.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Safe.3.gz
+%%PERL5_MAN3%%/Schedule::Load::Schedule.3.gz
 %%SITE_PERL%%/Schedule/Load.pm
 %%SITE_PERL%%/Schedule/Load/Chooser.pm
 %%SITE_PERL%%/Schedule/Load/FakeReporter.pm
@@ -13,27 +26,33 @@ bin/slrsh
 %%SITE_PERL%%/Schedule/Load/Hosts/Host.pm
 %%SITE_PERL%%/Schedule/Load/Hosts/Proc.pm
 %%SITE_PERL%%/Schedule/Load/Reporter.pm
+%%SITE_PERL%%/Schedule/Load/Reporter/Disk.pm
+%%SITE_PERL%%/Schedule/Load/Reporter/Filesys.pm
+%%SITE_PERL%%/Schedule/Load/Reporter/Network.pm
 %%SITE_PERL%%/Schedule/Load/ResourceReq.pm
 %%SITE_PERL%%/Schedule/Load/Safe.pm
 %%SITE_PERL%%/Schedule/Load/Schedule.pm
-%%SITE_PERL%%/Schedule/Load/Reporter/Filesys.pm
-%%SITE_PERL%%/Schedule/Load/Reporter/Disk.pm
-%%SITE_PERL%%/Schedule/Load/Reporter/Network.pm
 %%SITE_PERL%%/auto/Schedule/Load/Hosts/Host/autosplit.ix
 %%SITE_PERL%%/auto/Schedule/Load/Hosts/Proc/autosplit.ix
-@dirrmtry lib/rschedule
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Load/.packlist
+man/man1/rschedule.1.gz
+man/man1/slchoosed.1.gz
+man/man1/slchoosed_watchd.1.gz
+man/man1/slpolice.1.gz
+man/man1/slreportd.1.gz
+man/man1/slrsh.1.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.d/slchoosed
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.d/slreportd
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/init.d
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Load
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule
-@dirrm %%SITE_PERL%%/Schedule/Load/Reporter
-@dirrmtry %%SITE_PERL%%/Schedule/Load/Hosts
-@dirrmtry %%SITE_PERL%%/Schedule/Load
-@dirrmtry %%SITE_PERL%%/Schedule
-@dirrmtry %%SITE_PERL%%/auto/Schedule/Load/Hosts/Host
 @dirrmtry %%SITE_PERL%%/auto/Schedule/Load/Hosts/Proc
+@dirrmtry %%SITE_PERL%%/auto/Schedule/Load/Hosts/Host
 @dirrmtry %%SITE_PERL%%/auto/Schedule/Load/Hosts
 @dirrmtry %%SITE_PERL%%/auto/Schedule/Load
 @dirrmtry %%SITE_PERL%%/auto/Schedule
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.d/slchoosed
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.d/slreportd
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/init.d
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry %%SITE_PERL%%/Schedule/Load/Reporter
+@dirrmtry %%SITE_PERL%%/Schedule/Load/Hosts
+@dirrmtry %%SITE_PERL%%/Schedule/Load
+@dirrmtry %%SITE_PERL%%/Schedule
diff --git a/sysutils/p5-Shell-Command/Makefile b/sysutils/p5-Shell-Command/Makefile
index eed3eb9..4d5242e 100644
--- a/sysutils/p5-Shell-Command/Makefile
+++ b/sysutils/p5-Shell-Command/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Cross-platform functions emulating common shell commands
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Shell::Command.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Shell-Command/pkg-plist b/sysutils/p5-Shell-Command/pkg-plist
index c9ca81c..790981a 100644
--- a/sysutils/p5-Shell-Command/pkg-plist
+++ b/sysutils/p5-Shell-Command/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Command/.packlist
+%%PERL5_MAN3%%/Shell::Command.3.gz
 %%SITE_PERL%%/Shell/Command.pm
-@dirrmtry %%SITE_PERL%%/Shell
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Command/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Command
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell
+@dirrmtry %%SITE_PERL%%/Shell
diff --git a/sysutils/p5-Sys-Gamin/Makefile b/sysutils/p5-Sys-Gamin/Makefile
index 4e326ff..37e8e8b 100644
--- a/sysutils/p5-Sys-Gamin/Makefile
+++ b/sysutils/p5-Sys-Gamin/Makefile
@@ -14,10 +14,7 @@ COMMENT=	Perl interface to Gamin (File Access Monitor implementation)
 USES=		perl5
 USE_PERL5=	configure
 USE_FAM=	yes
-MAN1=	gamin-monitor.1
-MAN3=	Sys::Gamin.3
 
-NO_STAGE=	yes
 pre-configure:
 	# Pass in include in LOCALBASE
 	${PERL} -pi -e 'm/LIBS =>/ && print "  INC => \"-I${LOCALBASE}/include\",\n"' ${WRKSRC}/Makefile.PL
diff --git a/sysutils/p5-Sys-Gamin/pkg-plist b/sysutils/p5-Sys-Gamin/pkg-plist
index 211fd11..36a9786 100644
--- a/sysutils/p5-Sys-Gamin/pkg-plist
+++ b/sysutils/p5-Sys-Gamin/pkg-plist
@@ -1,20 +1,22 @@
 bin/gamin-monitor
+%%PERL5_MAN3%%/Sys::Gamin.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Gamin.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/Gamin.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/Gamin.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Gamin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/pending.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/next_event.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/monitor.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/check_monitored.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/Gamin.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/cancel.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/check_monitored.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/monitor.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/monitored.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/suspended.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/suspend.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/new.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/next_event.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/pending.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/resume.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/suspend.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/suspended.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/which.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin
+man/man1/gamin-monitor.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
diff --git a/sysutils/p5-Sysadm-Install/Makefile b/sysutils/p5-Sysadm-Install/Makefile
index fcb6a07..478a0b7 100644
--- a/sysutils/p5-Sysadm-Install/Makefile
+++ b/sysutils/p5-Sysadm-Install/Makefile
@@ -21,7 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sysadm::Install.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Sysadm-Install/pkg-plist b/sysutils/p5-Sysadm-Install/pkg-plist
index 8215778..e558b2b 100644
--- a/sysutils/p5-Sysadm-Install/pkg-plist
+++ b/sysutils/p5-Sysadm-Install/pkg-plist
@@ -1,6 +1,7 @@
 bin/one-liner
+%%PERL5_MAN3%%/Sysadm::Install.3.gz
 %%SITE_PERL%%/Sysadm/Install.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sysadm/Install/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sysadm/Install
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sysadm/Install
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sysadm
 @dirrmtry %%SITE_PERL%%/Sysadm
diff --git a/sysutils/p5-Tie-Syslog/Makefile b/sysutils/p5-Tie-Syslog/Makefile
index dfd3c0d..66a9ba2 100644
--- a/sysutils/p5-Tie-Syslog/Makefile
+++ b/sysutils/p5-Tie-Syslog/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Tie a filehandle to Syslog
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tie::Syslog.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Tie-Syslog/pkg-plist b/sysutils/p5-Tie-Syslog/pkg-plist
index ade874f..dff31a8 100644
--- a/sysutils/p5-Tie-Syslog/pkg-plist
+++ b/sysutils/p5-Tie-Syslog/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog/.packlist
+%%PERL5_MAN3%%/Tie::Syslog.3.gz
 %%SITE_PERL%%/Tie/Syslog.pm
 %%SITE_PERL%%/Tie/Syslog.pod
-@dirrmtry %%SITE_PERL%%/Tie
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/sysutils/p5-Unix-ConfigFile/Makefile b/sysutils/p5-Unix-ConfigFile/Makefile
index 1f6c7bb..cb42928 100644
--- a/sysutils/p5-Unix-ConfigFile/Makefile
+++ b/sysutils/p5-Unix-ConfigFile/Makefile
@@ -13,9 +13,4 @@ COMMENT=	Perl modules that provides a simple interface to reading /etc files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unix::GroupFile.3 Unix::AliasFile.3 \
-		Unix::ConfigFile.3 \
-		Unix::PasswdFile.3 Unix::AutomountFile.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Unix-ConfigFile/pkg-plist b/sysutils/p5-Unix-ConfigFile/pkg-plist
index e0a9ed6..6d24bf9 100644
--- a/sysutils/p5-Unix-ConfigFile/pkg-plist
+++ b/sysutils/p5-Unix-ConfigFile/pkg-plist
@@ -1,9 +1,14 @@
+%%PERL5_MAN3%%/Unix::AliasFile.3.gz
+%%PERL5_MAN3%%/Unix::AutomountFile.3.gz
+%%PERL5_MAN3%%/Unix::ConfigFile.3.gz
+%%PERL5_MAN3%%/Unix::GroupFile.3.gz
+%%PERL5_MAN3%%/Unix::PasswdFile.3.gz
 %%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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
 @dirrmtry %%SITE_PERL%%/Unix
diff --git a/sysutils/p5-Unix-Syslog/Makefile b/sysutils/p5-Unix-Syslog/Makefile
index d60a18f..c2ff36e 100644
--- a/sysutils/p5-Unix-Syslog/Makefile
+++ b/sysutils/p5-Unix-Syslog/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl5 interface to the UNIX syslog(3) calls
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unix::Syslog.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Unix-Syslog/pkg-plist b/sysutils/p5-Unix-Syslog/pkg-plist
index bdbd871..6a29117 100644
--- a/sysutils/p5-Unix-Syslog/pkg-plist
+++ b/sysutils/p5-Unix-Syslog/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Unix::Syslog.3.gz
 %%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
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/Syslog.so
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix
diff --git a/sysutils/p5-User/Makefile b/sysutils/p5-User/Makefile
index 365b9ec..7db3fb0 100644
--- a/sysutils/p5-User/Makefile
+++ b/sysutils/p5-User/Makefile
@@ -13,7 +13,4 @@ COMMENT=	User - API for locating user information regardless of OS
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		User.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-User/pkg-plist b/sysutils/p5-User/pkg-plist
index 1761c1a..76ccb7d 100644
--- a/sysutils/p5-User/pkg-plist
+++ b/sysutils/p5-User/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/User.3.gz
 %%SITE_PERL%%/User.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/User/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/User
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/User
diff --git a/sysutils/p5-arclog/Makefile b/sysutils/p5-arclog/Makefile
index 16d0250..ec2f4c6 100644
--- a/sysutils/p5-arclog/Makefile
+++ b/sysutils/p5-arclog/Makefile
@@ -20,11 +20,5 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-MAN1=		arclog.1
 
-PLIST_FILES=	bin/arclog \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/arclog/.packlist
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/arclog
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-arclog/pkg-plist b/sysutils/p5-arclog/pkg-plist
new file mode 100644
index 0000000..728e0a7
--- /dev/null
+++ b/sysutils/p5-arclog/pkg-plist
@@ -0,0 +1,4 @@
+bin/arclog
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/arclog/.packlist
+man/man1/arclog.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/arclog
diff --git a/sysutils/p5-reslog/Makefile b/sysutils/p5-reslog/Makefile
index cd9e242..b61ac37 100644
--- a/sysutils/p5-reslog/Makefile
+++ b/sysutils/p5-reslog/Makefile
@@ -19,11 +19,5 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-MAN1=		reslog.1
 
-PLIST_FILES=	bin/reslog \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/reslog/.packlist
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/reslog
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-reslog/pkg-plist b/sysutils/p5-reslog/pkg-plist
new file mode 100644
index 0000000..ae95f4d
--- /dev/null
+++ b/sysutils/p5-reslog/pkg-plist
@@ -0,0 +1,4 @@
+bin/reslog
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/reslog/.packlist
+man/man1/reslog.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/reslog