[117821] trunk/dports/gnome/libpeas

[devans at macports.org]

Revision: 117821
          https://trac.macports.org/changeset/117821
Author:   devans at macports.org
Date:     2014-03-13 21:12:04 -0700 (Thu, 13 Mar 2014)
Log Message:
-----------
libpeas: update m4/intltool.m4 and autoreconf to fix intltool configuration, patches, build deps.

Modified Paths:
--------------
    trunk/dports/gnome/libpeas/Portfile

Added Paths:
-----------
    trunk/dports/gnome/libpeas/files/patch-configure.ac.diff

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

Modified: trunk/dports/gnome/libpeas/Portfile
===================================================================
--- trunk/dports/gnome/libpeas/Portfile	2014-03-13 23:30:11 UTC (rev 117820)
+++ trunk/dports/gnome/libpeas/Portfile	2014-03-14 04:12:04 UTC (rev 117821)
@@ -22,19 +22,25 @@
                     sha256  008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d
 
 depends_build       port:pkgconfig \
-                    port:intltool
+                    port:intltool \
+                    port:gnome-common
 
 depends_lib         port:gtk3 \
                     port:gobject-introspection \
                     port:gjs \
                     port:seed
 
-pre-patch {
-    copy ${worksrcpath}/configure ${worksrcpath}/configure.orig
+patchfiles          patch-configure.ac.diff \
+                    patch-loaders-python-peas-plugin-loader-python.c.diff
+
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
 }
 
-patchfiles          patch-configure.diff \
-                    patch-loaders-python-peas-plugin-loader-python.c.diff
+use_autoreconf      yes
+autoreconf.args     -fvi
 
 configure.args      --enable-gtk \
                     --enable-seed \

Added: trunk/dports/gnome/libpeas/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/libpeas/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/gnome/libpeas/files/patch-configure.ac.diff	2014-03-14 04:12:04 UTC (rev 117821)
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2014-03-08 21:29:55.000000000 -0800
++++ configure.ac	2014-03-08 21:30:31.000000000 -0800
+@@ -71,9 +71,6 @@
+ 
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=libpeas
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+@@ -347,7 +344,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}'))"`
+                     AC_SUBST(PYTHON2_CFLAGS)
+                     AC_SUBST(PYTHON2_LIBS)
+                     AC_SUBST(PYTHON2_LDFLAGS)

Deleted: trunk/dports/gnome/libpeas/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/libpeas/files/patch-configure.diff	2014-03-13 23:30:11 UTC (rev 117820)
+++ trunk/dports/gnome/libpeas/files/patch-configure.diff	2014-03-14 04:12:04 UTC (rev 117821)
@@ -1,24 +0,0 @@
---- 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)"`
- 
--  PYTHON_EXEC_PREFIX='${exec_prefix}'
-+  PYTHON_EXEC_PREFIX=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
- 
- 
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140313/80e0ef7c/attachment.html>