Modified: trunk/dports/devel/autoconf-archive/Portfile (140570 => 140571)

--- trunk/dports/devel/autoconf-archive/Portfile	2015-09-23 18:47:16 UTC (rev 140570)
+++ trunk/dports/devel/autoconf-archive/Portfile	2015-09-23 18:56:16 UTC (rev 140571)
@@ -5,6 +5,7 @@
 
 name                autoconf-archive
 version             2015.02.24
+revision            1
 categories          devel
 platforms           darwin
 license             Permissive
@@ -13,8 +14,6 @@
 supported_archs     noarch
 installs_libs       no
 
-conflicts           gnome-common
-
 description         A collection of more than 450 macros for GNU Autoconf
 long_description    The GNU Autoconf Archive is a collection of more \
                     than 450 macros for GNU Autoconf that have been \
@@ -30,3 +29,15 @@
 
 checksums           rmd160  dc234daf67003d1e27cfe81d61b51942a3c1d49e \
                     sha256  69715bdd078f552ca85e498a94543e11cb8bcdf0359e659b84d84d19372b0dc5
+
+# deactivate versions of gnome-common < 3.18.0 when updating
+# to avoid collisions on activation
+
+pre-activate {
+    if {![catch {set installed [lindex [registry_active gnome-common] 0]}]} {
+        set _version [lindex $installed 1]
+        if {[vercmp $_version 3.18.0] < 0} {
+            registry_deactivate_composite gnome-common "" [list ports_nodepcheck 1]
+        }
+    }
+}