Modified: trunk/dports/sysutils/e2fsprogs/Portfile (102464 => 102465)

--- trunk/dports/sysutils/e2fsprogs/Portfile	2013-02-04 01:34:38 UTC (rev 102464)
+++ trunk/dports/sysutils/e2fsprogs/Portfile	2013-02-04 01:37:04 UTC (rev 102465)
@@ -68,6 +68,7 @@
     }
 
     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} {
@@ -75,6 +76,13 @@
                 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} {
+                # e2fsprogs used to install some files now provided by libcomerr in versions < 1.42.7
+                registry_deactivate_composite e2fsprogs "" [list ports_nodepcheck 1]
+            }
+        }
     }
 }