[139247] trunk/dports/graphics

[devans at macports.org]

Revision: 139247
          https://trac.macports.org/changeset/139247
Author:   devans at macports.org
Date:     2015-08-09 09:44:01 -0700 (Sun, 09 Aug 2015)
Log Message:
-----------
gimp2, gimp2-devel, gimp3-devel: remove conflict between variants +quartz and +help_browser after fixing build of webkit-gtk +quartz in r139245.

Revision Links:
--------------
    https://trac.macports.org/changeset/139245

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	2015-08-09 16:36:09 UTC (rev 139246)
+++ trunk/dports/graphics/gimp2/Portfile	2015-08-09 16:44:01 UTC (rev 139247)
@@ -141,7 +141,7 @@
     configure.args-append  --enable-debug
 }
 
-variant quartz conflicts gvfs help_browser {
+variant quartz conflicts gvfs {
     depends_lib-delete    port:xorg-libXcursor \
                           port:xorg-libXmu \
                           port:xorg-libXext \
@@ -163,7 +163,7 @@
     }
 }
 
-variant help_browser conflicts quartz description {Enable Gimp help browser} {
+variant help_browser description {Enable Gimp help browser} {
     depends_run             path:share/gimp/2.0/help:gimp-help-en
     configure.args-delete   --without-webkit
 

Modified: trunk/dports/graphics/gimp2-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp2-devel/Portfile	2015-08-09 16:36:09 UTC (rev 139246)
+++ trunk/dports/graphics/gimp2-devel/Portfile	2015-08-09 16:44:01 UTC (rev 139247)
@@ -129,7 +129,7 @@
     configure.args-append  --enable-debug
 }
 
-variant quartz conflicts help_browser {
+variant quartz {
     depends_lib-delete    port:xorg-libXcursor \
                           port:xorg-libXmu \
                           port:xorg-libXext \
@@ -143,7 +143,7 @@
     configure.ldflags-append   -framework Carbon
 }
 
-variant help_browser conflicts quartz description {Enable Gimp help browser} {
+variant help_browser description {Enable Gimp help browser} {
     depends_run             path:share/gimp/2.0/help:gimp-help-en
     configure.args-delete   --without-webkit
 

Modified: trunk/dports/graphics/gimp3-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp3-devel/Portfile	2015-08-09 16:36:09 UTC (rev 139246)
+++ trunk/dports/graphics/gimp3-devel/Portfile	2015-08-09 16:44:01 UTC (rev 139247)
@@ -131,7 +131,7 @@
     configure.args-append  --enable-debug
 }
 
-variant quartz conflicts help_browser {
+variant quartz {
     depends_lib-delete    port:xorg-libXcursor \
                           port:xorg-libXmu \
                           port:xorg-libXext \
@@ -145,7 +145,7 @@
     configure.ldflags-append   -framework Carbon
 }
 
-variant help_browser conflicts quartz description {Enable Gimp help browser} {
+variant help_browser description {Enable Gimp help browser} {
     depends_run             path:share/gimp/2.0/help:gimp-help-en
     configure.args-delete   --without-webkit
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150809/723334f7/attachment.html>