Revision: 118523 https://trac.macports.org/changeset/118523 Author: mojca@macports.org Date: 2014-04-03 14:55:48 -0700 (Thu, 03 Apr 2014) Log Message: ----------- wxPerl-3.0: remove port (p5-wx from r118413 is now compatible with wxWidgets 3.0.0) Revision Links: -------------- https://trac.macports.org/changeset/118413 Modified Paths: -------------- trunk/dports/graphics/wxWidgets-3.0/Portfile Removed Paths: ------------- trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0 Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile =================================================================== --- trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-04-03 20:15:53 UTC (rev 118522) +++ trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-04-03 21:55:48 UTC (rev 118523) @@ -9,8 +9,6 @@ name wxWidgets-3.0 subport wxPython-3.0 {} subport wxgtk-3.0 {} -# wxPerl is just a temporary port with the last version that's compatible with wxPerl -subport wxPerl-3.0 {} version 3.0.0 set wxpython_ver 3.0.0.0 revision 5 @@ -23,10 +21,6 @@ } elseif {${subport} eq "wxPython-3.0"} { wxWidgets.use wxPython-3.0 revision 0 -} elseif {${subport} eq "wxPerl-3.0"} { - wxWidgets.use wxPerl-3.0 - version 2.9.4 - revision 0 } elseif {${subport} eq "wxgtk-3.0"} { # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more # wxgtk-3.0 is here mainly for testing purposes @@ -131,15 +125,6 @@ } livecheck.type none -} elseif {${subport} eq "wxPerl-3.0"} { - checksums ${distname}-${version}${extract.suffix} \ - rmd160 62301f8ce39a8aa96e65318f9d1e947c9dc09c50 \ - sha256 6c530c35f40c3b1a5f9a4577c3ee8a9982e745081f23e3fbb9951d6d17514d12 - - patchfiles patch-configure.294.diff \ - patch-upstream-src-osx-cocoa-window.mm.294.diff - - livecheck.type none } elseif {${subport} eq "wxgtk-3.0"} { # both patches could be added to wxWidgets-3.0, but they are not needed for Cocoa # Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff =================================================================== --- trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff 2014-04-03 20:15:53 UTC (rev 118522) +++ trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff 2014-04-03 21:55:48 UTC (rev 118523) @@ -1,79 +0,0 @@ -The first part is for GTK and makes sure that the port finds the right OpenGL library -The second part makes sure that install_name_tool doesn't break library names and links (http://trac.wxwidgets.org/ticket/15452) ---- configure.orig -+++ configure -@@ -21750,48 +21750,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --SEARCH_INCLUDE="\ -- /usr/local/include \ -- /usr/local/X11/include \ -- /usr/local/include/X11 \ -- /usr/local/X11R7/include \ -- /usr/local/X11R6/include \ -- /usr/local/include/X11R7 \ -- /usr/local/include/X11R6 \ -- \ -- /usr/Motif-2.1/include \ -- /usr/Motif-1.2/include \ -- /usr/include/Motif1.2 \ -- \ -- /usr/dt/include \ -- /usr/openwin/include \ -- \ -- /usr/include/Xm \ -- \ -- /usr/X11R7/include \ -- /usr/X11R6/include \ -- /usr/X11R6.4/include \ -- \ -- /usr/include/X11R7 \ -- /usr/include/X11R6 \ -- \ -- /usr/X11/include \ -- /usr/include/X11 \ -- \ -- /usr/XFree86/include/X11 \ -- /usr/pkg/include \ -- \ -- /usr/local/X1R5/include \ -- /usr/local/include/X11R5 \ -- /usr/X11R5/include \ -- /usr/include/X11R5 \ -- \ -- /usr/local/X11R4/include \ -- /usr/local/include/X11R4 \ -- /usr/X11R4/include \ -- /usr/include/X11R4 \ -- \ -- /usr/openwin/share/include" -+SEARCH_INCLUDE="@@PREFIX@@/include" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5 - $as_echo_n "checking for libraries directories... " >&6; } -@@ -29066,24 +29025,6 @@ rm -f core conftest.err conftest.$ac_objext \ - ;; - - *-*-darwin* ) -- install_name_tool=`which ${HOST_PREFIX}install_name_tool` -- if test "$install_name_tool" -a -x "$install_name_tool"; then -- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" -- cat <<EOF >change-install-names --#!/bin/sh --libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` --for i in \${libnames} ; do -- ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i} -- for dep in \${libnames} ; do -- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i} -- done --done --EOF -- chmod +x change-install-names -- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}" -- fi -- -- HEADER_PAD_OPTION="-headerpad_max_install_names" - ;; - - *-*-cygwin* | *-*-mingw32* ) Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff =================================================================== --- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff 2014-04-03 20:15:53 UTC (rev 118522) +++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff 2014-04-03 21:55:48 UTC (rev 118523) @@ -1,64 +0,0 @@ -Upstream: http://trac.wxwidgets.org/changeset/72195 ---- src/osx/cocoa/window.mm (revision 72169) -+++ src/osx/cocoa/window.mm (revision 72195) -@@ -456,4 +456,9 @@ - - (CGFloat)deviceDeltaX; - - (CGFloat)deviceDeltaY; -+ -+// 10.7+ -+- (BOOL)hasPreciseScrollingDeltas; -+- (CGFloat)scrollingDeltaX; -+- (CGFloat)scrollingDeltaY; - @end - -@@ -610,21 +615,37 @@ - wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; - -- // see http://developer.apple.com/qa/qa2005/qa1453.html -- // for more details on why we have to look for the exact type -- -- const EventRef cEvent = (EventRef) [nsEvent eventRef]; -- bool isMouseScrollEvent = false; -- if ( cEvent ) -- isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll; -- -- if ( isMouseScrollEvent ) -+ if ( UMAGetSystemVersion() >= 0x1070 ) - { -- deltaX = [nsEvent deviceDeltaX]; -- deltaY = [nsEvent deviceDeltaY]; -+ if ( [nsEvent hasPreciseScrollingDeltas] ) -+ { -+ deltaX = [nsEvent scrollingDeltaX]; -+ deltaY = [nsEvent scrollingDeltaY]; -+ } -+ else -+ { -+ deltaX = [nsEvent scrollingDeltaX] * 10; -+ deltaY = [nsEvent scrollingDeltaY] * 10; -+ } - } - else - { -- deltaX = ([nsEvent deltaX] * 10); -- deltaY = ([nsEvent deltaY] * 10); -+ const EventRef cEvent = (EventRef) [nsEvent eventRef]; -+ // see http://developer.apple.com/qa/qa2005/qa1453.html -+ // for more details on why we have to look for the exact type -+ -+ bool isMouseScrollEvent = false; -+ if ( cEvent ) -+ isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll; -+ -+ if ( isMouseScrollEvent ) -+ { -+ deltaX = [nsEvent deviceDeltaX]; -+ deltaY = [nsEvent deviceDeltaY]; -+ } -+ else -+ { -+ deltaX = ([nsEvent deltaX] * 10); -+ deltaY = ([nsEvent deltaY] * 10); -+ } - } - Deleted: trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0 =================================================================== --- trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0 2014-04-03 20:15:53 UTC (rev 118522) +++ trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0 2014-04-03 21:55:48 UTC (rev 118523) @@ -1,8 +0,0 @@ -${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/bin/wx-config -${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/bin/wxrc-2.9 -${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/aclocal/wxwin.m4 -${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx.bkl -${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx_presets.py -${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx_unix.bkl -${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx_win32.bkl -${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx_xrc.bkl