[63741] trunk/dports/graphics/dcraw/Portfile

[ryandesign at macports.org]

Revision: 63741
          http://trac.macports.org/changeset/63741
Author:   ryandesign at macports.org
Date:     2010-02-13 18:44:00 -0800 (Sat, 13 Feb 2010)
Log Message:
-----------
dcraw: determine ufraw version using one of its gettext message catalogs, so that we don't have to run ufraw. Running ufraw opens X11 which is undesirable during port installation. And ufraw might not be able to run due to linking to old versions of libraries like libjpeg; see #23594. Also add extra debug statements to help track future problems.

Modified Paths:
--------------
    trunk/dports/graphics/dcraw/Portfile

Modified: trunk/dports/graphics/dcraw/Portfile
===================================================================
--- trunk/dports/graphics/dcraw/Portfile	2010-02-14 02:35:11 UTC (rev 63740)
+++ trunk/dports/graphics/dcraw/Portfile	2010-02-14 02:44:00 UTC (rev 63741)
@@ -56,11 +56,17 @@
     # when upgrading to ufraw 0.16, ensure an old dcraw-providing ufraw
     # is not active.
     if {[file exists ${prefix}/bin/ufraw]} {
+        ui_debug "ufraw is installed; determining version"
         set ufraw_minimum_version 0.16
-        set ufraw_installed_version [exec ufraw --version 2>&1 | awk "/^ufraw/ {print \$2}"]
+        set ufraw_installed_version [exec ${prefix}/bin/msgunfmt ${prefix}/share/locale/de/LC_MESSAGES/ufraw.mo | sed -E -n s/^.*Project-Id-Version:\ \(\[0-9.\]+\).*\$/\\1/p]
         if {[rpm-vercomp ${ufraw_installed_version} ${ufraw_minimum_version}] < 0} {
+            ui_debug "ufraw ${ufraw_installed_version} is installed; needs to be deactivated first"
             return -code error "Please deactivate your currently-installed ufraw port, then try again"
+        } else {
+            ui_debug "ufraw ${ufraw_installed_version} is installed; ok"
         }
+    } else {
+        ui_debug "ufraw is not installed; ok"
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100213/c7b8303b/attachment.html>