34 files changed, 92 insertions, 108 deletions

diff --git a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
index 2138248ed953..3c4d6f642e6c 100644
--- a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
@@ -21,46 +21,4 @@ RUN_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Gtk2::Ex::FormFactory.3 \
-		Gtk2::Ex::FormFactory::Button.3 \
-		Gtk2::Ex::FormFactory::CheckButton.3 \
-		Gtk2::Ex::FormFactory::CheckButtonGroup.3 \
-		Gtk2::Ex::FormFactory::Combo.3 \
-		Gtk2::Ex::FormFactory::Container.3 \
-		Gtk2::Ex::FormFactory::Context.3 \
-		Gtk2::Ex::FormFactory::DialogButtons.3 \
-		Gtk2::Ex::FormFactory::Entry.3 \
-		Gtk2::Ex::FormFactory::ExecFlow.3 \
-		Gtk2::Ex::FormFactory::Expander.3 \
-		Gtk2::Ex::FormFactory::Form.3 \
-		Gtk2::Ex::FormFactory::GtkWidget.3 \
-		Gtk2::Ex::FormFactory::HBox.3 \
-		Gtk2::Ex::FormFactory::HPaned.3 \
-		Gtk2::Ex::FormFactory::HSeparator.3 \
-		Gtk2::Ex::FormFactory::Image.3 \
-		Gtk2::Ex::FormFactory::Intro.3 \
-		Gtk2::Ex::FormFactory::Label.3 \
-		Gtk2::Ex::FormFactory::Layout.3 \
-		Gtk2::Ex::FormFactory::List.3 \
-		Gtk2::Ex::FormFactory::Loader.3 \
-		Gtk2::Ex::FormFactory::Menu.3 \
-		Gtk2::Ex::FormFactory::Notebook.3 \
-		Gtk2::Ex::FormFactory::Popup.3 \
-		Gtk2::Ex::FormFactory::ProgressBar.3 \
-		Gtk2::Ex::FormFactory::Proxy.3 \
-		Gtk2::Ex::FormFactory::ProxyBuffered.3 \
-		Gtk2::Ex::FormFactory::RadioButton.3 \
-		Gtk2::Ex::FormFactory::Rules.3 \
-		Gtk2::Ex::FormFactory::Table.3 \
-		Gtk2::Ex::FormFactory::TextView.3 \
-		Gtk2::Ex::FormFactory::Timestamp.3 \
-		Gtk2::Ex::FormFactory::ToggleButton.3 \
-		Gtk2::Ex::FormFactory::VBox.3 \
-		Gtk2::Ex::FormFactory::VPaned.3 \
-		Gtk2::Ex::FormFactory::VSeparator.3 \
-		Gtk2::Ex::FormFactory::Widget.3 \
-		Gtk2::Ex::FormFactory::Window.3 \
-		Gtk2::Ex::FormFactory::YesNo.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gtk2-Ex-FormFactory/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-FormFactory/pkg-plist
index 556b2ae35120..39d0916f737a 100644
--- a/x11-toolkits/p5-Gtk2-Ex-FormFactory/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-FormFactory/pkg-plist
@@ -39,6 +39,46 @@
 %%SITE_PERL%%/Gtk2/Ex/FormFactory/Window.pm
 %%SITE_PERL%%/Gtk2/Ex/FormFactory/YesNo.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/FormFactory/.packlist
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Button.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::CheckButton.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::CheckButtonGroup.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Combo.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Container.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Context.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::DialogButtons.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Entry.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::ExecFlow.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Expander.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Form.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::GtkWidget.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::HBox.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::HPaned.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::HSeparator.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Image.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Intro.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Label.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Layout.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::List.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Loader.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Menu.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Notebook.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Popup.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::ProgressBar.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Proxy.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::ProxyBuffered.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::RadioButton.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Rules.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Table.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::TextView.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Timestamp.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::ToggleButton.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::VBox.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::VPaned.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::VSeparator.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Widget.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::Window.3.gz
+%%PERL5_MAN3%%/Gtk2::Ex::FormFactory::YesNo.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/FormFactory
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-ImageView/Makefile b/x11-toolkits/p5-Gtk2-ImageView/Makefile
index fca546cfdcd2..3b84efce8bf1 100644
--- a/x11-toolkits/p5-Gtk2-ImageView/Makefile
+++ b/x11-toolkits/p5-Gtk2-ImageView/Makefile
@@ -22,17 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Gtk2::ImageView.3 \
-  		Gtk2::Gdk::Pixbuf::Draw::Cache.3 \
-  		Gtk2::ImageView::Anim.3 \
-		Gtk2::ImageView::Nav.3 \
-		Gtk2::ImageView::ScrollWin.3 \
-		Gtk2::ImageView::Tool.3 \
-		Gtk2::ImageView::Tool::Dragger.3 \
-		Gtk2::ImageView::Tool::Painter.3 \
-		Gtk2::ImageView::Tool::Selector.3 \
-		Gtk2::ImageView::Zoom.3 \
-		Gtk2::ImageView::index.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gtk2-ImageView/pkg-plist b/x11-toolkits/p5-Gtk2-ImageView/pkg-plist
index 48c3b6f8a9bc..7367c110b206 100644
--- a/x11-toolkits/p5-Gtk2-ImageView/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-ImageView/pkg-plist
@@ -17,6 +17,17 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Tool/Selector.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Zoom.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/index.pod
+%%PERL5_MAN3%%/Gtk2::ImageView.3.gz
+%%PERL5_MAN3%%/Gtk2::Gdk::Pixbuf::Draw::Cache.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::Anim.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::Nav.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::ScrollWin.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::Tool.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::Tool::Dragger.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::Tool::Painter.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::Tool::Selector.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::Zoom.3.gz
+%%PERL5_MAN3%%/Gtk2::ImageView::index.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/ImageView
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageView/Tool
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
index 2a5c702fe124..66257582a678 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Gtk2::TrayIcon.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist b/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
index 019ee762534d..bbea974871d4 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
@@ -5,6 +5,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install/trayicon-autogen.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install/trayicon.typemap
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon.pm
+%%PERL5_MAN3%%/Gtk2::TrayIcon.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/TrayIcon
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 089c3169fbc5..4b38422f4689 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tk::Autoscroll.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
index 0334362f3c13..882c067f9759 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
+++ b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Tk/Autoscroll.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll/.packlist
+%%PERL5_MAN3%%/Tk::Autoscroll.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
 @dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index 7f45ef0ba6c0..e89216e3b3c3 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tk::ColourChooser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
index d453ca6403cd..c3dba86418b0 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
+++ b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Tk/ColourChooser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser/.packlist
+%%PERL5_MAN3%%/Tk::ColourChooser.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
 @dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-Contrib/Makefile b/x11-toolkits/p5-Tk-Contrib/Makefile
index 359249966c34..e00d41fb2d72 100644
--- a/x11-toolkits/p5-Tk-Contrib/Makefile
+++ b/x11-toolkits/p5-Tk-Contrib/Makefile
@@ -16,7 +16,5 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-MAN3=		Tk::Axis.3 Tk::Dial.3 Tk::OlWm.3 Tk::TiedListbox.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-Contrib/pkg-plist b/x11-toolkits/p5-Tk-Contrib/pkg-plist
index 447aa50db73f..dc8fc7d2049b 100644
--- a/x11-toolkits/p5-Tk-Contrib/pkg-plist
+++ b/x11-toolkits/p5-Tk-Contrib/pkg-plist
@@ -3,6 +3,10 @@
 %%SITE_PERL%%/Tk/Dial.pm
 %%SITE_PERL%%/Tk/OlWm.pm
 %%SITE_PERL%%/Tk/TiedListbox.pm
+%%PERL5_MAN3%%/Tk::Axis.3.gz
+%%PERL5_MAN3%%/Tk::Dial.3.gz
+%%PERL5_MAN3%%/Tk::OlWm.3.gz
+%%PERL5_MAN3%%/Tk::TiedListbox.3.gz
 @dirrmtry %%SITE_PERL%%/Tk
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Contrib
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-DKW/Makefile b/x11-toolkits/p5-Tk-DKW/Makefile
index 856524795490..e3631ba17ea4 100644
--- a/x11-toolkits/p5-Tk-DKW/Makefile
+++ b/x11-toolkits/p5-Tk-DKW/Makefile
@@ -20,9 +20,7 @@ USE_PERL5=	configure
 DKW_MODULES=	CheckBox Columns ComboEntry CornerBox DockFrame IconCanvas\
 		Menustrip ProgressIndicator SplitFrame TabFrame TabbedForm\
 		TableEdit
-MAN3=		${DKW_MODULES:S/^/Tk::/:S/$/.3/}
 
-NO_STAGE=	yes
 post-extract:
 	@${MV} ${WRKSRC}/Tk/* ${WRKSRC}/
 	@${RMDIR} ${WRKSRC}/Tk/
diff --git a/x11-toolkits/p5-Tk-DKW/pkg-plist b/x11-toolkits/p5-Tk-DKW/pkg-plist
index 5f85d970f278..fbd9bd9cb3cb 100644
--- a/x11-toolkits/p5-Tk-DKW/pkg-plist
+++ b/x11-toolkits/p5-Tk-DKW/pkg-plist
@@ -13,6 +13,18 @@
 %%SITE_PERL%%/Tk/TabFrame.pm
 %%SITE_PERL%%/Tk/TabbedForm.pm
 %%SITE_PERL%%/Tk/TableEdit.pm
+%%PERL5_MAN3%%/Tk::CheckBox.3.gz
+%%PERL5_MAN3%%/Tk::Columns.3.gz
+%%PERL5_MAN3%%/Tk::ComboEntry.3.gz
+%%PERL5_MAN3%%/Tk::CornerBox.3.gz
+%%PERL5_MAN3%%/Tk::DockFrame.3.gz
+%%PERL5_MAN3%%/Tk::IconCanvas.3.gz
+%%PERL5_MAN3%%/Tk::Menustrip.3.gz
+%%PERL5_MAN3%%/Tk::ProgressIndicator.3.gz
+%%PERL5_MAN3%%/Tk::SplitFrame.3.gz
+%%PERL5_MAN3%%/Tk::TabFrame.3.gz
+%%PERL5_MAN3%%/Tk::TabbedForm.3.gz
+%%PERL5_MAN3%%/Tk::TableEdit.3.gz
 @dirrmtry %%SITE_PERL%%/Tk
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/DKW
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index 9dda44dab65b..5e51cc02d529 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tk::Date.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-Date/pkg-plist b/x11-toolkits/p5-Tk-Date/pkg-plist
index 90664081f53e..f0b375331098 100644
--- a/x11-toolkits/p5-Tk-Date/pkg-plist
+++ b/x11-toolkits/p5-Tk-Date/pkg-plist
@@ -2,6 +2,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/date.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/localized_date.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date/.packlist
+%%PERL5_MAN3%%/Tk::Date.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
index 85aa11931d0d..52daeda215b9 100644
--- a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
+++ b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	${PORTNAME:S/-/::/g}.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/pkg-plist b/x11-toolkits/p5-Tk-DynaTabFrame/pkg-plist
index 4cfbc38a1b1d..3d0c4f0bf840 100644
--- a/x11-toolkits/p5-Tk-DynaTabFrame/pkg-plist
+++ b/x11-toolkits/p5-Tk-DynaTabFrame/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/DynaTabFrame/.packlist
 %%SITE_PERL%%/Tk/DynaTabFrame.pm
+%%PERL5_MAN3%%/Tk::DynaTabFrame.3.gz
 @dirrmtry %%SITE_PERL%%/Tk
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/DynaTabFrame
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index 86f0ae395fc6..f9fcb910ff35 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tk::Enscript.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-Enscript/pkg-plist b/x11-toolkits/p5-Tk-Enscript/pkg-plist
index fca4f5355664..9b82306dd4d5 100644
--- a/x11-toolkits/p5-Tk-Enscript/pkg-plist
+++ b/x11-toolkits/p5-Tk-Enscript/pkg-plist
@@ -1,6 +1,7 @@
 %%SITE_PERL%%/Tk/Enscript.pm
 %%SITE_PERL%%/Tk/enscript.cfg
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript/.packlist
+%%PERL5_MAN3%%/Tk::Enscript.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
 @dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index 509ae179a86f..9cd3cbc5d6df 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -17,11 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tk::Cloth.3 \
-		Tk::FireButton.3 \
-		Tk::NumEntry.3 \
-		Tk::NumEntryPlain.3 \
-		Tk::TFrame.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-GBARR/pkg-plist b/x11-toolkits/p5-Tk-GBARR/pkg-plist
index d7edf91662e2..cd14d83074da 100644
--- a/x11-toolkits/p5-Tk-GBARR/pkg-plist
+++ b/x11-toolkits/p5-Tk-GBARR/pkg-plist
@@ -9,6 +9,11 @@
 %%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
+%%PERL5_MAN3%%/Tk::Cloth.3.gz
+%%PERL5_MAN3%%/Tk::FireButton.3.gz
+%%PERL5_MAN3%%/Tk::NumEntry.3.gz
+%%PERL5_MAN3%%/Tk::NumEntryPlain.3.gz
+%%PERL5_MAN3%%/Tk::TFrame.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 21055ade45ae..b43c9c372dea 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tk::Getopt.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-Getopt/pkg-plist b/x11-toolkits/p5-Tk-Getopt/pkg-plist
index 1fc3c40e349a..50a17a5d29d2 100644
--- a/x11-toolkits/p5-Tk-Getopt/pkg-plist
+++ b/x11-toolkits/p5-Tk-Getopt/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Tk/Getopt.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt/.packlist
+%%PERL5_MAN3%%/Tk::Getopt.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt
 @dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index 975606e8e150..7c7eaa5badcd 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tk::HistEntry.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-HistEntry/pkg-plist b/x11-toolkits/p5-Tk-HistEntry/pkg-plist
index 7b38876e0772..236241ad3219 100644
--- a/x11-toolkits/p5-Tk-HistEntry/pkg-plist
+++ b/x11-toolkits/p5-Tk-HistEntry/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Tk/HistEntry.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry/.packlist
+%%PERL5_MAN3%%/Tk::HistEntry.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
 @dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-JComboBox/Makefile b/x11-toolkits/p5-Tk-JComboBox/Makefile
index 1c26996a2366..1c05e3dfd0b3 100644
--- a/x11-toolkits/p5-Tk-JComboBox/Makefile
+++ b/x11-toolkits/p5-Tk-JComboBox/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	${PORTNAME:S/-/::/g}.3 Tk::CWidget.3 Tk::JComboBox::tutorial.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-JComboBox/pkg-plist b/x11-toolkits/p5-Tk-JComboBox/pkg-plist
index 5d5c44f5e19a..882f8610c293 100644
--- a/x11-toolkits/p5-Tk-JComboBox/pkg-plist
+++ b/x11-toolkits/p5-Tk-JComboBox/pkg-plist
@@ -7,6 +7,9 @@
 %%SITE_PERL%%/Tk/JComboBox/jcb_edit.gif
 %%SITE_PERL%%/Tk/JComboBox/jcb_ro.gif
 %%SITE_PERL%%/Tk/JComboBox/tutorial.pod
+%%PERL5_MAN3%%/Tk::JComboBox.3.gz
+%%PERL5_MAN3%%/Tk::CWidget.3.gz
+%%PERL5_MAN3%%/Tk::JComboBox::tutorial.3.gz
 @dirrmtry %%SITE_PERL%%/Tk/JComboBox
 @dirrmtry %%SITE_PERL%%/Tk/CWidget/Util
 @dirrmtry %%SITE_PERL%%/Tk/CWidget
diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile
index ea1ebbe8a14c..d45a8593f25a 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/Makefile
+++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile
@@ -1,15 +1,15 @@
 # Created by: Lubomir Marinov <lubomir_m@abv.bg>
 # $FreeBSD$
 
-PORTNAME=		Tk-ResizeButton
+PORTNAME=	Tk-ResizeButton
 PORTVERSION=	0.01
 PORTREVISION=	4
-CATEGORIES=		x11-toolkits perl5
+CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=		perl@FreeBSD.org
-COMMENT=		Resizeable button to be used in a Tk::HList column header
+MAINTAINER=	perl@FreeBSD.org
+COMMENT=	Resizeable button to be used in a Tk::HList column header
 
 BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=			Tk::ResizeButton.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-ResizeButton/pkg-plist b/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
index eacce4402d5b..d953e9eaff96 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
+++ b/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Tk/ResizeButton.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ResizeButton/.packlist
+%%PERL5_MAN3%%/Tk::ResizeButton.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ResizeButton
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
 @dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index a7352162e6b4..cc7c365e5d98 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -18,9 +18,4 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	X11LIB=${LOCALBASE}/lib X11INC=${LOCALBASE}/include
 
-MAN3=		Tk::TableMatrix.3 \
-		Tk::TableMatrix::Spreadsheet.3 \
-		Tk::TableMatrix::SpreadsheetHideRows.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
index 5f462449b6d5..89dc3cee11c4 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
+++ b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
@@ -10,6 +10,9 @@
 %%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
+%%PERL5_MAN3%%/Tk::TableMatrix.3.gz
+%%PERL5_MAN3%%/Tk::TableMatrix::Spreadsheet.3.gz
+%%PERL5_MAN3%%/Tk::TableMatrix::SpreadsheetHideRows.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk
diff --git a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
index 8ea8050824ae..12de542c4c82 100644
--- a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
+++ b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
@@ -19,7 +19,4 @@ WX_UNICODE=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Wx::Perl::ProcessStream.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Wx-Perl-ProcessStream/pkg-plist b/x11-toolkits/p5-Wx-Perl-ProcessStream/pkg-plist
index 32853c6d6303..0f83988e3da6 100644
--- a/x11-toolkits/p5-Wx-Perl-ProcessStream/pkg-plist
+++ b/x11-toolkits/p5-Wx-Perl-ProcessStream/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Perl/ProcessStream/.packlist
 %%SITE_PERL%%/Wx/Perl/ProcessStream.pm
+%%PERL5_MAN3%%/Wx::Perl::ProcessStream.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Perl/ProcessStream
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Perl
 @dirrmtry %%SITE_PERL%%/Wx/Perl