[115500] trunk/dports/graphics/gimp3-devel/Portfile

[devans at macports.org]

Revision: 115500
          https://trac.macports.org/changeset/115500
Author:   devans at macports.org
Date:     2014-01-03 09:07:50 -0800 (Fri, 03 Jan 2014)
Log Message:
-----------
gimp3-devel: update to recent gtk3-port branch, remove erroneously copied +no_python variant, add +gvfs to default variants, correct +help_browser webkit dependency.

Modified Paths:
--------------
    trunk/dports/graphics/gimp3-devel/Portfile

Modified: trunk/dports/graphics/gimp3-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp3-devel/Portfile	2014-01-03 17:03:34 UTC (rev 115499)
+++ trunk/dports/graphics/gimp3-devel/Portfile	2014-01-03 17:07:50 UTC (rev 115500)
@@ -1,14 +1,14 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
 PortGroup  compiler_blacklist_versions 1.0
 
 name            gimp3-devel
 conflicts       gimp2 gimp2-devel
 set git_name    gimp
-set git_commit  a1b101393b5b34fc06fa12c8fa6d08625088ddfb
-set git_date    20131212
+set git_commit  39de7158ad658ec498ac6edeaf0bd7d076a5d224
+set git_date    20140102
 version         2.99.0-${git_date}
 license         GPL-3+
 categories      graphics
@@ -30,8 +30,8 @@
 
 distname        ${git_name}-${git_commit}
 
-checksums       rmd160  246f928422c8d748599f521bf35edfef36971980 \
-                sha256  32cf553f27fbc92de1aba458059ebd1d5a5c0d6185edd1a9e850e4956ab6cd1a
+checksums       rmd160  f01280271fc7838c8a24e6ecd230dd0a319268d5 \
+                sha256  2ec647edc13ad0194e477f756466f434d226c49a26269e420fd0b31d3ab413d5
 
 depends_build   port:pkgconfig \
                 port:autoconf \
@@ -131,7 +131,7 @@
 #     It doesn't build any more anyways:
 #         https://trac.macports.org/ticket/35168
 
-variant python26 conflicts no_python python27 description {Use python 2.6} {
+variant python26 conflicts python27 description {Use python 2.6} {
     configure.python          ${prefix}/bin/python2.6
     depends_lib-append        port:py26-pygtk
     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
@@ -139,7 +139,7 @@
     configure.env             PATH=${python_framework}/bin:$env(PATH)
 }
 
-variant python27 conflicts no_python python26 description {Use python 2.7} {
+variant python27 conflicts python26 description {Use python 2.7} {
     configure.python          ${prefix}/bin/python2.7
     depends_lib-append        port:py27-pygtk
     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
@@ -147,14 +147,6 @@
     configure.env             PATH=${python_framework}/bin:$env(PATH)
 }
 
-variant no_python description {Disable Python scripts and filters} {
-    configure.args-append   --disable-python
-}
-
-if {![variant_isset no_python] && ![variant_isset python26]} {
-    default_variants +python27
-}
-
 variant gvfs description {Enable GIO/gvfs support} {
     depends_lib-append      port:gvfs
     configure.args-delete   --without-gvfs
@@ -190,22 +182,26 @@
     }
 }
 
-#
-# set default variants
-#
-
 variant help_browser description {Enable Gimp help browser} {
     configure.args-delete   --without-webkit
 
     if {${cxxstdlib} eq "libstdc++"} {
-            depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+            depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
     } else {
-            depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+            depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
     }
 }
 
-default_variants +help_browser
+#
+# set default variants
+#
 
+default_variants +help_browser +gvfs
+
+if {![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-activate {
     system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140103/8cec1fd3/attachment.html>