Revision: 80085 http://trac.macports.org/changeset/80085 Author: jeremyhu@macports.org Date: 2011-07-03 17:18:24 -0700 (Sun, 03 Jul 2011) Log Message: ----------- gimp2: Add variants to choose between python versions (2.5, 2.6, and 2.7) Modified Paths: -------------- trunk/dports/graphics/gimp2/Portfile Modified: trunk/dports/graphics/gimp2/Portfile =================================================================== --- trunk/dports/graphics/gimp2/Portfile 2011-07-04 00:06:06 UTC (rev 80084) +++ trunk/dports/graphics/gimp2/Portfile 2011-07-04 00:18:24 UTC (rev 80085) @@ -7,7 +7,7 @@ conflicts gimp2-devel # please remember to update the gimp metapackage to match version 2.6.11 -revision 5 +revision 6 categories graphics maintainers devans homepage http://www.gimp.org/ @@ -52,8 +52,7 @@ port:libgnomeui \ port:curl \ port:libwmf \ - port:lcms \ - port:py26-gtk + port:lcms platform darwin 9 { post-patch { @@ -62,10 +61,6 @@ } } -configure.python ${prefix}/bin/python2.6 -set python_framework ${frameworks_dir}/Python.framework/Versions/2.6 -configure.pkg_config_path ${python_framework}/lib/pkgconfig -configure.env PATH=${python_framework}/bin:$env(PATH) configure.args --build=${configure.build_arch}-apple-${os.platform}${os.version} \ --enable-mp \ --with-pdbgen \ @@ -77,11 +72,38 @@ --without-gvfs \ --without-webkit +variant python25 conflicts no_python python26 python27 description {Use python 2.5} { + configure.python ${prefix}/bin/python2.5 + depends_lib-append port:py25-gtk + set python_framework ${frameworks_dir}/Python.framework/Versions/2.5 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.env PATH=${python_framework}/bin:$env(PATH) +} + +variant python26 conflicts no_python python25 python27 description {Use python 2.6} { + configure.python ${prefix}/bin/python2.6 + depends_lib-append port:py26-gtk + set python_framework ${frameworks_dir}/Python.framework/Versions/2.6 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.env PATH=${python_framework}/bin:$env(PATH) +} + +variant python27 conflicts no_python python25 python26 description {Use python 2.7} { + configure.python ${prefix}/bin/python2.7 + depends_lib-append port:py27-gtk + set python_framework ${frameworks_dir}/Python.framework/Versions/2.7 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.env PATH=${python_framework}/bin:$env(PATH) +} + variant no_python description {Disable Python scripts and filters} { - depends_lib-delete port:py26-gtk configure.args-append --disable-python } +if {![variant_isset no_python] && ![variant_isset python25] && ![variant_isset python26]} { + default_variants +python27 +} + variant gvfs description {Enable gvfs support} { depends_lib-append port:gvfs configure.args-delete --without-gvfs