[110317] trunk/dports/gnome/libpeas

[devans at macports.org]

Revision: 110317
          https://trac.macports.org/changeset/110317
Author:   devans at macports.org
Date:     2013-08-29 15:07:02 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
libpeas: rework python configuration, disable +universal due to py*-numpy build failure (#40037), add +gjs by default if not universal.

Modified Paths:
--------------
    trunk/dports/gnome/libpeas/Portfile
    trunk/dports/gnome/libpeas/files/patch-configure.diff

Modified: trunk/dports/gnome/libpeas/Portfile
===================================================================
--- trunk/dports/gnome/libpeas/Portfile	2013-08-29 21:42:06 UTC (rev 110316)
+++ trunk/dports/gnome/libpeas/Portfile	2013-08-29 22:07:02 UTC (rev 110317)
@@ -5,6 +5,7 @@
 
 name                libpeas
 version             1.8.1
+revision            1
 license             LGPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         libpeas is a GObject-based plugins engine
@@ -28,6 +29,10 @@
                     port:glade \
                     port:seed
 
+pre-patch {
+    copy ${worksrcpath}/configure ${worksrcpath}/configure.orig
+}
+
 patchfiles          patch-configure.diff \
                     patch-loaders-python-peas-plugin-loader-python.c.diff
 
@@ -44,46 +49,53 @@
     configure.args-replace  --disable-gjs --enable-gjs
 }
 
-# port gjs is not universal
+# rdep py*-numpy +universal build fails (#40037)
 
-if {[variant_isset gjs]} {
-    universal_variant no
-}
+universal_variant no
 
-variant python27 conflicts python32 python33 description {Use python 2.7} {
+# supports one version each of python2 python3 in parallel
+
+variant python27 description {Use python 2.7} {
     depends_lib-append          port:py27-gobject3
-    configure.python            ${prefix}/bin/python2.7
     set python_prefix           ${frameworks_dir}/Python.framework/Versions/2.7
     configure.pkg_config_path   ${python_prefix}/lib/pkgconfig
+    configure.env-append        PYTHON2=${prefix}/bin/python2.7 \
+                                PYTHON2_CONFIG=${python_prefix}/bin/python-config
     configure.args-replace      --disable-python2 --enable-python2
 }
 
 # python3 minimum version is 3.2.0
 
-variant python32 conflicts python27 python33 description {Use python 3.2} {
+variant python32 conflicts python33 description {Use python 3.2} {
     depends_lib-append          port:py32-gobject3
-    configure.python            ${prefix}/bin/python3.2
     set python_prefix           ${frameworks_dir}/Python.framework/Versions/3.2
     configure.pkg_config_path   ${python_prefix}/lib/pkgconfig
+    configure.python            ${prefix}/bin/python3.2
     configure.env-append        PYTHON3_CONFIG=${prefix}/bin/python3.2-config
     configure.cflags-append     -L${python_prefix}/lib
     configure.args-replace      --disable-python3 --enable-python3
 }
 
-variant python33 conflicts python27 python32 description {Use python 3.3} {
+variant python33 conflicts python32 description {Use python 3.3} {
     depends_lib-append          port:py33-gobject3
-    configure.python            ${prefix}/bin/python3.3
     set python_prefix           ${frameworks_dir}/Python.framework/Versions/3.3
     configure.pkg_config_path   ${python_prefix}/lib/pkgconfig
+    configure.python            ${prefix}/bin/python3.3
     configure.env-append        PYTHON3_CONFIG=${prefix}/bin/python3.3-config
     configure.cflags-append     -L${python_prefix}/lib
     configure.args-replace      --disable-python3 --enable-python3
 }
 
-if {![variant_isset python32] && ![variant_isset python33]} {
-    default_variants +python27
+if {![variant_isset python33]} {
+    default_variants +python27 +python32
 }
 
+# port gjs is not universal
+
+if {![variant_isset universal]} {
+    default_variants +gjs
+}
+
 post-activate {
     system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
 }

Modified: trunk/dports/gnome/libpeas/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/libpeas/files/patch-configure.diff	2013-08-29 21:42:06 UTC (rev 110316)
+++ trunk/dports/gnome/libpeas/files/patch-configure.diff	2013-08-29 22:07:02 UTC (rev 110317)
@@ -1,9 +1,19 @@
---- configure.orig	2013-08-19 12:33:52.000000000 -0700
-+++ configure	2013-08-19 12:38:28.000000000 -0700
-@@ -15543,9 +15543,9 @@
+--- configure.orig	2013-06-18 03:37:57.000000000 -0700
++++ configure	2013-08-29 11:55:29.000000000 -0700
+@@ -15361,7 +15361,8 @@
+                     PYTHON2_CFLAGS=`${PYTHON2_CONFIG} --includes`
+                     PYTHON2_LIBS=`${PYTHON2_CONFIG} --libs`
+                     PYTHON2_LDFLAGS=`${PYTHON2_CONFIG} --ldflags`
+-                    PYTHON2_PYEXECDIR=`$PYTHON2 -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1, 0, prefix='\\$' '{exec_prefix}'))"`
++                    python2_eprefix=`$PYTHON2 -c "import sys; print(sys.exec_prefix)"`
++                    PYTHON2_PYEXECDIR=`$PYTHON2 -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1, 0, '${python2_eprefix}'))"`
  
  
  
+@@ -15543,9 +15544,9 @@
+ 
+ 
+ 
 -  PYTHON_PREFIX='${prefix}'
 +  PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/1fbff560/attachment.html>