[72540] trunk/dports/graphics/gdk-pixbuf2/Portfile

[jmr at macports.org]

Revision: 72540
          http://trac.macports.org/changeset/72540
Author:   jmr at macports.org
Date:     2010-10-20 04:16:13 -0700 (Wed, 20 Oct 2010)
Log Message:
-----------
gdk-pixbuf2: auto-deactivate conflicting versions of gtk2 (Let's maybe try to discuss disruptive changes beforehand in future?)

Modified Paths:
--------------
    trunk/dports/graphics/gdk-pixbuf2/Portfile

Modified: trunk/dports/graphics/gdk-pixbuf2/Portfile
===================================================================
--- trunk/dports/graphics/gdk-pixbuf2/Portfile	2010-10-19 23:18:33 UTC (rev 72539)
+++ trunk/dports/graphics/gdk-pixbuf2/Portfile	2010-10-20 11:16:13 UTC (rev 72540)
@@ -34,23 +34,12 @@
                             port:jasper \
                             port:tiff
 
-pre-configure {
-    if { [file exists ${prefix}/lib/pkgconfig/gdk-pixbuf-2.0.pc] } {
-        set pixbuf_version [lindex [split [exec ${prefix}/bin/pkg-config --modversion gdk-pixbuf-2.0] . ] 1]
-        set pixbuf_min_version 22
-        if { ${pixbuf_version} < ${pixbuf_min_version} } {
-            ui_msg \
-"
-      A version of gtk2 prior to 2.${pixbuf_min_version}.0 is currently installed.
-      
-      To upgrade to gtk2 version ${version} or later, installing gdk-pixbuf2,
-      please execute these commands:
-
-          sudo port -f deactivate gtk2
-          sudo port upgrade gtk2
-"
-            return -code error "deactivate outdated gtk2 port."
-        }
+pre-activate {
+    if { [file exists ${prefix}/lib/pkgconfig/gdk-pixbuf-2.0.pc]
+        && ![catch {set vers [lindex [registry_active gtk2] 0]}]
+        && [rpm-vercomp [lindex $vers 1] 2.22.0] < 0} {
+        
+        registry_deactivate gtk2 "" [list ports_nodepcheck 1]
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101020/3b6fb869/attachment.html>