[125159] trunk/dports/devel/omniORB/Portfile

[ryandesign at macports.org]

Revision: 125159
          https://trac.macports.org/changeset/125159
Author:   ryandesign at macports.org
Date:     2014-09-07 21:26:03 -0700 (Sun, 07 Sep 2014)
Log Message:
-----------
omniORB: mark the python variants as conflicting with one another; remove debugging code; adjust formatting of notes; remove unneeded comment

Modified Paths:
--------------
    trunk/dports/devel/omniORB/Portfile

Modified: trunk/dports/devel/omniORB/Portfile
===================================================================
--- trunk/dports/devel/omniORB/Portfile	2014-09-08 04:08:59 UTC (rev 125158)
+++ trunk/dports/devel/omniORB/Portfile	2014-09-08 04:26:03 UTC (rev 125159)
@@ -27,12 +27,12 @@
 patchfiles          src_tool_omniidl_cxx_cccp_config-darwin.h.diff \
                     include_omniORB4_CORBA_sysdep.h.diff
 
-# The universal variant has been broken for several years (at least version 4.1.4)
 universal_variant   no
 
-notes \
-"To install omniORBpy use the port pyXX_omniORBpy
-corresponding to the matching python variant selected here."
+notes "
+To install omniORBpy use the port pyXX_omniORBpy\
+corresponding to the matching python variant selected here.
+"
 
 configure.args      CC="${configure.cc}" \
                     CXX="${configure.cxx}" \
@@ -48,8 +48,6 @@
 pre-patch {
     reinplace "s|-bind_at_load||g" \
         ${worksrcpath}/mk/beforeauto.mk.in
-    ui_debug "archflags cc are [get_canonical_archflags cc]"
-    ui_debug "archflags cxx are [get_canonical_archflags cxx]"
 }
 
 post-patch {
@@ -71,25 +69,25 @@
     default_variants        +python27
 }
 
-variant python24 description {Enable python support with python 2.4} {
+variant python24 conflicts python25 python26 python27 description {Enable python support with python 2.4} {
     notes-append "For this omniORB variant install py24-omniORBpy"
     depends_lib-append      port:python24
     configure.python        ${prefix}/bin/python2.4
 }
 
-variant python25 description {Enable python support with python 2.5} {
+variant python25 conflicts python24 python26 python27 description {Enable python support with python 2.5} {
     notes-append "For this omniORB variant install py25-omniORBpy"
     depends_lib-append      port:python25
     configure.python        ${prefix}/bin/python2.5
 }
 
-variant python26 description {Enable python support with python 2.6} {
+variant python26 conflicts python24 python25 python27 description {Enable python support with python 2.6} {
     notes-append "For this omniORB variant install py26-omniORBpy"
     depends_lib-append      port:python26
     configure.python        ${prefix}/bin/python2.6
 }
 
-variant python27 description {Enable python support with python 2.7} {
+variant python27 conflicts python24 python25 python26 description {Enable python support with python 2.7} {
     notes-append "For this omniORB variant install py27-omniORBpy"
     depends_lib-append      port:python27
     configure.python        ${prefix}/bin/python2.7
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140907/dce2445a/attachment.html>