[102466] trunk/dports/sysutils/e2fsprogs/Portfile

[cal at macports.org]

Revision: 102466
          https://trac.macports.org/changeset/102466
Author:   cal at macports.org
Date:     2013-02-03 17:43:59 -0800 (Sun, 03 Feb 2013)
Log Message:
-----------
libcomerr: fix typos and possible naming conflicts

Modified Paths:
--------------
    trunk/dports/sysutils/e2fsprogs/Portfile

Modified: trunk/dports/sysutils/e2fsprogs/Portfile
===================================================================
--- trunk/dports/sysutils/e2fsprogs/Portfile	2013-02-04 01:37:04 UTC (rev 102465)
+++ trunk/dports/sysutils/e2fsprogs/Portfile	2013-02-04 01:43:59 UTC (rev 102466)
@@ -70,15 +70,15 @@
     pre-activate {
         # both kerberos5 and e2fsprogs previsouly conflicted because they installed files now provided by libcomerr
         if {![catch {set installed [lindex [registry_active kerberos5] 0]}]} {
-            set version [lindex $installed 1]
-            if {[vercmp $version 1.11] < 0} {
+            set krb_version [lindex $installed 1]
+            if {[vercmp $krb_version 1.11] < 0} {
                 # kerberos5 used to install some files now provided by libcomerr in versions < 1.11
                 registry_deactivate_composite kerberos5 "" [list ports_nodepcheck 1]
             }
         }
         if {![catch {set installed [lindex [registry_active e2fsprogs] 0]}]} {
-            set version [lindex $instaled 1]
-            if {[vercmp $version 1.42.7] < 0} {
+            set e2fs_version [lindex $installed 1]
+            if {[vercmp $e2fs_version 1.42.7] < 0} {
                 # e2fsprogs used to install some files now provided by libcomerr in versions < 1.42.7
                 registry_deactivate_composite e2fsprogs "" [list ports_nodepcheck 1]
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130203/9a29e563/attachment.html>