2 files changed, 130 insertions, 132 deletions

diff --git a/deskutils/p5-Goo/Makefile b/deskutils/p5-Goo/Makefile
index b3f13cd9a0e0..e22a225392f2 100644
--- a/deskutils/p5-Goo/Makefile
+++ b/deskutils/p5-Goo/Makefile
@@ -18,145 +18,13 @@ BUILD_DEPENDS=	p5-Config-Auto>=0:${PORTSDIR}/devel/p5-Config-Auto \
 		p5-File-Grep>=0:${PORTSDIR}/devel/p5-File-Grep \
 		p5-File-NCopy>=0:${PORTSDIR}/devel/p5-File-NCopy \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		perltidy>=0:${PORTSDIR}/devel/perltidy \
 		p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
 		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
 		p5-Text-FormatTable>=0:${PORTSDIR}/textproc/p5-Text-FormatTable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN1=	goo.1 goo.pl.1
-MAN3=	Goo.3 \
-	Goo::Action.3 \
-	Goo::BackLinkFinder.3 \
-	Goo::BackLinkManager.3 \
-	Goo::CareOMeter.3 \
-	Goo::CommandLineManager.3 \
-	Goo::CompressWhitespace.3 \
-	Goo::ConfigFile.3 \
-	Goo::Database.3 \
-	Goo::DatabaseInfo.3 \
-	Goo::DatabaseObject.3 \
-	Goo::DatabaseProfileOption.3 \
-	Goo::DatabaseThing.3 \
-	Goo::DatabaseThing::Deleter.3 \
-	Goo::DatabaseThing::Editor.3 \
-	Goo::DatabaseThing::Maker.3 \
-	Goo::DatabaseThing::Profiler.3 \
-	Goo::Date.3 \
-	Goo::Differ.3 \
-	Goo::Editor.3 \
-	Goo::Emailer.3 \
-	Goo::Environment.3 \
-	Goo::Exiter.3 \
-	Goo::FileThing.3 \
-	Goo::FileThing::Cloner.3 \
-	Goo::FileThing::Deleter.3 \
-	Goo::FileThing::Finder.3 \
-	Goo::FileUtilities.3 \
-	Goo::Grepper.3 \
-	Goo::Header.3 \
-	Goo::JumpManager.3 \
-	Goo::JumpProfileOption.3 \
-	Goo::List.3 \
-	Goo::Lister.3 \
-	Goo::LiteDatabase.3 \
-	Goo::Loader.3 \
-	Goo::Logger.3 \
-	Goo::Object.3 \
-	Goo::OptionIndexTable.3 \
-	Goo::Profile.3 \
-	Goo::ProfileOption.3 \
-	Goo::Profiler.3 \
-	Goo::Prompter.3 \
-	Goo::Shell.3 \
-	Goo::ShellCommander.3 \
-	Goo::SimpleEmailer.3 \
-	Goo::TabAwareEditor.3 \
-	Goo::TabConverter.3 \
-	Goo::TableInfo.3 \
-	Goo::TeamManager.3 \
-	Goo::Template.3 \
-	Goo::TemplateProfileOption.3 \
-	Goo::Test.3 \
-	Goo::TextEditor.3 \
-	Goo::TextTable.3 \
-	Goo::TextUtilities.3 \
-	Goo::ThereDocManager.3 \
-	Goo::Thing.3 \
-	Goo::Thing::bug::Fixer.3 \
-	Goo::Thing::bug::Lister.3 \
-	Goo::Thing::bug::Maker.3 \
-	Goo::Thing::conf::ConfigProfiler.3 \
-	Goo::Thing::conf::studly-method-remover.3 \
-	Goo::Thing::gml::Profiler.3 \
-	Goo::Thing::gml::Reader.3 \
-	Goo::Thing::gml::Writer.3 \
-	Goo::Thing::goo::Maker.3 \
-	Goo::Thing::js::JSFunctionProfileOption.3 \
-	Goo::Thing::js::JavascriptProfiler.3 \
-	Goo::Thing::log::Profiler.3 \
-	Goo::Thing::pl::ScriptMaker.3 \
-	Goo::Thing::pm::Adder.3 \
-	Goo::Thing::pm::Compiler.3 \
-	Goo::Thing::pm::Editor.3 \
-	Goo::Thing::pm::ExecDocManager.3 \
-	Goo::Thing::pm::Maker.3 \
-	Goo::Thing::pm::Method.3 \
-	Goo::Thing::pm::MethodMaker.3 \
-	Goo::Thing::pm::MethodMatcher.3 \
-	Goo::Thing::pm::MethodProfileOption.3 \
-	Goo::Thing::pm::PackageProfileOption.3 \
-	Goo::Thing::pm::Perl5.3 \
-	Goo::Thing::pm::Perl5Adder.3 \
-	Goo::Thing::pm::Perl5Compiler.3 \
-	Goo::Thing::pm::Perl5Editor.3 \
-	Goo::Thing::pm::Perl5ModuleInspector.3 \
-	Goo::Thing::pm::Perl5ModuleMaker.3 \
-	Goo::Thing::pm::Perl5Profiler.3 \
-	Goo::Thing::pm::Perl5Runner.3 \
-	Goo::Thing::pm::Perl5ThereDocManager.3 \
-	Goo::Thing::pm::Perl6Adder.3 \
-	Goo::Thing::pm::Perl6Compiler.3 \
-	Goo::Thing::pm::Perl6Editor.3 \
-	Goo::Thing::pm::Perl6ModuleInspector.3 \
-	Goo::Thing::pm::Perl6ModuleMaker.3 \
-	Goo::Thing::pm::Perl6Profiler.3 \
-	Goo::Thing::pm::Perl6Runner.3 \
-	Goo::Thing::pm::PerlCoder.3 \
-	Goo::Thing::pm::PerlTidyManager.3 \
-	Goo::Thing::pm::Profiler.3 \
-	Goo::Thing::pm::ProgramCloner.3 \
-	Goo::Thing::pm::ProgramDeleter.3 \
-	Goo::Thing::pm::Runner.3 \
-	Goo::Thing::pm::ScopeMatcher.3 \
-	Goo::Thing::pm::ThereDocManager.3 \
-	Goo::Thing::pm::TypeChecker.3 \
-	Goo::Thing::pm::TypeLessTranslator.3 \
-	Goo::Thing::task::Finisher.3 \
-	Goo::Thing::task::Maker.3 \
-	Goo::Thing::task::TaskEditor.3 \
-	Goo::Thing::task::TaskLister.3 \
-	Goo::Thing::task::edittask.3 \
-	Goo::Thing::task::savetask.3 \
-	Goo::Thing::task::tasklist.3 \
-	Goo::Thing::tpm::TestLoader.3 \
-	Goo::Thing::tpm::TestMaker.3 \
-	Goo::Thing::tpm::TestRunner.3 \
-	Goo::Thing::tpm::Tester.3 \
-	Goo::ThingFinder.3 \
-	Goo::ThingProfileOption.3 \
-	Goo::TrailGoBack.3 \
-	Goo::TrailGoBackOne.3 \
-	Goo::TrailGoForward.3 \
-	Goo::TrailManager.3 \
-	Goo::TrailProfiler.3 \
-	Goo::TypeManager.3 \
-	Goo::WebDBLite.3 \
-	Goo::Zone.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/deskutils/p5-Goo/pkg-plist b/deskutils/p5-Goo/pkg-plist
index 9ad6ea88875f..bf92988dd44c 100644
--- a/deskutils/p5-Goo/pkg-plist
+++ b/deskutils/p5-Goo/pkg-plist
@@ -1,5 +1,133 @@
 bin/goo
 bin/goo.pl
+%%PERL5_MAN3%%/Goo.3.gz
+%%PERL5_MAN3%%/Goo::Action.3.gz
+%%PERL5_MAN3%%/Goo::BackLinkFinder.3.gz
+%%PERL5_MAN3%%/Goo::BackLinkManager.3.gz
+%%PERL5_MAN3%%/Goo::CareOMeter.3.gz
+%%PERL5_MAN3%%/Goo::CommandLineManager.3.gz
+%%PERL5_MAN3%%/Goo::CompressWhitespace.3.gz
+%%PERL5_MAN3%%/Goo::ConfigFile.3.gz
+%%PERL5_MAN3%%/Goo::Database.3.gz
+%%PERL5_MAN3%%/Goo::DatabaseInfo.3.gz
+%%PERL5_MAN3%%/Goo::DatabaseObject.3.gz
+%%PERL5_MAN3%%/Goo::DatabaseProfileOption.3.gz
+%%PERL5_MAN3%%/Goo::DatabaseThing.3.gz
+%%PERL5_MAN3%%/Goo::DatabaseThing::Deleter.3.gz
+%%PERL5_MAN3%%/Goo::DatabaseThing::Editor.3.gz
+%%PERL5_MAN3%%/Goo::DatabaseThing::Maker.3.gz
+%%PERL5_MAN3%%/Goo::DatabaseThing::Profiler.3.gz
+%%PERL5_MAN3%%/Goo::Date.3.gz
+%%PERL5_MAN3%%/Goo::Differ.3.gz
+%%PERL5_MAN3%%/Goo::Editor.3.gz
+%%PERL5_MAN3%%/Goo::Emailer.3.gz
+%%PERL5_MAN3%%/Goo::Environment.3.gz
+%%PERL5_MAN3%%/Goo::Exiter.3.gz
+%%PERL5_MAN3%%/Goo::FileThing.3.gz
+%%PERL5_MAN3%%/Goo::FileThing::Cloner.3.gz
+%%PERL5_MAN3%%/Goo::FileThing::Deleter.3.gz
+%%PERL5_MAN3%%/Goo::FileThing::Finder.3.gz
+%%PERL5_MAN3%%/Goo::FileUtilities.3.gz
+%%PERL5_MAN3%%/Goo::Grepper.3.gz
+%%PERL5_MAN3%%/Goo::Header.3.gz
+%%PERL5_MAN3%%/Goo::JumpManager.3.gz
+%%PERL5_MAN3%%/Goo::JumpProfileOption.3.gz
+%%PERL5_MAN3%%/Goo::List.3.gz
+%%PERL5_MAN3%%/Goo::Lister.3.gz
+%%PERL5_MAN3%%/Goo::LiteDatabase.3.gz
+%%PERL5_MAN3%%/Goo::Loader.3.gz
+%%PERL5_MAN3%%/Goo::Logger.3.gz
+%%PERL5_MAN3%%/Goo::Object.3.gz
+%%PERL5_MAN3%%/Goo::OptionIndexTable.3.gz
+%%PERL5_MAN3%%/Goo::Profile.3.gz
+%%PERL5_MAN3%%/Goo::ProfileOption.3.gz
+%%PERL5_MAN3%%/Goo::Profiler.3.gz
+%%PERL5_MAN3%%/Goo::Prompter.3.gz
+%%PERL5_MAN3%%/Goo::Shell.3.gz
+%%PERL5_MAN3%%/Goo::ShellCommander.3.gz
+%%PERL5_MAN3%%/Goo::SimpleEmailer.3.gz
+%%PERL5_MAN3%%/Goo::TabAwareEditor.3.gz
+%%PERL5_MAN3%%/Goo::TabConverter.3.gz
+%%PERL5_MAN3%%/Goo::TableInfo.3.gz
+%%PERL5_MAN3%%/Goo::TeamManager.3.gz
+%%PERL5_MAN3%%/Goo::Template.3.gz
+%%PERL5_MAN3%%/Goo::TemplateProfileOption.3.gz
+%%PERL5_MAN3%%/Goo::Test.3.gz
+%%PERL5_MAN3%%/Goo::TextEditor.3.gz
+%%PERL5_MAN3%%/Goo::TextTable.3.gz
+%%PERL5_MAN3%%/Goo::TextUtilities.3.gz
+%%PERL5_MAN3%%/Goo::ThereDocManager.3.gz
+%%PERL5_MAN3%%/Goo::Thing.3.gz
+%%PERL5_MAN3%%/Goo::Thing::bug::Fixer.3.gz
+%%PERL5_MAN3%%/Goo::Thing::bug::Lister.3.gz
+%%PERL5_MAN3%%/Goo::Thing::bug::Maker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::conf::ConfigProfiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::conf::studly-method-remover.3.gz
+%%PERL5_MAN3%%/Goo::Thing::gml::Profiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::gml::Reader.3.gz
+%%PERL5_MAN3%%/Goo::Thing::gml::Writer.3.gz
+%%PERL5_MAN3%%/Goo::Thing::goo::Maker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::js::JSFunctionProfileOption.3.gz
+%%PERL5_MAN3%%/Goo::Thing::js::JavascriptProfiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::log::Profiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pl::ScriptMaker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Adder.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Compiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Editor.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::ExecDocManager.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Maker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Method.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::MethodMaker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::MethodMatcher.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::MethodProfileOption.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::PackageProfileOption.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5Adder.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5Compiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5Editor.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5ModuleInspector.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5ModuleMaker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5Profiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5Runner.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl5ThereDocManager.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl6Adder.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl6Compiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl6Editor.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl6ModuleInspector.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl6ModuleMaker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl6Profiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Perl6Runner.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::PerlCoder.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::PerlTidyManager.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Profiler.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::ProgramCloner.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::ProgramDeleter.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::Runner.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::ScopeMatcher.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::ThereDocManager.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::TypeChecker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::pm::TypeLessTranslator.3.gz
+%%PERL5_MAN3%%/Goo::Thing::task::Finisher.3.gz
+%%PERL5_MAN3%%/Goo::Thing::task::Maker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::task::TaskEditor.3.gz
+%%PERL5_MAN3%%/Goo::Thing::task::TaskLister.3.gz
+%%PERL5_MAN3%%/Goo::Thing::task::edittask.3.gz
+%%PERL5_MAN3%%/Goo::Thing::task::savetask.3.gz
+%%PERL5_MAN3%%/Goo::Thing::task::tasklist.3.gz
+%%PERL5_MAN3%%/Goo::Thing::tpm::TestLoader.3.gz
+%%PERL5_MAN3%%/Goo::Thing::tpm::TestMaker.3.gz
+%%PERL5_MAN3%%/Goo::Thing::tpm::TestRunner.3.gz
+%%PERL5_MAN3%%/Goo::Thing::tpm::Tester.3.gz
+%%PERL5_MAN3%%/Goo::ThingFinder.3.gz
+%%PERL5_MAN3%%/Goo::ThingProfileOption.3.gz
+%%PERL5_MAN3%%/Goo::TrailGoBack.3.gz
+%%PERL5_MAN3%%/Goo::TrailGoBackOne.3.gz
+%%PERL5_MAN3%%/Goo::TrailGoForward.3.gz
+%%PERL5_MAN3%%/Goo::TrailManager.3.gz
+%%PERL5_MAN3%%/Goo::TrailProfiler.3.gz
+%%PERL5_MAN3%%/Goo::TypeManager.3.gz
+%%PERL5_MAN3%%/Goo::WebDBLite.3.gz
+%%PERL5_MAN3%%/Goo::Zone.3.gz
 %%SITE_PERL%%/.gooskel/nanorc
 %%SITE_PERL%%/.gooskel/perltidyrc
 %%SITE_PERL%%/.gooskel/things/goo/blv.goo
@@ -156,6 +284,8 @@ bin/goo.pl
 %%SITE_PERL%%/Goo/Zone.pm
 %%SITE_PERL%%/Goo/test.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Goo/.packlist
+man/man1/goo.1.gz
+man/man1/goo.pl.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Goo
 @dirrm %%SITE_PERL%%/Goo/Thing/tpm
 @dirrm %%SITE_PERL%%/Goo/Thing/task