Revision: 115553 https://trac.macports.org/changeset/115553 Author: devans@macports.org Date: 2014-01-04 13:05:51 -0800 (Sat, 04 Jan 2014) Log Message: ----------- gimp2, gimp2-devel, gimp3-devel: fix configuration when python variants are deselected (#42019). Modified Paths: -------------- trunk/dports/graphics/gimp2/Portfile trunk/dports/graphics/gimp2-devel/Portfile trunk/dports/graphics/gimp3-devel/Portfile Modified: trunk/dports/graphics/gimp2/Portfile =================================================================== --- trunk/dports/graphics/gimp2/Portfile 2014-01-04 20:06:01 UTC (rev 115552) +++ trunk/dports/graphics/gimp2/Portfile 2014-01-04 21:05:51 UTC (rev 115553) @@ -125,6 +125,7 @@ --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib \ --disable-silent-rules \ + --disable-python \ --without-alsa \ --without-gvfs \ --without-gudev \ @@ -141,6 +142,7 @@ autoreconf.args -fvi variant python26 conflicts python27 description {Use python 2.6} { + configure.args-delete --disable-python configure.python ${prefix}/bin/python2.6 depends_lib-append port:py26-pygtk set python_framework ${frameworks_dir}/Python.framework/Versions/2.6 @@ -149,6 +151,7 @@ } variant python27 conflicts python26 description {Use python 2.7} { + configure.args-delete --disable-python configure.python ${prefix}/bin/python2.7 depends_lib-append port:py27-pygtk set python_framework ${frameworks_dir}/Python.framework/Versions/2.7 Modified: trunk/dports/graphics/gimp2-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp2-devel/Portfile 2014-01-04 20:06:01 UTC (rev 115552) +++ trunk/dports/graphics/gimp2-devel/Portfile 2014-01-04 21:05:51 UTC (rev 115553) @@ -118,6 +118,7 @@ --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib \ --disable-silent-rules \ + --disable-python \ --without-alsa \ --without-gvfs \ --without-gudev \ @@ -130,6 +131,7 @@ # https://trac.macports.org/ticket/35168 variant python26 conflicts python27 description {Use python 2.6} { + configure.args-delete --disable-python configure.python ${prefix}/bin/python2.6 depends_lib-append port:py26-pygtk set python_framework ${frameworks_dir}/Python.framework/Versions/2.6 @@ -138,6 +140,7 @@ } variant python27 conflicts python26 description {Use python 2.7} { + configure.args-delete --disable-python configure.python ${prefix}/bin/python2.7 depends_lib-append port:py27-pygtk set python_framework ${frameworks_dir}/Python.framework/Versions/2.7 Modified: trunk/dports/graphics/gimp3-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp3-devel/Portfile 2014-01-04 20:06:01 UTC (rev 115552) +++ trunk/dports/graphics/gimp3-devel/Portfile 2014-01-04 21:05:51 UTC (rev 115553) @@ -120,6 +120,7 @@ --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib \ --disable-silent-rules \ + --disable-python \ --without-alsa \ --without-gvfs \ --without-gudev \ @@ -132,6 +133,7 @@ # https://trac.macports.org/ticket/35168 variant python26 conflicts python27 description {Use python 2.6} { + configure.args-delete --disable-python configure.python ${prefix}/bin/python2.6 depends_lib-append port:py26-pygtk set python_framework ${frameworks_dir}/Python.framework/Versions/2.6 @@ -140,6 +142,7 @@ } variant python27 conflicts python26 description {Use python 2.7} { + configure.args-delete --disable-python configure.python ${prefix}/bin/python2.7 depends_lib-append port:py27-pygtk set python_framework ${frameworks_dir}/Python.framework/Versions/2.7