[127669] trunk/dports/net/libproxy/Portfile

[devans at macports.org]

Revision: 127669
          https://trac.macports.org/changeset/127669
Author:   devans at macports.org
Date:     2014-10-31 16:11:39 -0700 (Fri, 31 Oct 2014)
Log Message:
-----------
libproxy: drop +python26 variant, default to optional +python27.

Modified Paths:
--------------
    trunk/dports/net/libproxy/Portfile

Modified: trunk/dports/net/libproxy/Portfile
===================================================================
--- trunk/dports/net/libproxy/Portfile	2014-10-31 22:02:36 UTC (rev 127668)
+++ trunk/dports/net/libproxy/Portfile	2014-10-31 23:11:39 UTC (rev 127669)
@@ -7,7 +7,7 @@
 name                libproxy
 version             0.4.11
 epoch               1
-revision            4
+revision            5
 categories          net
 maintainers         devans openmaintainer
 platforms           darwin
@@ -35,29 +35,6 @@
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:vala
 
-# default to python27 bindings
-if {![variant_isset python27] && ![variant_isset python26]} {
-    default_variants +python27
-}
-
-variant python27 conflicts python26 \
-description {Build Bindings for Python 2.7} {
-    set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
-    depends_lib-append port:python27
-    configure.args-append \
-                    -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
-                    -DPYTHON_SITEPKG_DIR=${python_prefix}/lib/python2.7/site-packages
-}
-
-variant python26 conflicts python27 \
-description {Build Bindings for Python 2.6} {
-    set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
-    depends_lib-append port:python26
-    configure.args-append \
-                    -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 \
-                    -DPYTHON_SITEPKG_DIR=${python_prefix}/lib/python2.6/site-packages
-}
-
 #
 # webkit and mozjs pacrunners disabled by default due to the
 # following issues
@@ -82,7 +59,7 @@
                     -DWITH_WEBKIT3=NO \
                     -DWITH_VALA=YES \
                     -DWITH_PERL=NO \
-                    -DWITH_PYTHON=YES
+                    -DWITH_PYTHON=NO
 
 variant kde description {Enable KDE4 plugin} {
         configure.args-delete -DWITH_KDE4=NO
@@ -91,6 +68,21 @@
         depends_lib-append port:kdelibs4
 }
 
+variant python27 description {Build Bindings for Python 2.7} {
+    set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
+    depends_lib-append port:python27
+    configure.args-delete \
+                    -DWITH_PYTHON=NO
+    configure.args-append \
+                    -DWITH_PYTHON=YES \
+                    -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
+                    -DPYTHON_SITEPKG_DIR=${python_prefix}/lib/python2.7/site-packages
+}
+
+# build Python bindings by default
+
+default_variants    +python27
+
 post-patch {
 	if {${os.major} < 13 && [string match "*clang*" ${configure.compiler}]} {
 		# <rdar://problem/12941376>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141031/3dcb1888/attachment.html>