[153357] trunk/dports/gnome/gnucash-devel

[dports at macports.org]

Revision: 153357
          https://trac.macports.org/changeset/153357
Author:   dports at macports.org
Date:     2016-09-29 01:17:14 -0700 (Thu, 29 Sep 2016)
Log Message:
-----------
gnucash-devel: fix +python27 variant (#43254)
[merge r153356 from gnucash port]

Revision Links:
--------------
    https://trac.macports.org/changeset/153356

Modified Paths:
--------------
    trunk/dports/gnome/gnucash-devel/Portfile

Removed Paths:
-------------
    trunk/dports/gnome/gnucash-devel/files/patch-configure-python.diff

Property Changed:
----------------
    trunk/dports/gnome/gnucash-devel/
    trunk/dports/gnome/gnucash-devel/Portfile


Property changes on: trunk/dports/gnome/gnucash-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/gnucash:75076,76649,87597,88798,88800,89699,95009,95767,97916,98516,105077,133443,135862,138425,141081,143967,144811,148757,150844
   + /trunk/dports/gnome/gnucash:75076,76649,87597,88798,88800,89699,95009,95767,97916,98516,105077,133443,135862,138425,141081,143967,144811,148757,150844,153091,153356

Modified: trunk/dports/gnome/gnucash-devel/Portfile
===================================================================
--- trunk/dports/gnome/gnucash-devel/Portfile	2016-09-29 08:16:39 UTC (rev 153356)
+++ trunk/dports/gnome/gnucash-devel/Portfile	2016-09-29 08:17:14 UTC (rev 153357)
@@ -93,10 +93,16 @@
 
 post-patch {
     xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+    system "cd ${worksrcpath} && ./autogen.sh"
+    if {[variant_isset python27]} {
+        # Fix python exec_prefix
+        reinplace "s|\\(PYTHON_EXEC_PREFIX=\\).*$|\\1${frameworks_dir}/Python.framework/Versions/2.7/|" \
+            ${worksrcpath}/configure
+        reinplace "s|\\(PYTHON_PREFIX=\\).*$|\\1${frameworks_dir}/Python.framework/Versions/2.7/|" \
+            ${worksrcpath}/configure
+    }
 }
 
-configure.cmd     ./autogen.sh && ./configure
-
 configure.args    --disable-dependency-tracking \
                   --disable-aqbanking \
                   --disable-ofx \
@@ -131,12 +137,14 @@
 
 default_variants +ofx +hbci
 
-# variant python27 description {Install Python bindings for Python 2.7} {
-#     #patchfiles-append patch-configure-python.diff
-#     depends_lib-append port:python27
-#     configure.args-append --enable-python
-#     configure.python ${prefix}/bin/python2.7
-# }
+variant python27 description {Install Python bindings for Python 2.7} { 
+    depends_lib-append  port:python27 
+    set python_bindir ${frameworks_dir}/Python.framework/Versions/2.7/bin/ 
+    configure.args-append --enable-python \
+                          PYTHON_EXTRA_LDFLAGS=\"\`${python_bindir}/python2.7-config --ldflags\`\" \
+                          PYTHON_CPPFLAGS=\"\`${python_bindir}/python2.7-config --cflags\`\" 
+    configure.python    ${python_bindir}/python2.7 
+} 
 
 post-activate {
     system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"


Property changes on: trunk/dports/gnome/gnucash-devel/Portfile
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/gnucash/Portfile:75076,76649,77149,77299,77346,78188,79161,80328,80330,84977,86481,87597,88798,88800,89699,94888,94890,94892,95009,95767,97916,98516,105077,116990,118521,118834-118835,120699,120704,121044,129619,129799,133443,135862,138425,141081,143967,144811,148757,150844,153091
   + /trunk/dports/gnome/gnucash/Portfile:75076,76649,77149,77299,77346,78188,79161,80328,80330,84977,86481,87597,88798,88800,89699,94888,94890,94892,95009,95767,97916,98516,105077,116990,118521,118834-118835,120699,120704,121044,129619,129799,133443,135862,138425,141081,143967,144811,148757,150844,153091,153356

Deleted: trunk/dports/gnome/gnucash-devel/files/patch-configure-python.diff
===================================================================
--- trunk/dports/gnome/gnucash-devel/files/patch-configure-python.diff	2016-09-29 08:16:39 UTC (rev 153356)
+++ trunk/dports/gnome/gnucash-devel/files/patch-configure-python.diff	2016-09-29 08:17:14 UTC (rev 153357)
@@ -1,20 +0,0 @@
---- configure.orig	2012-07-03 16:53:51.000000000 -0400
-+++ configure	2012-07-03 16:59:57.000000000 -0400
-@@ -23852,7 +23852,7 @@
-      else
-        am_py_prefix=$prefix
-      fi
--     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-+     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0))" 2>/dev/null ||
-      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-      case $am_cv_python_pythondir in
-      $am_py_prefix*)
-@@ -23890,7 +23890,7 @@
-      else
-        am_py_exec_prefix=$exec_prefix
-      fi
--     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
-+     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0))" 2>/dev/null ||
-      echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-      case $am_cv_python_pyexecdir in
-      $am_py_exec_prefix*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160929/b532c305/attachment.html>