Changes between Version 62 and Version 63 of PortfileRecipes

Timestamp:

Jun 9, 2013, 1:03:38 PM (11 years ago)

Author:

neverpanic (Clemens Lang)

Comment:

deactivate hack: add the pre-activate block, rename variable to a more generic name

PortfileRecipes

@@ -478 +478 @@
 
 {{{#!tcl
-# both kerberos5 and e2fsprogs previously conflicted because they installed files now provided by libcomerr
-if {![catch {set installed [lindex [registry_active kerberos5] 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]
+pre-activate {
+    # both kerberos5 and e2fsprogs previously 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} {
+            # kerberos5 used to install some files now provided by libcomerr in versions < 1.11
+            registry_deactivate_composite kerberos5 "" [list ports_nodepcheck 1]
+        }
     }
-}
 }}}