4 files changed, 39 insertions, 47 deletions

diff --git a/irc/p5-POE-Component-IRC/Makefile b/irc/p5-POE-Component-IRC/Makefile
index 9c8dfce58a1c..d01ebeb5dd0b 100644
--- a/irc/p5-POE-Component-IRC/Makefile
+++ b/irc/p5-POE-Component-IRC/Makefile
@@ -30,50 +30,8 @@ USE_PERL5=	configure
 
 PORTEXAMPLES=	*
 
-MAN3=		POE::Component::IRC.3 \
-		POE::Component::IRC::Common.3 \
-		POE::Component::IRC::Constants.3 \
-		POE::Component::IRC::Plugin.3 \
-		POE::Component::IRC::Plugin::AutoJoin.3 \
-		POE::Component::IRC::Plugin::BotAddressed.3 \
-		POE::Component::IRC::Plugin::BotTraffic.3 \
-		POE::Component::IRC::Plugin::DCC.3 \
-		POE::Component::IRC::Plugin::CTCP.3 \
-		POE::Component::IRC::Plugin::Connector.3 \
-		POE::Component::IRC::Plugin::Console.3 \
-		POE::Component::IRC::Plugin::CycleEmpty.3 \
-		POE::Component::IRC::Plugin::FollowTail.3 \
-		POE::Component::IRC::Plugin::ISupport.3 \
-		POE::Component::IRC::Plugin::Logger.3 \
-		POE::Component::IRC::Plugin::NickReclaim.3 \
-		POE::Component::IRC::Plugin::NickServID.3 \
-		POE::Component::IRC::Plugin::PlugMan.3 \
-		POE::Component::IRC::Plugin::Proxy.3 \
-		POE::Component::IRC::Plugin::Whois.3 \
-		POE::Component::IRC::Projects.3 \
-		POE::Component::IRC::Qnet.3 \
-		POE::Component::IRC::Qnet::State.3 \
-		POE::Component::IRC::State.3 \
-		POE::Component::IRC::Cookbook::Reload.3 \
-		POE::Component::IRC::Cookbook::Seen.3 \
-		POE::Component::IRC::Cookbook::Translator.3 \
-		POE::Component::IRC::Cookbook::Disconnecting.3 \
-		POE::Component::IRC::Cookbook::BasicBot.3 \
-		POE::Component::IRC::Cookbook::Gtk2.3 \
-		POE::Component::IRC::Cookbook.3 \
-		POE::Component::IRC::Cookbook::Resolver.3 \
-		POE::Component::IRC::Cookbook::Hailo.3 \
-		POE::Component::IRC::Plugin::BotCommand.3 \
-		POE::Filter::IRC.3 \
-		POE::Filter::IRC::Compat.3
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/irc/p5-POE-Component-IRC/pkg-plist b/irc/p5-POE-Component-IRC/pkg-plist
index 975e49c0a3a1..3a96c6363e7a 100644
--- a/irc/p5-POE-Component-IRC/pkg-plist
+++ b/irc/p5-POE-Component-IRC/pkg-plist
@@ -35,6 +35,42 @@
 %%SITE_PERL%%/POE/Filter/IRC.pm
 %%SITE_PERL%%/POE/Filter/IRC/Compat.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/.packlist
+%%PERL5_MAN3%%/POE::Component::IRC.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Common.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Constants.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook::BasicBot.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook::Disconnecting.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook::Gtk2.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook::Hailo.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook::Reload.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook::Resolver.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook::Seen.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Cookbook::Translator.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::AutoJoin.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::BotAddressed.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::BotCommand.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::BotTraffic.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::CTCP.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::Connector.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::Console.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::CycleEmpty.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::DCC.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::FollowTail.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::ISupport.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::Logger.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::NickReclaim.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::NickServID.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::PlugMan.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::Proxy.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Plugin::Whois.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Projects.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Qnet.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::Qnet::State.3.gz
+%%PERL5_MAN3%%/POE::Component::IRC::State.3.gz
+%%PERL5_MAN3%%/POE::Filter::IRC.3.gz
+%%PERL5_MAN3%%/POE::Filter::IRC::Compat.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/irc/p5-Parse-IRC/Makefile b/irc/p5-Parse-IRC/Makefile
index 2293d63d758e..fad51e96b3d9 100644
--- a/irc/p5-Parse-IRC/Makefile
+++ b/irc/p5-Parse-IRC/Makefile
@@ -16,9 +16,6 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Parse::IRC.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501600
diff --git a/irc/p5-Parse-IRC/pkg-plist b/irc/p5-Parse-IRC/pkg-plist
index c30ddb6f5d5d..59a1e13377b7 100644
--- a/irc/p5-Parse-IRC/pkg-plist
+++ b/irc/p5-Parse-IRC/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Parse/IRC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/IRC/.packlist
+%%PERL5_MAN3%%/Parse::IRC.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/IRC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
 @dirrmtry %%SITE_PERL%%/Parse