- Update to 0.99.16

- Give maintainership to submitter
- Add LICENSE (ART10 and GPLv1)
- Rearrange section order, sort MAN3, cleanup TABs

PR:		ports/175445
Submitted by:	Po-Chien Lin <linpc@cs.nctu.edu.tw>

4 files changed, 50 insertions, 29 deletions

diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
index 5ab7417a69b9..deb0d453c973 100644
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -2,18 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	Wx
-PORTVERSION=	0.97
-PORTREVISION=	1
+PORTVERSION=	0.99.16
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	linpc@cs.nctu.edu.tw
 COMMENT=	Perl5 interface to the wxWidgets cross-platform GUI toolkit
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Alien-wxWidgets>=0.25:${PORTSDIR}/x11-toolkits/p5-Alien-wxWidgets \
-		p5-ExtUtils-ParseXS>=2.22:${PORTSDIR}/devel/p5-ExtUtils-ParseXS \
-		p5-ExtUtils-XSpp>=0.06:${PORTSDIR}/devel/p5-ExtUtils-XSpp
+		p5-ExtUtils-XSpp>=0.16.03:${PORTSDIR}/devel/p5-ExtUtils-XSpp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	UNICODE
@@ -28,32 +30,42 @@ CC=		${CXX}
 CFLAGS+=	-pthread -Wno-write-strings
 MAKE_JOBS_UNSAFE=	yes
 
-.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MUNICODE}
-WX_UNICODE=	yes
-.endif
-
-ALIEN_UNICODE=	${PERL} -MAlien::wxWidgets -e 'print Alien::wxWidgets->key' | ${GREP} "_uni_"
-
 MAN1=		wxperl_overload.1
-MAN3=		Wx::Perl::TextValidator.3 \
-		Wx::Perl::Carp.3 \
-		Wx::Socket.3 \
+MAN3=		Wx.3 \
 		Wx::Api.3 \
-		Wx::build::Utils.3 \
-		Wx::build::Options.3 \
-		Wx::Perl::SplashFast.3 \
-		Wx::build::MakeMaker::Win32_MSVC.3 \
-		Wx::build::MakeMaker.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.3
+		Wx::XSP::Overload.3 \
+		Wx::build::MakeMaker.3 \
+		Wx::build::MakeMaker::Win32_MSVC.3 \
+		Wx::build::Options.3 \
+		Wx::build::Utils.3
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.48:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+RUN_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.48:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+.endif
+
+.if ${PERL_LEVEL} < 501508
+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-wxWidget was compiled without"; \
+		${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; \
@@ -64,4 +76,4 @@ post-configure:
 	@${FIND} ${WRKSRC} -name "Makefile" -type f | ${XARGS} \
 		${REINPLACE_CMD} -e 's/^CCFLAGS = .*$$/CCFLAGS = ${CFLAGS}/'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/p5-Wx/distinfo b/x11-toolkits/p5-Wx/distinfo
index c6308231c348..5012fffa65a1 100644
--- a/x11-toolkits/p5-Wx/distinfo
+++ b/x11-toolkits/p5-Wx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Wx-0.97.tar.gz) = 1f2ad16557baece1ca161d34f3ff4072734729d9454ea1fdf7383cd7c61c24ed
-SIZE (Wx-0.97.tar.gz) = 359283
+SHA256 (Wx-0.9916.tar.gz) = 17f9967d63bb8fd0ea1bbdeec3a6eff1a512d53c4f6b576eca3aed00b7722c5b
+SIZE (Wx-0.9916.tar.gz) = 476639
diff --git a/x11-toolkits/p5-Wx/files/patch-Wx.xs b/x11-toolkits/p5-Wx/files/patch-Wx.xs
index 90ea3220874e..e0a1155734f9 100644
--- a/x11-toolkits/p5-Wx/files/patch-Wx.xs
+++ b/x11-toolkits/p5-Wx/files/patch-Wx.xs
@@ -1,9 +1,9 @@
---- Wx.xs.orig	2009-04-20 22:17:27.000000000 +0200
-+++ Wx.xs	2009-06-26 09:20:07.000000000 +0200
-@@ -278,10 +278,7 @@ Load()
+--- 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 )
-         return;
+         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;
diff --git a/x11-toolkits/p5-Wx/pkg-plist b/x11-toolkits/p5-Wx/pkg-plist
index 5836490a5541..6b64d3be3d34 100644
--- a/x11-toolkits/p5-Wx/pkg-plist
+++ b/x11-toolkits/p5-Wx/pkg-plist
@@ -20,11 +20,13 @@ bin/wxperl_overload
 %%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/RadioBox.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Wx/RichText.pm
@@ -34,6 +36,10 @@ bin/wxperl_overload
 %%SITE_PERL%%/%%PERL_ARCH%%/Wx/Timer.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
@@ -82,6 +88,8 @@ bin/wxperl_overload
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/MDI/MDI.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Media/Media.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/Media/Media.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Wx/PerlTest/PerlTest.bs
+%%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/RichText/RichText.bs
@@ -99,6 +107,7 @@ bin/wxperl_overload
 @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