[100300] trunk/dports

7 Dec 2012

Revision: 100300
          https://trac.macports.org/changeset/100300
Author:   cal@macports.org
Date:     2012-12-07 08:52:29 -0800 (Fri, 07 Dec 2012)
Log Message:
-----------
active_variants PortGroup: Transition to version 1.1, drop explicit pre-configure phase around require_active_variants.

Modified Paths:
--------------
    trunk/dports/devel/libiodbc/Portfile
    trunk/dports/gnome/gtk3/Portfile
    trunk/dports/net/dsniff/Portfile
    trunk/dports/net/dsniff-devel/Portfile
    trunk/dports/python/py-cairo/Portfile
    trunk/dports/python/py-graph-tool/Portfile
    trunk/dports/science/ompl/Portfile
    trunk/dports/science/pymol/Portfile

Modified: trunk/dports/devel/libiodbc/Portfile
===================================================================

--- trunk/dports/devel/libiodbc/Portfile	2012-12-07 16:40:17 UTC (rev 100299)
+++ trunk/dports/devel/libiodbc/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
@@ -3,7 +3,7 @@
 
 PortSystem          1.0
 PortGroup           github 1.0
-PortGroup           active_variants 1.0
+PortGroup           active_variants 1.1
 
 github.setup        openlink iODBC 3.52.8 v
 #override name (keep it lowercase)
@@ -31,8 +31,9 @@
 
 patchfiles          patch-iodbcinst-unicode.h.diff
 
+require_active_variants gtk2 x11
+
 pre-configure {
-    require_active_variants gtk2 x11
     system -W ${worksrcpath} "sh ./bootstrap.sh"
 }
 configure.args-append   --with-iodbc-inidir=${prefix}/etc

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2012-12-07 16:40:17 UTC (rev 100299)
+++ trunk/dports/gnome/gtk3/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
@@ -5,7 +5,7 @@
 PortGroup           archcheck 1.0
 PortGroup           muniversal 1.0
 PortGroup           xcodeversion 1.0
-PortGroup           active_variants 1.0
+PortGroup           active_variants 1.1
 
 name                gtk3
 set real_name       gtk+
@@ -71,12 +71,6 @@
     if {![variant_isset quartz] && ![variant_isset x11]} {
         error "Either +x11 or +quartz is required"
     }
-
-    if {[variant_isset quartz]} {
-        require_active_variants cairo quartz
-    } else {
-        require_active_variants cairo x11 no_x11
-    }
 }
 
 test.run            yes
@@ -207,6 +201,7 @@
 
 variant quartz requires no_x11 conflicts x11 {
     configure.args-append   --enable-quartz-backend
+    require_active_variants cairo quartz
 }
 
 variant x11 conflicts quartz description {Enable rendering in X11} {
@@ -221,6 +216,8 @@
 
     configure.args-append      --enable-xinerama \
                                --x-include=${prefix}/include --x-lib=${prefix}/lib
+
+    require_active_variants cairo x11 no_x11
 }
 
 

Modified: trunk/dports/net/dsniff/Portfile
===================================================================
--- trunk/dports/net/dsniff/Portfile	2012-12-07 16:40:17 UTC (rev 100299)
+++ trunk/dports/net/dsniff/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
@@ -2,7 +2,7 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               active_variants 1.0
+PortGroup               active_variants 1.1
 
 name                    dsniff
 conflicts               dsniff-devel
@@ -41,9 +41,8 @@
 patchfiles              patch-pcaputil.c \
                         patch-sshcrypto.c
 
-pre-configure {
-    require_active_variants libnids libnet libnet11
-}
+require_active_variants libnids libnet libnet11
+
 configure.args          --mandir=${prefix}/share/man
 configure.cflags-append -DBIND_8_COMPAT
 

Modified: trunk/dports/net/dsniff-devel/Portfile
===================================================================
--- trunk/dports/net/dsniff-devel/Portfile	2012-12-07 16:40:17 UTC (rev 100299)
+++ trunk/dports/net/dsniff-devel/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
@@ -2,7 +2,7 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               active_variants 1.0
+PortGroup               active_variants 1.1
 
 name                    dsniff-devel
 conflicts               dsniff
@@ -59,9 +59,7 @@
                         patch-webmitm.c.diff \
                         patch-webspy.c.diff
 
-pre-configure {
-    require_active_variants libnids libnet11 libnet
-}
+require_active_variants libnids libnet11 libnet
 configure.args          --mandir=${prefix}/share/man
 configure.cflags-append -DBIND_8_COMPAT
 

Modified: trunk/dports/python/py-cairo/Portfile
===================================================================
--- trunk/dports/python/py-cairo/Portfile	2012-12-07 16:40:17 UTC (rev 100299)
+++ trunk/dports/python/py-cairo/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
@@ -3,7 +3,7 @@
 
 PortSystem              1.0
 PortGroup               python 1.0
-PortGroup               active_variants 1.0
+PortGroup               active_variants 1.1
 
 name                    py-cairo
 set my_name             pycairo
@@ -66,9 +66,7 @@
     }
 
     variant x11 {
-        pre-configure {
-            require_active_variants cairo x11
-        }
+        require_active_variants cairo x11
     }
 
     default_variants        +x11

Modified: trunk/dports/python/py-graph-tool/Portfile
===================================================================
--- trunk/dports/python/py-graph-tool/Portfile	2012-12-07 16:40:17 UTC (rev 100299)
+++ trunk/dports/python/py-graph-tool/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
@@ -3,7 +3,7 @@
 
 PortSystem          1.0
 PortGroup           python 1.0
-PortGroup           active_variants 1.0
+PortGroup           active_variants 1.1
 
 set realname        graph-tool
 name                py-${realname}
@@ -40,10 +40,10 @@
                        port:py${python.version}-scipy \
                        port:py${python.version}-gobject3
     use_configure      yes
-    pre-configure {
-        # graph-tool relies on Boost.Python, so make sure it is installed.
-        require_active_variants boost python${python.version}
-    }
+
+    # graph-tool relies on Boost.Python, so make sure it is installed.
+    require_active_variants boost python${python.version}
+
     configure.env-append PYTHON=${python.bin} \
                          PYTHON_VERSION=${python.branch} \
                          PYTHON_CPPFLAGS=-I${python.include} \

Modified: trunk/dports/science/ompl/Portfile
===================================================================
--- trunk/dports/science/ompl/Portfile	2012-12-07 16:40:17 UTC (rev 100299)
+++ trunk/dports/science/ompl/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 PortGroup cmake 1.0
-PortGroup active_variants 1.0
+PortGroup active_variants 1.1
 
 name                ompl
 version             0.12.0
@@ -85,10 +85,10 @@
             depends_build-append    port:py${s}-pyplusplus-devel
             depends_lib-append      port:${p}
             configure.args-append   -DPYTHON_EXEC=${prefix}/bin/python${v}
+
             # the python bindings rely on Boost.Python, so make sure it is installed.
-            pre-configure {
-                require_active_variants boost ${p}
-            }
+            require_active_variants boost ${p}
+
             if { [variant_isset app] } {
                 depends_lib-append      port:py${s}-pyqt4 port:py${s}-opengl
                 post-destroot {

Modified: trunk/dports/science/pymol/Portfile
===================================================================
--- trunk/dports/science/pymol/Portfile	2012-12-07 16:40:17 UTC (rev 100299)
+++ trunk/dports/science/pymol/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
@@ -3,7 +3,7 @@
 
 PortSystem          1.0
 PortGroup           python26 1.0
-PortGroup           active_variants 1.0
+PortGroup           active_variants 1.1
 
 name                pymol
 version             1.5
@@ -33,10 +33,8 @@
 
 patchfiles          setup_py.diff pymol_shell.diff pmg_tk_platform.patch apbs-psize.patch
 
-pre-configure {
-	require_active_variants tcl "" corefoundation
-	require_active_variants tk "" quartz
-}
+require_active_variants tcl "" corefoundation
+require_active_variants tk "" quartz
 
 post-patch {
     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py

    

cal＠macports.org

tags

participants (1)