2 files changed, 95 insertions, 126 deletions

diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
index ad9dfdb4a41b..ddf1fe3da4b8 100644
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Wx
 PORTVERSION=	0.99.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Wx/pkg-plist b/x11-toolkits/p5-Wx/pkg-plist
index e919503cbb66..eaee0c7e2121 100644
--- a/x11-toolkits/p5-Wx/pkg-plist
+++ b/x11-toolkits/p5-Wx/pkg-plist
@@ -14,128 +14,97 @@ bin/wxperl_overload
 %%PERL5_MAN3%%/Wx::build::Options.3.gz
 %%PERL5_MAN3%%/Wx::build::Utils.3.gz
 man/man1/wxperl_overload.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/AUI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Api.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/App.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/ArtProvider.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Calendar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DND.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DataView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DateTime.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DocView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/DropSource.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/FS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Grid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Help.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Html.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/IPC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Loader.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Locale.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/MDI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Media.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Menu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Mini.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/NewClass.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Overload/Driver.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Overload/Handle.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Perl/Carp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Perl/SplashFast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Perl/TextValidator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/PerlTest.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Print.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/PropertyGrid.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/RadioBox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Ribbon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/RichText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/STC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Socket.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Thread.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Timer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/WebView.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/Wx_Exp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XRC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP/Enum.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP/Overload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP/Virtual.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Any_OS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Any_wx_config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Hacks.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/MacOSX_GCC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Win32_MSVC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker/Win32_MinGW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/Opt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/Options.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/chkconfig.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/compat.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/constants.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/e_cback.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/event.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/helpers.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/overload.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/setup.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/streams.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/v_cback.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/v_cback_def.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp/wxapi.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Wx/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/AUI/AUI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Calendar/Calendar.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DND/DND.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DataView/DataView.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DateTime/DateTime.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DocView/DocView.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/FS/FS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Grid/Grid.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Help/Help.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Html/Html.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/IPC/IPC.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/MDI/MDI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Media/Media.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PerlTest/PerlTest.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Print/Print.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PropertyGrid/PropertyGrid.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Ribbon/Ribbon.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/RichText/RichText.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/STC/STC.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Socket/Socket.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/WebView/WebView.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Wx.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/XRC/XRC.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/WebView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Ribbon
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PropertyGrid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/IPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DataView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/XRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Socket
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/STC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/RichText
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Print
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PerlTest
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Media
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/MDI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Html
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Help
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Grid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/FS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DocView
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DateTime
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DND
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Calendar
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/AUI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/cpp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/build/MakeMaker
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/build
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/XSP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/Perl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx/Overload
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Wx
+%%SITE_ARCH%%/Wx.pm
+%%SITE_ARCH%%/Wx/AUI.pm
+%%SITE_ARCH%%/Wx/Api.pod
+%%SITE_ARCH%%/Wx/App.pm
+%%SITE_ARCH%%/Wx/ArtProvider.pm
+%%SITE_ARCH%%/Wx/Calendar.pm
+%%SITE_ARCH%%/Wx/DND.pm
+%%SITE_ARCH%%/Wx/DataView.pm
+%%SITE_ARCH%%/Wx/DateTime.pm
+%%SITE_ARCH%%/Wx/DocView.pm
+%%SITE_ARCH%%/Wx/DropSource.pm
+%%SITE_ARCH%%/Wx/Event.pm
+%%SITE_ARCH%%/Wx/FS.pm
+%%SITE_ARCH%%/Wx/Grid.pm
+%%SITE_ARCH%%/Wx/Help.pm
+%%SITE_ARCH%%/Wx/Html.pm
+%%SITE_ARCH%%/Wx/IPC.pm
+%%SITE_ARCH%%/Wx/Loader.pod
+%%SITE_ARCH%%/Wx/Locale.pm
+%%SITE_ARCH%%/Wx/MDI.pm
+%%SITE_ARCH%%/Wx/Media.pm
+%%SITE_ARCH%%/Wx/Menu.pm
+%%SITE_ARCH%%/Wx/Mini.pm
+%%SITE_ARCH%%/Wx/NewClass.pod
+%%SITE_ARCH%%/Wx/Overload/Driver.pm
+%%SITE_ARCH%%/Wx/Overload/Handle.pm
+%%SITE_ARCH%%/Wx/Perl/Carp.pm
+%%SITE_ARCH%%/Wx/Perl/SplashFast.pm
+%%SITE_ARCH%%/Wx/Perl/TextValidator.pm
+%%SITE_ARCH%%/Wx/PerlTest.pm
+%%SITE_ARCH%%/Wx/Print.pm
+%%SITE_ARCH%%/Wx/PropertyGrid.pm
+%%SITE_ARCH%%/Wx/RadioBox.pm
+%%SITE_ARCH%%/Wx/Ribbon.pm
+%%SITE_ARCH%%/Wx/RichText.pm
+%%SITE_ARCH%%/Wx/STC.pm
+%%SITE_ARCH%%/Wx/Socket.pm
+%%SITE_ARCH%%/Wx/Thread.pod
+%%SITE_ARCH%%/Wx/Timer.pm
+%%SITE_ARCH%%/Wx/WebView.pm
+%%SITE_ARCH%%/Wx/Wx_Exp.pm
+%%SITE_ARCH%%/Wx/XRC.pm
+%%SITE_ARCH%%/Wx/XSP/Enum.pm
+%%SITE_ARCH%%/Wx/XSP/Event.pm
+%%SITE_ARCH%%/Wx/XSP/Overload.pm
+%%SITE_ARCH%%/Wx/XSP/Virtual.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Any_OS.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Any_wx_config.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Core.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Hacks.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/MacOSX_GCC.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32_MSVC.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32_MinGW.pm
+%%SITE_ARCH%%/Wx/build/Opt.pm
+%%SITE_ARCH%%/Wx/build/Options.pm
+%%SITE_ARCH%%/Wx/build/Utils.pm
+%%SITE_ARCH%%/Wx/cpp/chkconfig.h
+%%SITE_ARCH%%/Wx/cpp/compat.h
+%%SITE_ARCH%%/Wx/cpp/constants.h
+%%SITE_ARCH%%/Wx/cpp/e_cback.h
+%%SITE_ARCH%%/Wx/cpp/event.h
+%%SITE_ARCH%%/Wx/cpp/helpers.h
+%%SITE_ARCH%%/Wx/cpp/overload.h
+%%SITE_ARCH%%/Wx/cpp/setup.h
+%%SITE_ARCH%%/Wx/cpp/streams.h
+%%SITE_ARCH%%/Wx/cpp/v_cback.h
+%%SITE_ARCH%%/Wx/cpp/v_cback_def.h
+%%SITE_ARCH%%/Wx/cpp/wxapi.h
+%%SITE_ARCH%%/Wx/typemap
+%%SITE_ARCH%%/auto/Wx/AUI/AUI.so
+%%SITE_ARCH%%/auto/Wx/Calendar/Calendar.so
+%%SITE_ARCH%%/auto/Wx/DND/DND.so
+%%SITE_ARCH%%/auto/Wx/DataView/DataView.so
+%%SITE_ARCH%%/auto/Wx/DateTime/DateTime.so
+%%SITE_ARCH%%/auto/Wx/DocView/DocView.so
+%%SITE_ARCH%%/auto/Wx/FS/FS.so
+%%SITE_ARCH%%/auto/Wx/Grid/Grid.so
+%%SITE_ARCH%%/auto/Wx/Help/Help.so
+%%SITE_ARCH%%/auto/Wx/Html/Html.so
+%%SITE_ARCH%%/auto/Wx/IPC/IPC.so
+%%SITE_ARCH%%/auto/Wx/MDI/MDI.so
+%%SITE_ARCH%%/auto/Wx/Media/Media.so
+%%SITE_ARCH%%/auto/Wx/PerlTest/PerlTest.so
+%%SITE_ARCH%%/auto/Wx/Print/Print.so
+%%SITE_ARCH%%/auto/Wx/PropertyGrid/PropertyGrid.so
+%%SITE_ARCH%%/auto/Wx/Ribbon/Ribbon.so
+%%SITE_ARCH%%/auto/Wx/RichText/RichText.so
+%%SITE_ARCH%%/auto/Wx/STC/STC.so
+%%SITE_ARCH%%/auto/Wx/Socket/Socket.so
+%%SITE_ARCH%%/auto/Wx/WebView/WebView.so
+%%SITE_ARCH%%/auto/Wx/Wx.so
+%%SITE_ARCH%%/auto/Wx/XRC/XRC.so