<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/36c427b1123a0ce5feb64c5a8a5f52bfa4719428">https://github.com/macports/macports-ports/commit/36c427b1123a0ce5feb64c5a8a5f52bfa4719428</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 36c427b1123a0ce5feb64c5a8a5f52bfa4719428
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Nov 4 10:44:03 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> p5-wx: remove unused code and patches
</span>---
perl/p5-wx/Portfile | 20 +----------
...tch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff | 42 ----------------------
.../p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff | 11 ------
3 files changed, 1 insertion(+), 72 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-wx/Portfile b/perl/p5-wx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f5785a..aade94d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-wx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-wx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,28 +27,10 @@ if {${perl5.major} != ""} {
</span> port:p${perl5.major}-alien-wxwidgets \
port:${wxWidgets.port}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary change the mode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not an issue for version 0.9932
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fs-traverse dir ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if { [ file isdirectory ${dir} ] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# file attributes ${dir} -permissions 0755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # patch for apparent API change in wxWidgets 3.0.3
# https://github.com/wxWidgets/wxWidgets/commit/6b335c8ca440a7adea8309c2272b53aaff59f526
# https://rt.cpan.org/Public/Bug/Display.html?ShowHeaders=1;id=121603
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-XS-PropertySheetDialog.xsp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this is now fixed upstream
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-cpp-wxPerl.osx-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # try to find a better way to fix that problem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace -W ${worksrcpath} "s|@@CC@@|${configure.cc}|g" cpp/wxPerl.osx/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-XS-PropertySheetDialog.xsp.diff
</span>
configure.args installdirs=vendor
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff b/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b2a4922..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-wx/files/patch-build-Wx-build-MakeMaker-MacOSX_GCC.pm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/45120
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/44640
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/47339
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://rt.cpan.org/Public/Bug/Display.html?id=99038
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/Wx/build/MakeMaker/MacOSX_GCC.pm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/Wx/build/MakeMaker/MacOSX_GCC.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,26 +14,18 @@ if ($ENV{MACOSX_DEPLOYMENT_TARGET}) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $tools43 = '/Applications/Xcode.app/Contents/Developer/Tools';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--my $restoolpath = ( -d $tools43 ) ? $tools43 : '/Developer/Tools';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+my $restoolpath = $tools43;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ( ! -d $tools43 ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( -d '/Developer/Tools' ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $restoolpath = '/Developer/Tools';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $restoolpath = '/usr/bin';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub get_flags {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $this = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my %config = $this->SUPER::get_flags;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ($config{CC} =~ /clang\+\+/ || $config{LD} =~ /clang\+\+/) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- my $sdkrepl = '';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for my $sdkversion ( qw( 10.9 10.8 10.7 10.6 ) ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- my $macossdk = qq(/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${sdkversion}.sdk);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( -d $macossdk ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $sdkrepl = 'clang++ -isysroot ' . $macossdk . ' -stdlib=libc++';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- last;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( $sdkrepl ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $config{CC} =~ s/clang\+\+/$sdkrepl/g;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $config{LD} =~ s/clang\+\+/$sdkrepl/g;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return %config;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff b/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a6cbd07..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-wx/files/patch-cpp-wxPerl.osx-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cpp/wxPerl.osx/Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cpp/wxPerl.osx/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,7 @@ $(BUILD)/wxPerl.app/Contents/Info.plist: $(BUILD)/wxPerl.app/Contents
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp Info.plist $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(BUILD)/wxPerl.app/Contents/MacOS/wxPerl: $(BUILD)/wxPerl.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gcc -o $@ $(ARCH_FLAGS) main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@CC@@ -o $@ $(ARCH_FLAGS) main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(BUILD)/wxPerl.app/Contents/Resources/wxPerl.rsrc: $(BUILD)/wxPerl.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RESTOOLDIR)/Rez -d __DARWIN__ -useDF -o $(BUILD)/wxPerl.rsrc $(ARCH_FLAGS) wxPerl.r
</span></pre><pre style='margin:0'>
</pre>