4 files changed, 221 insertions, 191 deletions

diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index 5f99130ed652..bc6a176a937d 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -2,19 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	Padre
-PORTVERSION=	0.96
+PORTVERSION=	1.00
 CATEGORIES=	editors perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} ${MASTER_SITE_PERL_CPAN:S/$/:wxsc/}
 MASTER_SITE_SUBDIR=	${PORTNAME}/:DEFAULT Wx/:wxsc
 PKGNAMEPREFIX=	p5-
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${WXSC_DISTFILE}:wxsc
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl Application Development and Refactoring Environment
 
-BROKEN=		not staged
-LICENSE=	ART10 GPLv2
+LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-JSON-XS>=2.29:${PORTSDIR}/converters/p5-JSON-XS \
@@ -42,6 +40,7 @@ BUILD_DEPENDS=	p5-JSON-XS>=2.29:${PORTSDIR}/converters/p5-JSON-XS \
 		p5-Locale-Msgfmt>=0.14:${PORTSDIR}/devel/p5-Locale-Msgfmt \
 		p5-Module-Manifest>=0.07:${PORTSDIR}/devel/p5-Module-Manifest \
 		p5-PPI>=1.213:${PORTSDIR}/textproc/p5-PPI \
+		p5-Module-Starter>=1.60:${PORTSDIR}/devel/p5-Module-Starter \
 		p5-Parse-ErrorString-Perl>=0.14:${PORTSDIR}/devel/p5-Parse-ErrorString-Perl \
 		p5-Parse-ExuberantCTags>=1.00:${PORTSDIR}/devel/p5-Parse-ExuberantCTags \
 		p5-Pod-Abstract>=0.16:${PORTSDIR}/textproc/p5-Pod-Abstract \
@@ -67,138 +66,13 @@ BUILD_DEPENDS=	p5-JSON-XS>=2.29:${PORTSDIR}/converters/p5-JSON-XS \
 		p5-Wx-Perl-ProcessStream>=0.25:${PORTSDIR}/x11-toolkits/p5-Wx-Perl-ProcessStream
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_WX=		2.8+
-WX_COMPS=	wx contrib
-WX_UNICODE=	yes
-USES=		perl5 gettext
+USES=		gettext perl5
 USE_PERL5=	configure
+USE_WX=		3.0
+WX_COMPS=	wx
+WX_UNICODE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-PLIST_SUB=	WX_VERSION="${WX_VERSION}"
-
-MAN3=		Padre.3 \
-		Padre::Autosave.3 \
-		Padre::Browser.3 \
-		Padre::Browser::Document.3 \
-		Padre::Cache.3 \
-		Padre::Comment.3 \
-		Padre::Config.3 \
-		Padre::Config::Apply.3 \
-		Padre::Config::Host.3 \
-		Padre::Config::Human.3 \
-		Padre::Constant.3 \
-		Padre::Current.3 \
-		Padre::DB.3 \
-		Padre::DB::Bookmark.3 \
-		Padre::DB::History.3 \
-		Padre::DB::HostConfig.3 \
-		Padre::DB::LastPositionInFile.3 \
-		Padre::DB::Plugin.3 \
-		Padre::DB::RecentlyUsed.3 \
-		Padre::DB::Session.3 \
-		Padre::DB::SessionFile.3 \
-		Padre::DB::Snippets.3 \
-		Padre::Delta.3 \
-		Padre::Desktop.3 \
-		Padre::Document.3 \
-		Padre::Document::Perl.3 \
-		Padre::Document::Perl::Beginner.3 \
-		Padre::Document::Perl::Help.3 \
-		Padre::Document::Perl::QuickFix.3 \
-		Padre::Document::Perl::QuickFix::IncludeModule.3 \
-		Padre::Document::Perl::QuickFix::StrictWarnings.3 \
-		Padre::Document::Perl::Starter.3 \
-		Padre::Feature.3 \
-		Padre::File.3 \
-		Padre::Help.3 \
-		Padre::Locale.3 \
-		Padre::Locale::T.3 \
-		Padre::Locker.3 \
-		Padre::Logger.3 \
-		Padre::MIME.3 \
-		Padre::Manual.3 \
-		Padre::Manual::Hacking.3 \
-		Padre::PPI::EndifyPod.3 \
-		Padre::PPI::Transform.3 \
-		Padre::PPI::UpdateCopyright.3 \
-		Padre::Perl.3 \
-		Padre::Plugin.3 \
-		Padre::Plugin::Devel.3 \
-		Padre::Plugin::My.3 \
-		Padre::Plugin::PopularityContest.3 \
-		Padre::PluginBuilder.3 \
-		Padre::PluginManager.3 \
-		Padre::Pod2HTML.3 \
-		Padre::Project::Temp.3 \
-		Padre::QuickFix.3 \
-		Padre::Role::Task.3 \
-		Padre::Search.3 \
-		Padre::Startup.3 \
-		Padre::Sync.3 \
-		Padre::Task.3 \
-		Padre::Task::Eval.3 \
-		Padre::Task::File.3 \
-		Padre::Task::FindUnmatchedBrace.3 \
-		Padre::Task::FindVariableDeclaration.3 \
-		Padre::Task::IntroduceTemporaryVariable.3 \
-		Padre::Task::LWP.3 \
-		Padre::Task::LexicalReplaceVariable.3 \
-		Padre::Task::OpenResource.3 \
-		Padre::Task::PPI.3 \
-		Padre::TaskManager.3 \
-		Padre::Transform.3 \
-		Padre::Util.3 \
-		Padre::Util::FileBrowser.3 \
-		Padre::Util::SVN.3 \
-		Padre::Util::Template.3 \
-		Padre::Util::Win32.3 \
-		Padre::Wx.3 \
-		Padre::Wx::Action.3 \
-		Padre::Wx::ActionQueue.3 \
-		Padre::Wx::App.3 \
-		Padre::Wx::Browser.3 \
-		Padre::Wx::ComboBox::History.3 \
-		Padre::Wx::Dialog::Advanced.3 \
-		Padre::Wx::Dialog::FilterTool.3 \
-		Padre::Wx::Dialog::Form.3 \
-		Padre::Wx::Dialog::Goto.3 \
-		Padre::Wx::Dialog::HelpSearch.3 \
-		Padre::Wx::Dialog::OpenResource.3 \
-		Padre::Wx::Dialog::OpenURL.3 \
-		Padre::Wx::Dialog::Patch.3 \
-		Padre::Wx::Dialog::PerlFilter.3 \
-		Padre::Wx::Dialog::PluginManager.3 \
-		Padre::Wx::Dialog::Positions.3 \
-		Padre::Wx::Dialog::QuickMenuAccess.3 \
-		Padre::Wx::Dialog::RegexEditor.3 \
-		Padre::Wx::Dialog::SessionManager.3 \
-		Padre::Wx::Dialog::SessionSave.3 \
-		Padre::Wx::Dialog::Shortcut.3 \
-		Padre::Wx::Dialog::Warning.3 \
-		Padre::Wx::Dialog::WindowList.3 \
-		Padre::Wx::Display.3 \
-		Padre::Wx::Editor.3 \
-		Padre::Wx::Frame::POD.3 \
-		Padre::Wx::HtmlWindow.3 \
-		Padre::Wx::Main.3 \
-		Padre::Wx::Notebook.3 \
-		Padre::Wx::Panel::Debugger.3 \
-		Padre::Wx::Progress.3 \
-		Padre::Wx::Role::Conduit.3 \
-		Padre::Wx::Role::Config.3 \
-		Padre::Wx::Role::Context.3 \
-		Padre::Wx::Role::Dialog.3 \
-		Padre::Wx::Role::Idle.3 \
-		Padre::Wx::Role::Main.3 \
-		Padre::Wx::Role::Timer.3 \
-		Padre::Wx::Role::View.3 \
-		Padre::Wx::ScrollLock.3 \
-		Padre::Wx::StatusBar.3 \
-		Padre::Wx::TreeCtrl.3 \
-		Wx::Scintilla.3 \
-		Wx::Scintilla::Constant.3 \
-		Wx::Scintilla::Manual.3
-
 DESKTOP_ENTRIES="Padre" \
 		"The Perl IDE" \
 		"${SITE_PERL}/auto/share/dist/Padre/icons/padre/64x64/logo.png" \
@@ -211,43 +85,47 @@ WXSC_VERSION=	0.39
 WXSC_DISTNAME=	${WXSC_NAME}-${WXSC_VERSION}
 WXSC_DISTFILE=	${WXSC_DISTNAME}.tar.gz
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if exists(${PERL})
-PERL_THREADS!=	${PERL} -V::usethreads
-.if ${PERL_THREADS}!="'define';"
-IGNORE=		needs a threaded Perl, build with WITH_THREADS=yes flag and try again
+PERL_THREADS!=	${PERL} -V::useithreads
 .endif
-.else
-IGNORE=		needs an existing installation of Perl built with WITH_THREADS=yes
-.endif
-
-WX_VERSION=	$$(${WX_CONFIG} --version)
 
 post-extract:
-	@cd ${WRKDIR} && ${GZCAT} ${DISTDIR}/${WXSC_DISTFILE} | ${TAR} -xf -
+.if exists(${PERL})
+.if ${PERL_THREADS} != "'define';"
+IGNORE=		needs a threaded Perl, build with enabling THREADS option and try again
+.endif
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/my /s|wx-config|${WX_CONFIG}|' \
+		'/my /s|wx-config|${WX_CONFIG:T}|g' \
 		${WRKDIR}/${WXSC_DISTNAME}/inc/Module/Build/Scintilla.pm
 	@${REINPLACE_CMD} -e \
-		's|-lgtk-x11-2.0.*-lpangoft2-1.0|-lm| ; \
+		's|_scintilla-|_scintilla| ; \
+		 s|$$major.*$$release \.|| ; \
+		 /$$major.*$$release;/s|^|#| ; \
+		 s|-lgtk-x11-2.0.*-lpangoft2-1.0|-lm| ; \
 		 /-lgobject-2.0/d ; \
 		 /-lglib-2.0/d ; \
 		 s|\\$$ORIGIN|${SITE_PERL}/mach/auto/Wx/Scintilla|' \
 		${WRKDIR}/${WXSC_DISTNAME}/inc/Module/Build/Scintilla/GTK.pm
-	@${FIND} ${WRKSRC} -type f -name '*.orig' -delete
 
 pre-configure:
-	@cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} ${CONFIGURE_ENV} \
-		${PERL} Build.PL ${CONFIGURE_ARGS}
+	@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} ${CONFIGURE_ENV} \
+		${PERL} Build.PL ${CONFIGURE_ARGS} --destdir=${STAGEDIR})
 
 pre-build:
-	@cd ${WRKDIR}/${WXSC_DISTNAME} && ./Build
+	@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
+		${PERL} Build)
 
 pre-install:
-	@cd ${WRKDIR}/${WXSC_DISTNAME} && ./Build install
+	@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
+		${PERL} Build install)
+
+post-install:
+	@(cd ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Wx/Scintilla && \
+		${STRIP_CMD} libwx_gtk2u_scintilla.so)
 
 .include <bsd.port.post.mk>
diff --git a/editors/p5-Padre/distinfo b/editors/p5-Padre/distinfo
index fee671dc9682..5f5907933b4b 100644
--- a/editors/p5-Padre/distinfo
+++ b/editors/p5-Padre/distinfo
@@ -1,4 +1,4 @@
-SHA256 (Padre-0.96.tar.gz) = ce727f17792ef25f4bffc9dc2dc8fd71357bbabad407320c77700889272b856b
-SIZE (Padre-0.96.tar.gz) = 1919132
+SHA256 (Padre-1.00.tar.gz) = cb31404b048c12992eea142613bd560ce7a31199e3e09239fa1539f2fa02b96d
+SIZE (Padre-1.00.tar.gz) = 1969274
 SHA256 (Wx-Scintilla-0.39.tar.gz) = d6d67528a55552bb3fda2a1f22058c6c94a05eaf632dba5331afb3390defe0ea
 SIZE (Wx-Scintilla-0.39.tar.gz) = 848565
diff --git a/editors/p5-Padre/files/patch-Makefile.PL b/editors/p5-Padre/files/patch-Makefile.PL
new file mode 100644
index 000000000000..b682a5643f47
--- /dev/null
+++ b/editors/p5-Padre/files/patch-Makefile.PL
@@ -0,0 +1,23 @@
+--- Makefile.PL.orig
++++ Makefile.PL
+@@ -46,20 +46,6 @@
+ #	exit 0;
+ #}
+ 
+-# This makes sure that we didn't compile Alien::wxWidgets with the wrong options.
+-configure_requires 'Alien::wxWidgets' => '0.62';
+-
+-my $wxw = eval { use Alien::wxWidgets; 1; };
+-if ( $@ or not $wxw ) {
+-	print STDERR "Warning: prerequisite Alien::wxWidgets not found.\n";
+-	exit 0;
+-}
+-if ( '2.009000' eq Alien::wxWidgets->version ) {
+-	print STDERR "Warning: Alien::wxWidgets was compiled with the development version of\n";
+-	print STDERR "wxWidgets. This is known to cause Padre to crash.\n";
+-	exit 0;
+-}
+-
+ 
+ 
+ 
diff --git a/editors/p5-Padre/pkg-plist b/editors/p5-Padre/pkg-plist
index 8e98aabdd3f3..74d9d2127d34 100644
--- a/editors/p5-Padre/pkg-plist
+++ b/editors/p5-Padre/pkg-plist
@@ -1,23 +1,147 @@
 bin/padre
+%%PERL5_MAN3%%/Padre.3.gz
+%%PERL5_MAN3%%/Padre::Autosave.3.gz
+%%PERL5_MAN3%%/Padre::Browser.3.gz
+%%PERL5_MAN3%%/Padre::Browser::Document.3.gz
+%%PERL5_MAN3%%/Padre::Cache.3.gz
+%%PERL5_MAN3%%/Padre::Comment.3.gz
+%%PERL5_MAN3%%/Padre::Config.3.gz
+%%PERL5_MAN3%%/Padre::Config::Apply.3.gz
+%%PERL5_MAN3%%/Padre::Config::Host.3.gz
+%%PERL5_MAN3%%/Padre::Config::Human.3.gz
+%%PERL5_MAN3%%/Padre::Constant.3.gz
+%%PERL5_MAN3%%/Padre::Current.3.gz
+%%PERL5_MAN3%%/Padre::DB.3.gz
+%%PERL5_MAN3%%/Padre::DB::Bookmark.3.gz
+%%PERL5_MAN3%%/Padre::DB::History.3.gz
+%%PERL5_MAN3%%/Padre::DB::HostConfig.3.gz
+%%PERL5_MAN3%%/Padre::DB::LastPositionInFile.3.gz
+%%PERL5_MAN3%%/Padre::DB::Plugin.3.gz
+%%PERL5_MAN3%%/Padre::DB::RecentlyUsed.3.gz
+%%PERL5_MAN3%%/Padre::DB::Session.3.gz
+%%PERL5_MAN3%%/Padre::DB::SessionFile.3.gz
+%%PERL5_MAN3%%/Padre::DB::Snippets.3.gz
+%%PERL5_MAN3%%/Padre::Delta.3.gz
+%%PERL5_MAN3%%/Padre::Desktop.3.gz
+%%PERL5_MAN3%%/Padre::Document.3.gz
+%%PERL5_MAN3%%/Padre::Document::Perl.3.gz
+%%PERL5_MAN3%%/Padre::Document::Perl::Beginner.3.gz
+%%PERL5_MAN3%%/Padre::Document::Perl::Help.3.gz
+%%PERL5_MAN3%%/Padre::Document::Perl::QuickFix.3.gz
+%%PERL5_MAN3%%/Padre::Document::Perl::QuickFix::IncludeModule.3.gz
+%%PERL5_MAN3%%/Padre::Document::Perl::QuickFix::StrictWarnings.3.gz
+%%PERL5_MAN3%%/Padre::Document::Perl::Starter.3.gz
+%%PERL5_MAN3%%/Padre::Feature.3.gz
+%%PERL5_MAN3%%/Padre::File.3.gz
+%%PERL5_MAN3%%/Padre::Help.3.gz
+%%PERL5_MAN3%%/Padre::Locale.3.gz
+%%PERL5_MAN3%%/Padre::Locale::T.3.gz
+%%PERL5_MAN3%%/Padre::Locker.3.gz
+%%PERL5_MAN3%%/Padre::Logger.3.gz
+%%PERL5_MAN3%%/Padre::MIME.3.gz
+%%PERL5_MAN3%%/Padre::Manual.3.gz
+%%PERL5_MAN3%%/Padre::Manual::Hacking.3.gz
+%%PERL5_MAN3%%/Padre::PPI::EndifyPod.3.gz
+%%PERL5_MAN3%%/Padre::PPI::Transform.3.gz
+%%PERL5_MAN3%%/Padre::PPI::UpdateCopyright.3.gz
+%%PERL5_MAN3%%/Padre::Perl.3.gz
+%%PERL5_MAN3%%/Padre::Plugin.3.gz
+%%PERL5_MAN3%%/Padre::Plugin::Devel.3.gz
+%%PERL5_MAN3%%/Padre::Plugin::My.3.gz
+%%PERL5_MAN3%%/Padre::Plugin::PopularityContest.3.gz
+%%PERL5_MAN3%%/Padre::PluginBuilder.3.gz
+%%PERL5_MAN3%%/Padre::PluginManager.3.gz
+%%PERL5_MAN3%%/Padre::Pod2HTML.3.gz
+%%PERL5_MAN3%%/Padre::Project::Temp.3.gz
+%%PERL5_MAN3%%/Padre::QuickFix.3.gz
+%%PERL5_MAN3%%/Padre::Role::PubSub.3.gz
+%%PERL5_MAN3%%/Padre::Role::Task.3.gz
+%%PERL5_MAN3%%/Padre::Search.3.gz
+%%PERL5_MAN3%%/Padre::Startup.3.gz
+%%PERL5_MAN3%%/Padre::Sync.3.gz
+%%PERL5_MAN3%%/Padre::Task.3.gz
+%%PERL5_MAN3%%/Padre::Task::Eval.3.gz
+%%PERL5_MAN3%%/Padre::Task::File.3.gz
+%%PERL5_MAN3%%/Padre::Task::FindUnmatchedBrace.3.gz
+%%PERL5_MAN3%%/Padre::Task::FindVariableDeclaration.3.gz
+%%PERL5_MAN3%%/Padre::Task::IntroduceTemporaryVariable.3.gz
+%%PERL5_MAN3%%/Padre::Task::LWP.3.gz
+%%PERL5_MAN3%%/Padre::Task::LexicalReplaceVariable.3.gz
+%%PERL5_MAN3%%/Padre::Task::OpenResource.3.gz
+%%PERL5_MAN3%%/Padre::Task::PPI.3.gz
+%%PERL5_MAN3%%/Padre::TaskManager.3.gz
+%%PERL5_MAN3%%/Padre::Transform.3.gz
+%%PERL5_MAN3%%/Padre::Util.3.gz
+%%PERL5_MAN3%%/Padre::Util::FileBrowser.3.gz
+%%PERL5_MAN3%%/Padre::Util::SVN.3.gz
+%%PERL5_MAN3%%/Padre::Util::Win32.3.gz
+%%PERL5_MAN3%%/Padre::Wx.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Action.3.gz
+%%PERL5_MAN3%%/Padre::Wx::ActionQueue.3.gz
+%%PERL5_MAN3%%/Padre::Wx::App.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Browser.3.gz
+%%PERL5_MAN3%%/Padre::Wx::ComboBox::History.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::Advanced.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::FilterTool.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::Form.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::Goto.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::HelpSearch.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::OpenResource.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::OpenURL.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::Patch.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::PerlFilter.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::PluginManager.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::Positions.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::QuickMenuAccess.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::RegexEditor.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::SessionManager.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::SessionSave.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::Shortcut.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::Warning.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Dialog::WindowList.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Display.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Editor.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Frame::POD.3.gz
+%%PERL5_MAN3%%/Padre::Wx::HtmlWindow.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Main.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Notebook.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Panel::Debugger.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Progress.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Role::Conduit.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Role::Config.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Role::Context.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Role::Dialog.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Role::Idle.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Role::Main.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Role::Timer.3.gz
+%%PERL5_MAN3%%/Padre::Wx::Role::View.3.gz
+%%PERL5_MAN3%%/Padre::Wx::ScrollLock.3.gz
+%%PERL5_MAN3%%/Padre::Wx::StatusBar.3.gz
+%%PERL5_MAN3%%/Padre::Wx::TreeCtrl.3.gz
+%%PERL5_MAN3%%/Wx::Scintilla.3.gz
+%%PERL5_MAN3%%/Wx::Scintilla::Constant.3.gz
+%%PERL5_MAN3%%/Wx::Scintilla::Manual.3.gz
+%%SITE_PERL%%/Padre.pm
 %%SITE_PERL%%/Padre/Autosave.pm
 %%SITE_PERL%%/Padre/Breakpoints.pm
+%%SITE_PERL%%/Padre/Browser.pm
 %%SITE_PERL%%/Padre/Browser/Document.pm
 %%SITE_PERL%%/Padre/Browser/POD.pm
 %%SITE_PERL%%/Padre/Browser/PseudoPerldoc.pm
-%%SITE_PERL%%/Padre/Browser.pm
 %%SITE_PERL%%/Padre/CPAN.pm
 %%SITE_PERL%%/Padre/Cache.pm
 %%SITE_PERL%%/Padre/Command.pm
 %%SITE_PERL%%/Padre/Comment.pm
+%%SITE_PERL%%/Padre/Config.pm
 %%SITE_PERL%%/Padre/Config/Apply.pm
 %%SITE_PERL%%/Padre/Config/Host.pm
 %%SITE_PERL%%/Padre/Config/Human.pm
 %%SITE_PERL%%/Padre/Config/Patch.pm
 %%SITE_PERL%%/Padre/Config/Project.pm
 %%SITE_PERL%%/Padre/Config/Setting.pm
-%%SITE_PERL%%/Padre/Config.pm
 %%SITE_PERL%%/Padre/Constant.pm
 %%SITE_PERL%%/Padre/Current.pm
+%%SITE_PERL%%/Padre/DB.pm
 %%SITE_PERL%%/Padre/DB/Bookmark.pm
 %%SITE_PERL%%/Padre/DB/History.pm
 %%SITE_PERL%%/Padre/DB/HostConfig.pm
@@ -28,14 +152,15 @@ bin/padre
 %%SITE_PERL%%/Padre/DB/SessionFile.pm
 %%SITE_PERL%%/Padre/DB/Snippets.pod
 %%SITE_PERL%%/Padre/DB/Timeline.pm
-%%SITE_PERL%%/Padre/DB.pm
 %%SITE_PERL%%/Padre/Delta.pm
 %%SITE_PERL%%/Padre/Desktop.pm
-%%SITE_PERL%%/Padre/Document/CSharp/FunctionList.pm
+%%SITE_PERL%%/Padre/Document.pm
 %%SITE_PERL%%/Padre/Document/CSharp.pm
-%%SITE_PERL%%/Padre/Document/Java/FunctionList.pm
+%%SITE_PERL%%/Padre/Document/CSharp/FunctionList.pm
 %%SITE_PERL%%/Padre/Document/Java.pm
+%%SITE_PERL%%/Padre/Document/Java/FunctionList.pm
 %%SITE_PERL%%/Padre/Document/Patch.pm
+%%SITE_PERL%%/Padre/Document/Perl.pm
 %%SITE_PERL%%/Padre/Document/Perl/Autocomplete.pm
 %%SITE_PERL%%/Padre/Document/Perl/Beginner.pm
 %%SITE_PERL%%/Padre/Document/Perl/FunctionList.pm
@@ -43,58 +168,58 @@ bin/padre
 %%SITE_PERL%%/Padre/Document/Perl/Lexer.pm
 %%SITE_PERL%%/Padre/Document/Perl/Outline.pm
 %%SITE_PERL%%/Padre/Document/Perl/PPILexer.pm
+%%SITE_PERL%%/Padre/Document/Perl/QuickFix.pm
 %%SITE_PERL%%/Padre/Document/Perl/QuickFix/IncludeModule.pm
 %%SITE_PERL%%/Padre/Document/Perl/QuickFix/StrictWarnings.pm
-%%SITE_PERL%%/Padre/Document/Perl/QuickFix.pm
 %%SITE_PERL%%/Padre/Document/Perl/Starter.pm
+%%SITE_PERL%%/Padre/Document/Perl/Starter/Style.pm
 %%SITE_PERL%%/Padre/Document/Perl/Syntax.pm
-%%SITE_PERL%%/Padre/Document/Perl.pm
-%%SITE_PERL%%/Padre/Document/Python/FunctionList.pm
 %%SITE_PERL%%/Padre/Document/Python.pm
-%%SITE_PERL%%/Padre/Document/Ruby/FunctionList.pm
+%%SITE_PERL%%/Padre/Document/Python/FunctionList.pm
 %%SITE_PERL%%/Padre/Document/Ruby.pm
-%%SITE_PERL%%/Padre/Document.pm
+%%SITE_PERL%%/Padre/Document/Ruby/FunctionList.pm
 %%SITE_PERL%%/Padre/Feature.pm
+%%SITE_PERL%%/Padre/File.pm
 %%SITE_PERL%%/Padre/File/FTP.pm
 %%SITE_PERL%%/Padre/File/HTTP.pm
 %%SITE_PERL%%/Padre/File/Local.pm
-%%SITE_PERL%%/Padre/File.pm
 %%SITE_PERL%%/Padre/Help.pm
+%%SITE_PERL%%/Padre/Locale.pm
 %%SITE_PERL%%/Padre/Locale/Format.pm
 %%SITE_PERL%%/Padre/Locale/T.pm
-%%SITE_PERL%%/Padre/Locale.pm
 %%SITE_PERL%%/Padre/Lock.pm
 %%SITE_PERL%%/Padre/Locker.pm
 %%SITE_PERL%%/Padre/Logger.pm
 %%SITE_PERL%%/Padre/MIME.pm
-%%SITE_PERL%%/Padre/Manual/Hacking.pod
 %%SITE_PERL%%/Padre/Manual.pod
+%%SITE_PERL%%/Padre/Manual/Hacking.pod
+%%SITE_PERL%%/Padre/PPI.pm
 %%SITE_PERL%%/Padre/PPI/EndifyPod.pm
 %%SITE_PERL%%/Padre/PPI/Transform.pm
 %%SITE_PERL%%/Padre/PPI/UpdateCopyright.pm
-%%SITE_PERL%%/Padre/PPI.pm
 %%SITE_PERL%%/Padre/Perl.pm
+%%SITE_PERL%%/Padre/Plugin.pm
 %%SITE_PERL%%/Padre/Plugin/Devel.pm
 %%SITE_PERL%%/Padre/Plugin/My.pm
-%%SITE_PERL%%/Padre/Plugin/PopularityContest/Ping.pm
 %%SITE_PERL%%/Padre/Plugin/PopularityContest.pm
-%%SITE_PERL%%/Padre/Plugin.pm
+%%SITE_PERL%%/Padre/Plugin/PopularityContest/Ping.pm
 %%SITE_PERL%%/Padre/PluginBuilder.pm
 %%SITE_PERL%%/Padre/PluginHandle.pm
 %%SITE_PERL%%/Padre/PluginManager.pm
 %%SITE_PERL%%/Padre/Pod2HTML.pm
 %%SITE_PERL%%/Padre/Portable.pm
+%%SITE_PERL%%/Padre/Project.pm
 %%SITE_PERL%%/Padre/Project/Null.pm
+%%SITE_PERL%%/Padre/Project/Perl.pm
 %%SITE_PERL%%/Padre/Project/Perl/DZ.pm
 %%SITE_PERL%%/Padre/Project/Perl/EUMM.pm
 %%SITE_PERL%%/Padre/Project/Perl/MB.pm
 %%SITE_PERL%%/Padre/Project/Perl/MI.pm
 %%SITE_PERL%%/Padre/Project/Perl/Temp.pm
-%%SITE_PERL%%/Padre/Project/Perl.pm
 %%SITE_PERL%%/Padre/Project/Temp.pm
-%%SITE_PERL%%/Padre/Project.pm
 %%SITE_PERL%%/Padre/ProjectManager.pm
 %%SITE_PERL%%/Padre/QuickFix.pm
+%%SITE_PERL%%/Padre/Role/PubSub.pm
 %%SITE_PERL%%/Padre/Role/Task.pm
 %%SITE_PERL%%/Padre/SLOC.pm
 %%SITE_PERL%%/Padre/SVN.pm
@@ -102,6 +227,7 @@ bin/padre
 %%SITE_PERL%%/Padre/ServerManager.pm
 %%SITE_PERL%%/Padre/Startup.pm
 %%SITE_PERL%%/Padre/Sync.pm
+%%SITE_PERL%%/Padre/Task.pm
 %%SITE_PERL%%/Padre/Task/Addition.pm
 %%SITE_PERL%%/Padre/Task/BackupUnsaved.pm
 %%SITE_PERL%%/Padre/Task/Browser.pm
@@ -128,7 +254,6 @@ bin/padre
 %%SITE_PERL%%/Padre/Task/Syntax.pm
 %%SITE_PERL%%/Padre/Task/Transform.pm
 %%SITE_PERL%%/Padre/Task/VCS.pm
-%%SITE_PERL%%/Padre/Task.pm
 %%SITE_PERL%%/Padre/TaskHandle.pm
 %%SITE_PERL%%/Padre/TaskManager.pm
 %%SITE_PERL%%/Padre/TaskQueue.pm
@@ -137,12 +262,12 @@ bin/padre
 %%SITE_PERL%%/Padre/Test.pm
 %%SITE_PERL%%/Padre/Transform.pm
 %%SITE_PERL%%/Padre/Unload.pm
+%%SITE_PERL%%/Padre/Util.pm
 %%SITE_PERL%%/Padre/Util/CommandLine.pm
 %%SITE_PERL%%/Padre/Util/FileBrowser.pm
 %%SITE_PERL%%/Padre/Util/SVN.pm
-%%SITE_PERL%%/Padre/Util/Template.pm
 %%SITE_PERL%%/Padre/Util/Win32.pm
-%%SITE_PERL%%/Padre/Util.pm
+%%SITE_PERL%%/Padre/Wx.pm
 %%SITE_PERL%%/Padre/Wx/Action.pm
 %%SITE_PERL%%/Padre/Wx/ActionLibrary.pm
 %%SITE_PERL%%/Padre/Wx/ActionQueue.pm
@@ -150,8 +275,8 @@ bin/padre
 %%SITE_PERL%%/Padre/Wx/AuiManager.pm
 %%SITE_PERL%%/Padre/Wx/Bottom.pm
 %%SITE_PERL%%/Padre/Wx/Browser.pm
-%%SITE_PERL%%/Padre/Wx/CPAN/Listview.pm
 %%SITE_PERL%%/Padre/Wx/CPAN.pm
+%%SITE_PERL%%/Padre/Wx/CPAN/Listview.pm
 %%SITE_PERL%%/Padre/Wx/Choice/Files.pm
 %%SITE_PERL%%/Padre/Wx/Choice/Theme.pm
 %%SITE_PERL%%/Padre/Wx/ComboBox/FindTerm.pm
@@ -161,6 +286,7 @@ bin/padre
 %%SITE_PERL%%/Padre/Wx/Dialog/About.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/Advanced.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/Bookmarks.pm
+%%SITE_PERL%%/Padre/Wx/Dialog/DebugOptions.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/Diff.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/Document.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/Expression.pm
@@ -170,6 +296,7 @@ bin/padre
 %%SITE_PERL%%/Padre/Wx/Dialog/Form.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/Goto.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/HelpSearch.pm
+%%SITE_PERL%%/Padre/Wx/Dialog/ModuleStarter.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/OpenResource.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/OpenURL.pm
 %%SITE_PERL%%/Padre/Wx/Dialog/Patch.pm
@@ -196,19 +323,20 @@ bin/padre
 %%SITE_PERL%%/Padre/Wx/Dialog/WindowList.pm
 %%SITE_PERL%%/Padre/Wx/Diff.pm
 %%SITE_PERL%%/Padre/Wx/Diff2.pm
+%%SITE_PERL%%/Padre/Wx/Directory.pm
 %%SITE_PERL%%/Padre/Wx/Directory/Browse.pm
 %%SITE_PERL%%/Padre/Wx/Directory/Path.pm
 %%SITE_PERL%%/Padre/Wx/Directory/Search.pm
 %%SITE_PERL%%/Padre/Wx/Directory/TreeCtrl.pm
-%%SITE_PERL%%/Padre/Wx/Directory.pm
 %%SITE_PERL%%/Padre/Wx/Display.pm
+%%SITE_PERL%%/Padre/Wx/Editor.pm
 %%SITE_PERL%%/Padre/Wx/Editor/Lock.pm
 %%SITE_PERL%%/Padre/Wx/Editor/Menu.pm
-%%SITE_PERL%%/Padre/Wx/Editor.pm
 %%SITE_PERL%%/Padre/Wx/FBP/About.pm
 %%SITE_PERL%%/Padre/Wx/FBP/Bookmarks.pm
 %%SITE_PERL%%/Padre/Wx/FBP/Breakpoints.pm
 %%SITE_PERL%%/Padre/Wx/FBP/CPAN.pm
+%%SITE_PERL%%/Padre/Wx/FBP/DebugOptions.pm
 %%SITE_PERL%%/Padre/Wx/FBP/DebugOutput.pm
 %%SITE_PERL%%/Padre/Wx/FBP/Debugger.pm
 %%SITE_PERL%%/Padre/Wx/FBP/Diff.pm
@@ -218,6 +346,7 @@ bin/padre
 %%SITE_PERL%%/Padre/Wx/FBP/FindFast.pm
 %%SITE_PERL%%/Padre/Wx/FBP/FindInFiles.pm
 %%SITE_PERL%%/Padre/Wx/FBP/FoundInFiles.pm
+%%SITE_PERL%%/Padre/Wx/FBP/ModuleStarter.pm
 %%SITE_PERL%%/Padre/Wx/FBP/Outline.pm
 %%SITE_PERL%%/Padre/Wx/FBP/POD.pm
 %%SITE_PERL%%/Padre/Wx/FBP/Patch.pm
@@ -245,6 +374,7 @@ bin/padre
 %%SITE_PERL%%/Padre/Wx/Left.pm
 %%SITE_PERL%%/Padre/Wx/ListView.pm
 %%SITE_PERL%%/Padre/Wx/Main.pm
+%%SITE_PERL%%/Padre/Wx/Menu.pm
 %%SITE_PERL%%/Padre/Wx/Menu/Debug.pm
 %%SITE_PERL%%/Padre/Wx/Menu/Edit.pm
 %%SITE_PERL%%/Padre/Wx/Menu/File.pm
@@ -256,7 +386,6 @@ bin/padre
 %%SITE_PERL%%/Padre/Wx/Menu/Tools.pm
 %%SITE_PERL%%/Padre/Wx/Menu/View.pm
 %%SITE_PERL%%/Padre/Wx/Menu/Window.pm
-%%SITE_PERL%%/Padre/Wx/Menu.pm
 %%SITE_PERL%%/Padre/Wx/Menubar.pm
 %%SITE_PERL%%/Padre/Wx/Notebook.pm
 %%SITE_PERL%%/Padre/Wx/Nth.pm
@@ -294,8 +423,6 @@ bin/padre
 %%SITE_PERL%%/Padre/Wx/TreeCtrl.pm
 %%SITE_PERL%%/Padre/Wx/Util.pm
 %%SITE_PERL%%/Padre/Wx/VCS.pm
-%%SITE_PERL%%/Padre/Wx.pm
-%%SITE_PERL%%/Padre.pm
 %%SITE_PERL%%/auto/share/dist/Padre/README.txt
 %%SITE_PERL%%/auto/share/dist/Padre/doc/perlopquick/Artistic
 %%SITE_PERL%%/auto/share/dist/Padre/doc/perlopquick/Copying
@@ -381,6 +508,7 @@ bin/padre
 %%SITE_PERL%%/auto/share/dist/Padre/icons/padre/16x16/actions/breakpoints.png
 %%SITE_PERL%%/auto/share/dist/Padre/icons/padre/16x16/actions/bub.png
 %%SITE_PERL%%/auto/share/dist/Padre/icons/padre/16x16/actions/dot.png
+%%SITE_PERL%%/auto/share/dist/Padre/icons/padre/16x16/actions/metared.png
 %%SITE_PERL%%/auto/share/dist/Padre/icons/padre/16x16/actions/morpho.png
 %%SITE_PERL%%/auto/share/dist/Padre/icons/padre/16x16/actions/morpho2.png
 %%SITE_PERL%%/auto/share/dist/Padre/icons/padre/16x16/actions/morpho3.png
@@ -451,18 +579,18 @@ bin/padre
 %%SITE_PERL%%/auto/share/dist/Padre/themes/solarized_dark.txt
 %%SITE_PERL%%/auto/share/dist/Padre/themes/solarized_light.txt
 %%SITE_PERL%%/auto/share/dist/Padre/themes/ultraedit.txt
-%%SITE_PERL%%/mach/Wx/Scintilla/Constant.pm
-%%SITE_PERL%%/mach/Wx/Scintilla/Manual.pod
-%%SITE_PERL%%/mach/Wx/Scintilla/TextCtrl.pm
-%%SITE_PERL%%/mach/Wx/Scintilla/TextEvent.pm
-%%SITE_PERL%%/mach/Wx/Scintilla.pm
-%%SITE_PERL%%/mach/auto/Padre/.packlist
-%%SITE_PERL%%/mach/auto/Wx/Scintilla/.packlist
-%%SITE_PERL%%/mach/auto/Wx/Scintilla/Scintilla.so
-%%SITE_PERL%%/mach/auto/Wx/Scintilla/libwx_gtk2u_scintilla-%%WX_VERSION%%.so
-@dirrm %%SITE_PERL%%/mach/auto/Wx/Scintilla
-@dirrm %%SITE_PERL%%/mach/auto/Padre
-@dirrm %%SITE_PERL%%/mach/Wx/Scintilla
+%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla/Constant.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla/Manual.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla/TextCtrl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla/TextEvent.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Padre/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Scintilla/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Scintilla/Scintilla.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Scintilla/libwx_gtk2u_scintilla.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Scintilla
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Padre
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Wx/Scintilla
 @dirrm %%SITE_PERL%%/auto/share/dist/Padre/themes
 @dirrm %%SITE_PERL%%/auto/share/dist/Padre/templates/perl6
 @dirrm %%SITE_PERL%%/auto/share/dist/Padre/templates/perl5
@@ -519,6 +647,7 @@ bin/padre
 @dirrm %%SITE_PERL%%/Padre/File
 @dirrm %%SITE_PERL%%/Padre/Document/Ruby
 @dirrm %%SITE_PERL%%/Padre/Document/Python
+@dirrm %%SITE_PERL%%/Padre/Document/Perl/Starter
 @dirrm %%SITE_PERL%%/Padre/Document/Perl/QuickFix
 @dirrm %%SITE_PERL%%/Padre/Document/Perl
 @dirrm %%SITE_PERL%%/Padre/Document/Java