[134714] trunk/dports/perl/p5-wx

[mojca at macports.org]

Revision: 134714
          https://trac.macports.org/changeset/134714
Author:   mojca at macports.org
Date:     2015-04-03 14:12:36 -0700 (Fri, 03 Apr 2015)
Log Message:
-----------
p5-wx: upgrade to 0.9927 (#47339)

Modified Paths:
--------------
    trunk/dports/perl/p5-wx/Portfile
    trunk/dports/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff

Added Paths:
-----------
    trunk/dports/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff

Modified: trunk/dports/perl/p5-wx/Portfile
===================================================================
--- trunk/dports/perl/p5-wx/Portfile	2015-04-03 20:27:26 UTC (rev 134713)
+++ trunk/dports/perl/p5-wx/Portfile	2015-04-03 21:12:36 UTC (rev 134714)
@@ -6,8 +6,7 @@
 PortGroup           wxWidgets 1.0
 
 perl5.branches      5.16 5.18 5.20
-perl5.setup         Wx 0.9923
-revision            2
+perl5.setup         Wx 0.9927
 
 platforms           darwin
 maintainers         mojca openmaintainer
@@ -16,13 +15,18 @@
 description         Interface to the wxWidgets cross-platform GUI toolkit
 long_description    ${description}
 
-checksums           rmd160  5243481e9623a974e95a73e27906483bdde2aba9 \
-                    sha256  93e974c7d5ae2c66fe2f3de14988d372cea5b9b5e3da6798776aa90efe7442c9
+checksums           rmd160  603c2041d7bdc46260a759783513f6ba00556306 \
+                    sha256  a174bd1b6a5558174697775be0ede2fb8260258d60bb6e116dfe6f56ac1d22bb
 
 if {${perl5.major} != ""} {
     wxWidgets.use   wxWidgets-3.0
 
-    patchfiles      patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff
+    patchfiles      patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff \
+                    patch-cpp-wxPerl.osx-Makefile.diff
+    post-patch {
+        # try to find a better way to fix that problem
+        reinplace -W ${worksrcpath} "s|@@CC@@|${configure.cc}|g" cpp/wxPerl.osx/Makefile
+    }
 
     depends_build-append \
                     port:p${perl5.major}-extutils-xspp

Modified: trunk/dports/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff
===================================================================
--- trunk/dports/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff	2015-04-03 20:27:26 UTC (rev 134713)
+++ trunk/dports/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff	2015-04-03 21:12:36 UTC (rev 134714)
@@ -1,19 +1,42 @@
 https://trac.macports.org/ticket/45120
 https://trac.macports.org/ticket/44640
+https://trac.macports.org/ticket/47339
 https://rt.cpan.org/Public/Bug/Display.html?id=99038
 
 --- build/Wx/build/MakeMaker/MacOSX_GCC.pm.orig
 +++ build/Wx/build/MakeMaker/MacOSX_GCC.pm
-@@ -6,11 +6,7 @@
+@@ -14,26 +14,18 @@ if ($ENV{MACOSX_DEPLOYMENT_TARGET}) {
+ }
  
- use Config;
- 
--die "Please set MACOSX_DEPLOYMENT_TARGET to 10.3 or above"
--    if $ENV{MACOSX_DEPLOYMENT_TARGET} && $ENV{MACOSX_DEPLOYMENT_TARGET} < 10.3;
--
--my $tools43 = '/Applications/Xcode.app/Contents/Developer/Tools';
+ my $tools43 = '/Applications/Xcode.app/Contents/Developer/Tools';
 -my $restoolpath = ( -d $tools43 ) ? $tools43 : '/Developer/Tools';
-+my $restoolpath = '/usr/bin';
++my $restoolpath = $tools43;
++if ( ! -d $tools43 ) {
++  if ( -d '/Developer/Tools' ) {
++    $restoolpath = '/Developer/Tools';
++  } else {
++    $restoolpath = '/usr/bin';
++  }
++}
  
- sub configure_core {
+ sub get_flags {
    my $this = shift;
+   my %config = $this->SUPER::get_flags;
+-  
+-  if ($config{CC} =~ /clang\+\+/ || $config{LD} =~ /clang\+\+/) {
+-	my $sdkrepl = '';
+-	for my $sdkversion ( qw( 10.9 10.8 10.7 10.6 ) ) {
+-	  my $macossdk = qq(/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${sdkversion}.sdk);
+-	  if( -d $macossdk ) {
+-		$sdkrepl = 'clang++ -isysroot ' . $macossdk . ' -stdlib=libc++';
+-		last;
+-	  }
+-	}
+-	if ( $sdkrepl ) {
+-	  $config{CC} =~ s/clang\+\+/$sdkrepl/g;
+-	  $config{LD} =~ s/clang\+\+/$sdkrepl/g;
+-	}
+-  }
+   return %config;
+ }
+ 

Added: trunk/dports/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff
===================================================================
--- trunk/dports/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff	                        (rev 0)
+++ trunk/dports/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff	2015-04-03 21:12:36 UTC (rev 134714)
@@ -0,0 +1,11 @@
+--- cpp/wxPerl.osx/Makefile.orig
++++ cpp/wxPerl.osx/Makefile
+@@ -30,7 +30,7 @@ $(BUILD)/wxPerl.app/Contents/Info.plist: $(BUILD)/wxPerl.app/Contents
+ 	cp Info.plist $@
+ 
+ $(BUILD)/wxPerl.app/Contents/MacOS/wxPerl: $(BUILD)/wxPerl.app/Contents/MacOS
+-	gcc -o $@ $(ARCH_FLAGS) main.c
++	@@CC@@ -o $@ $(ARCH_FLAGS) main.c
+ 
+ $(BUILD)/wxPerl.app/Contents/Resources/wxPerl.rsrc: $(BUILD)/wxPerl.app/Contents/Resources
+ 	$(RESTOOLDIR)/Rez -d __DARWIN__ -useDF -o $(BUILD)/wxPerl.rsrc $(ARCH_FLAGS) wxPerl.r
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150403/20991863/attachment.html>