<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134714] trunk/dports/perl/p5-wx</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134714">134714</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-04-03 14:12:36 -0700 (Fri, 03 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>p5-wx: upgrade to 0.9927 (#47339)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsperlp5wxPortfile">trunk/dports/perl/p5-wx/Portfile</a></li>
<li><a href="#trunkdportsperlp5wxfilespatchbuildWxbuildMakeMakerMacOSX_GCCpmdiff">trunk/dports/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsperlp5wxfilespatchcppwxPerlosxMakefilediff">trunk/dports/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsperlp5wxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/perl/p5-wx/Portfile (134713 => 134714)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> perl5.branches 5.16 5.18 5.20
</span><del>-perl5.setup Wx 0.9923
-revision 2
</del><ins>+perl5.setup Wx 0.9927
</ins><span class="cx">
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers mojca openmaintainer
</span><span class="lines">@@ -16,13 +15,18 @@
</span><span class="cx"> description Interface to the wxWidgets cross-platform GUI toolkit
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><del>-checksums rmd160 5243481e9623a974e95a73e27906483bdde2aba9 \
- sha256 93e974c7d5ae2c66fe2f3de14988d372cea5b9b5e3da6798776aa90efe7442c9
</del><ins>+checksums rmd160 603c2041d7bdc46260a759783513f6ba00556306 \
+ sha256 a174bd1b6a5558174697775be0ede2fb8260258d60bb6e116dfe6f56ac1d22bb
</ins><span class="cx">
</span><span class="cx"> if {${perl5.major} != ""} {
</span><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx">
</span><del>- patchfiles patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff
</del><ins>+ 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
+ }
</ins><span class="cx">
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:p${perl5.major}-extutils-xspp
</span></span></pre></div>
<a id="trunkdportsperlp5wxfilespatchbuildWxbuildMakeMakerMacOSX_GCCpmdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff (134713 => 134714)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,19 +1,42 @@
</span><span class="cx"> https://trac.macports.org/ticket/45120
</span><span class="cx"> https://trac.macports.org/ticket/44640
</span><ins>+https://trac.macports.org/ticket/47339
</ins><span class="cx"> https://rt.cpan.org/Public/Bug/Display.html?id=99038
</span><span class="cx">
</span><span class="cx"> --- build/Wx/build/MakeMaker/MacOSX_GCC.pm.orig
</span><span class="cx"> +++ build/Wx/build/MakeMaker/MacOSX_GCC.pm
</span><del>-@@ -6,11 +6,7 @@
</del><ins>+@@ -14,26 +14,18 @@ if ($ENV{MACOSX_DEPLOYMENT_TARGET}) {
+ }
</ins><span class="cx">
</span><del>- 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';
</del><ins>+ my $tools43 = '/Applications/Xcode.app/Contents/Developer/Tools';
</ins><span class="cx"> -my $restoolpath = ( -d $tools43 ) ? $tools43 : '/Developer/Tools';
</span><del>-+my $restoolpath = '/usr/bin';
</del><ins>++my $restoolpath = $tools43;
++if ( ! -d $tools43 ) {
++ if ( -d '/Developer/Tools' ) {
++ $restoolpath = '/Developer/Tools';
++ } else {
++ $restoolpath = '/usr/bin';
++ }
++}
</ins><span class="cx">
</span><del>- sub configure_core {
</del><ins>+ sub get_flags {
</ins><span class="cx"> my $this = shift;
</span><ins>+ 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;
+ }
+
</ins></span></pre></div>
<a id="trunkdportsperlp5wxfilespatchcppwxPerlosxMakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff (0 => 134714)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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
</ins></span></pre>
</div>
</div>
</body>
</html>