diff options
author | schmonz <schmonz> | 2014-06-27 03:29:03 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2014-06-27 03:29:03 +0000 |
commit | d0b3d9e0b4d67979ceffb4d194abb7786dc8354b (patch) | |
tree | 9650a9f823d8cc382577c01942ca97b2815ebb93 | |
parent | 0eb4caf38d013317e2ddbb2163a3635cadb65ca8 (diff) | |
download | pkgsrc-d0b3d9e0b4d67979ceffb4d194abb7786dc8354b.tar.gz |
Apply patch from RT to force intended precedence. Add missing
dependency on Module::Pluggable. Tests pass, and with these changes
p5-Wx builds again on NetBSD. Bump PKGREVISION.
-rw-r--r-- | x11/p5-Alien-wxWidgets/Makefile | 5 | ||||
-rw-r--r-- | x11/p5-Alien-wxWidgets/distinfo | 3 | ||||
-rw-r--r-- | x11/p5-Alien-wxWidgets/patches/patch-lib_Alien_wxWidgets_Utility.pm | 17 |
3 files changed, 22 insertions, 3 deletions
diff --git a/x11/p5-Alien-wxWidgets/Makefile b/x11/p5-Alien-wxWidgets/Makefile index 4244f9a11a3..e34c237196d 100644 --- a/x11/p5-Alien-wxWidgets/Makefile +++ b/x11/p5-Alien-wxWidgets/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2014/05/29 23:38:19 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2014/06/27 03:29:03 schmonz Exp $ DISTNAME= Alien-wxWidgets-0.60 PKGNAME= p5-${DISTNAME} -PKGREVISION= 14 +PKGREVISION= 15 CATEGORIES= x11 perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Alien/} @@ -12,6 +12,7 @@ COMMENT= Building, finding and using wxWidgets binaries LICENSE= ${PERL5_LICENSE} BUILD_DEPENDS+= {perl>=5.10.1,p5-ExtUtils-CBuilder>=0.24}:../../devel/p5-ExtUtils-CBuilder +DEPENDS+= p5-Module-Pluggable>=2.6:../../devel/p5-Module-Pluggable USE_TOOLS+= gmake pkg-config USE_LANGUAGES+= c c++ diff --git a/x11/p5-Alien-wxWidgets/distinfo b/x11/p5-Alien-wxWidgets/distinfo index 2e2ca6ca064..8cfb56f103f 100644 --- a/x11/p5-Alien-wxWidgets/distinfo +++ b/x11/p5-Alien-wxWidgets/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2012/09/12 09:30:21 sno Exp $ +$NetBSD: distinfo,v 1.7 2014/06/27 03:29:03 schmonz Exp $ SHA1 (Alien-wxWidgets-0.60.tar.gz) = b8d182713adc9a7a78a81e674aae79b898669e8d RMD160 (Alien-wxWidgets-0.60.tar.gz) = aa48747dada3d2025cabfd1fc0d1910470fe49e5 Size (Alien-wxWidgets-0.60.tar.gz) = 666207 bytes +SHA1 (patch-lib_Alien_wxWidgets_Utility.pm) = c6d0764e3b496f875b2d2f7ba700fc04ca026a28 diff --git a/x11/p5-Alien-wxWidgets/patches/patch-lib_Alien_wxWidgets_Utility.pm b/x11/p5-Alien-wxWidgets/patches/patch-lib_Alien_wxWidgets_Utility.pm new file mode 100644 index 00000000000..28c3dfc8484 --- /dev/null +++ b/x11/p5-Alien-wxWidgets/patches/patch-lib_Alien_wxWidgets_Utility.pm @@ -0,0 +1,17 @@ +$NetBSD: patch-lib_Alien_wxWidgets_Utility.pm,v 1.1 2014/06/27 03:29:03 schmonz Exp $ + +Force intended precedence. + +Patch from <https://rt.cpan.org/Public/Bug/Display.html?id=87202>. + +--- lib/Alien/wxWidgets/Utility.pm.orig 2014-03-08 14:04:14.000000000 +0000 ++++ lib/Alien/wxWidgets/Utility.pm +@@ -74,7 +74,7 @@ sub awx_capture { + sub awx_cc_is_msvc { + my( $cc ) = @_; + +- return $^O =~ /MSWin32/ and $cc =~ /^cl/i; ++ return ($^O =~ /MSWin32/ and $cc =~ /^cl/i); + } + + sub awx_cc_is_gcc { |