Modified: trunk/dports/python/py-pep8-157/Portfile (141249 => 141250)

--- trunk/dports/python/py-pep8-157/Portfile	2015-10-13 14:20:12 UTC (rev 141249)
+++ trunk/dports/python/py-pep8-157/Portfile	2015-10-13 14:58:33 UTC (rev 141250)
@@ -38,6 +38,21 @@
     depends_run-append      port:${realname}_select
     select.group            ${realname}
     select.file             ${filespath}/${realname}${python.version}
+
+    # To fix the the version conflict between py-flake8 and py-pep8, #47429,
+    # we need a clean corretion path, however py-pep8 and py-pep8-157 are 
+    # conflicting. 
+    pre-activate {
+        set port_c py${python.version}-pep8
+        set port_v 1.6.2
+        if {![catch {set installed [lindex [registry_active ${port_c}] 0]}]} {
+            set _version [lindex $installed 1]
+            if {[vercmp $_version ${port_v}] < 0} {
+                registry_deactivate_composite ${port_v} "" [list ports_nodepcheck 1]
+            }
+        }
+    }
+
     notes "
 To make the Python ${python.branch} version of pep8 the one that is run\
 when you execute the commands without a version suffix, e.g. 'pep8', run: