4 files changed, 42 insertions, 53 deletions

diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
index c568556784fe..352d3e53ba4f 100644
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Wx
-PORTVERSION=	0.99.16
+PORTVERSION=	0.99.23
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -18,35 +18,15 @@ BUILD_DEPENDS=	p5-Alien-wxWidgets>=0.25:${PORTSDIR}/x11-toolkits/p5-Alien-wxWidg
 		p5-ExtUtils-XSpp>=0.16.03:${PORTSDIR}/devel/p5-ExtUtils-XSpp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS_DEFINE=	UNICODE
-OPTIONS_DEFAULT=	UNICODE
-UNICODE_DESC=	Build with Unicode support
-
 USES=		perl5
 USE_PERL5=	configure
-USE_WX=		2.6+
-WX_COMPS=	wx contrib
+USE_WX=		3.0
+WX_COMPS=	wx
+WX_UNICODE=	1
 CC=		${CXX}
 CFLAGS+=	-pthread -Wno-write-strings
-MAKE_JOBS_UNSAFE=	yes
-
-MAN1=		wxperl_overload.1
-MAN3=		Wx.3 \
-		Wx::Api.3 \
-		Wx::Loader.3 \
-		Wx::NewClass.3 \
-		Wx::Perl::Carp.3 \
-		Wx::Perl::SplashFast.3 \
-		Wx::Perl::TextValidator.3 \
-		Wx::Socket.3 \
-		Wx::Thread.3 \
-		Wx::XSP::Overload.3 \
-		Wx::build::MakeMaker.3 \
-		Wx::build::MakeMaker::Win32_MSVC.3 \
-		Wx::build::Options.3 \
-		Wx::build::Utils.3
+CONFIGURE_ENV=	CXX=${CXX}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501508
@@ -54,19 +34,6 @@ BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.15:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
 RUN_DEPENDS+=	p5-ExtUtils-ParseXS>=3.15:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
 .endif
 
-.if ${PORT_OPTIONS:MUNICODE}
-WX_UNICODE=	yes
-ALIEN_UNICODE=	${LS} ${SITE_PERL}/${PERL_ARCH}/Alien/wxWidgets/Config | ${GREP} "_uni_"
-
-pre-configure:
-	@if [ ! "$$(${ALIEN_UNICODE})" ]; then \
-		${ECHO_MSG}; \
-		${ECHO_MSG} "===>  It seems x11-toolkits/p5-Alien-wxWidgets was compiled without"; \
-		${ECHO_MSG} "      Unicode suport. Please rebuild it and try again."; \
-		${ECHO_MSG}; \
-		exit 1; \
-	fi
-.endif
 
 post-configure:
 	@${FIND} ${WRKSRC} -name "Makefile" -type f | ${XARGS} \
diff --git a/x11-toolkits/p5-Wx/distinfo b/x11-toolkits/p5-Wx/distinfo
index 5012fffa65a1..b6ee6ed6a3c0 100644
--- a/x11-toolkits/p5-Wx/distinfo
+++ b/x11-toolkits/p5-Wx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Wx-0.9916.tar.gz) = 17f9967d63bb8fd0ea1bbdeec3a6eff1a512d53c4f6b576eca3aed00b7722c5b
-SIZE (Wx-0.9916.tar.gz) = 476639
+SHA256 (Wx-0.9923.tar.gz) = 93e974c7d5ae2c66fe2f3de14988d372cea5b9b5e3da6798776aa90efe7442c9
+SIZE (Wx-0.9923.tar.gz) = 484651
diff --git a/x11-toolkits/p5-Wx/files/patch-Wx.xs b/x11-toolkits/p5-Wx/files/patch-Wx.xs
deleted file mode 100644
index e0a1155734f9..000000000000
--- a/x11-toolkits/p5-Wx/files/patch-Wx.xs
+++ /dev/null
@@ -1,13 +0,0 @@
---- Wx.xs.orig	2012-12-31 01:28:32.000000000 +0800
-+++ Wx.xs	2012-12-31 01:29:02.000000000 +0800
-@@ -325,10 +325,7 @@
- 
-     if( wxPerlAppCreated || wxTopLevelWindows.GetCount() > 0 )
-         XSRETURN( true );
--#if defined(DEBUGGING) && !defined(PERL_USE_SAFE_PUTENV)
--    // avoid crash on exit in Fedora (and other DEBUGGING Perls)
-     PL_use_safe_putenv = 1;
--#endif
- 
-     int argc = 0;
- #if wxUSE_UNICODE && WXPERL_W_VERSION_GE( 2, 5, 3 )
diff --git a/x11-toolkits/p5-Wx/pkg-plist b/x11-toolkits/p5-Wx/pkg-plist
index 6b64d3be3d34..b925b4f3d7b5 100644
--- a/x11-toolkits/p5-Wx/pkg-plist
+++ b/x11-toolkits/p5-Wx/pkg-plist
@@ -1,4 +1,19 @@
 bin/wxperl_overload
+%%PERL5_MAN3%%/Wx.3.gz
+%%PERL5_MAN3%%/Wx::Api.3.gz
+%%PERL5_MAN3%%/Wx::Loader.3.gz
+%%PERL5_MAN3%%/Wx::NewClass.3.gz
+%%PERL5_MAN3%%/Wx::Perl::Carp.3.gz
+%%PERL5_MAN3%%/Wx::Perl::SplashFast.3.gz
+%%PERL5_MAN3%%/Wx::Perl::TextValidator.3.gz
+%%PERL5_MAN3%%/Wx::Socket.3.gz
+%%PERL5_MAN3%%/Wx::Thread.3.gz
+%%PERL5_MAN3%%/Wx::XSP::Overload.3.gz
+%%PERL5_MAN3%%/Wx::build::MakeMaker.3.gz
+%%PERL5_MAN3%%/Wx::build::MakeMaker::Win32_MSVC.3.gz
+%%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
@@ -6,6 +21,7 @@ bin/wxperl_overload
 %%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
@@ -14,6 +30,7 @@ bin/wxperl_overload
 %%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
@@ -28,12 +45,15 @@ bin/wxperl_overload
 %%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
@@ -72,6 +92,8 @@ bin/wxperl_overload
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Calendar/Calendar.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DND/DND.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DND/DND.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DataView/DataView.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DataView/DataView.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DateTime/DateTime.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DateTime/DateTime.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/DocView/DocView.bs
@@ -84,6 +106,8 @@ bin/wxperl_overload
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Help/Help.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Html/Html.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Html/Html.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/IPC/IPC.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/IPC/IPC.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/MDI/MDI.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/MDI/MDI.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Media/Media.bs
@@ -92,16 +116,27 @@ bin/wxperl_overload
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PerlTest/PerlTest.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Print/Print.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Print/Print.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PropertyGrid/PropertyGrid.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PropertyGrid/PropertyGrid.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Ribbon/Ribbon.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Ribbon/Ribbon.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/RichText/RichText.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/RichText/RichText.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/STC/STC.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/STC/STC.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Socket/Socket.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Socket/Socket.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/WebView/WebView.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/WebView/WebView.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Wx.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Wx.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/XRC/XRC.bs
 %%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