Revision: 108473 https://trac.macports.org/changeset/108473 Author: mojca@macports.org Date: 2013-07-23 16:55:55 -0700 (Tue, 23 Jul 2013) Log Message: ----------- mojca/wxWidgets: rename wxWidgets->28, add basic port select functionality Modified Paths: -------------- users/mojca/wxports/graphics/wxWidgets28/Portfile users/mojca/wxports/graphics/wxWidgets30/Portfile Added Paths: ----------- users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28 users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30 Modified: users/mojca/wxports/graphics/wxWidgets28/Portfile =================================================================== --- users/mojca/wxports/graphics/wxWidgets28/Portfile 2013-07-23 23:39:51 UTC (rev 108472) +++ users/mojca/wxports/graphics/wxWidgets28/Portfile 2013-07-23 23:55:55 UTC (rev 108473) @@ -3,9 +3,11 @@ PortSystem 1.0 PortGroup archcheck 1.0 +PortGroup select 1.0 -name wxWidgets -conflicts wxgtk wxWidgets-python +name wxWidgets28 +# What is the wxWidgets-python conflict? +conflicts wxgtk wxWidgets-python wxWidgets30 epoch 3 version 2.8.12 revision 3 @@ -44,6 +46,11 @@ path:lib/pkgconfig/sdl.pc:libsdl \ port:libsdl_mixer +depends_run port:wxWidgets_select + +select.group wxWidgets +select.file ${filespath}/${name} + archcheck.files lib/libjpeg.dylib \ lib/libtiff.dylib \ lib/libpng.dylib \ @@ -132,9 +139,10 @@ readme-gtk.txt readme-mac.txt \ readme-mgl.txt readme-motif.txt readme-x11.txt \ ${destroot}${prefix}/share/doc/${name} + # TODO: ${installtype is not yet supported in the port select, it uses 'release' only; this should be fixed} set confscript ${prefix}/lib/wx/config/mac-unicode-${installtype}-2.8 reinplace "s|-L${build.dir}/lib||" ${destroot}${confscript} - ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config + #ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config } variant aui description {add support for AUI docking library} { Added: users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28 =================================================================== --- users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28 (rev 0) +++ users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28 2013-07-23 23:55:55 UTC (rev 108473) @@ -0,0 +1,2 @@ +lib/wx/config/mac-unicode-release-2.8 +bin/wxrc-2.8 Modified: users/mojca/wxports/graphics/wxWidgets30/Portfile =================================================================== --- users/mojca/wxports/graphics/wxWidgets30/Portfile 2013-07-23 23:39:51 UTC (rev 108472) +++ users/mojca/wxports/graphics/wxWidgets30/Portfile 2013-07-23 23:55:55 UTC (rev 108473) @@ -2,9 +2,10 @@ # $Id$ PortSystem 1.0 +PortGroup select 1.0 name wxWidgets30 -conflicts wxgtk wxWidgets +conflicts wxgtk wxWidgets28 version 2.9.5 epoch 20130717 @@ -40,6 +41,11 @@ port:libiconv \ port:expat +depends_run port:wxWidgets_select + +select.group wxWidgets +select.file ${filespath}/${name} + if {${os.major} < 10} { pre-fetch { ui_error "${name} requires Mac OS X 10.6 or later." @@ -84,8 +90,7 @@ configure.ccache no post-destroot { - set confscript ${prefix}/lib/wx/config/osx_cocoa-unicode-2.9 - ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config + # delete ${destroot}${prefix}/bin/wxrc } post-patch { Added: users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30 =================================================================== --- users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30 (rev 0) +++ users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30 2013-07-23 23:55:55 UTC (rev 108473) @@ -0,0 +1,2 @@ +lib/wx/config/osx_cocoa-unicode-2.9 +bin/wxrc-2.9