[122200] users/devans/dports/gnome/vte-gtk2-compat

[devans at macports.org]

Revision: 122200
          https://trac.macports.org/changeset/122200
Author:   devans at macports.org
Date:     2014-07-17 11:41:58 -0700 (Thu, 17 Jul 2014)
Log Message:
-----------
devans/dports: vte-gtk2-compat, autoreconf to reconfigure with our intltool.m4, apply appropriate python configuration patch to configure.in instead of configure.

Modified Paths:
--------------
    users/devans/dports/gnome/vte-gtk2-compat/Portfile

Added Paths:
-----------
    users/devans/dports/gnome/vte-gtk2-compat/files/patch-configure.in.diff

Removed Paths:
-------------
    users/devans/dports/gnome/vte-gtk2-compat/files/patch-configure.diff

Modified: users/devans/dports/gnome/vte-gtk2-compat/Portfile
===================================================================
--- users/devans/dports/gnome/vte-gtk2-compat/Portfile	2014-07-17 18:09:03 UTC (rev 122199)
+++ users/devans/dports/gnome/vte-gtk2-compat/Portfile	2014-07-17 18:41:58 UTC (rev 122200)
@@ -31,8 +31,13 @@
                 port:pkgconfig
 depends_lib     port:gtk2
 
-patchfiles      patch-configure.diff
+patchfiles      patch-configure.in.diff
 
+# autoreconf to reconfigure with our intltool.m4
+
+use_autoreconf  yes
+autoreconf.args -fvi
+
 configure.args  --with-gtk=2.0 \
                 --disable-introspection \
                 --disable-Bsymbolic \

Deleted: users/devans/dports/gnome/vte-gtk2-compat/files/patch-configure.diff
===================================================================
--- users/devans/dports/gnome/vte-gtk2-compat/files/patch-configure.diff	2014-07-17 18:09:03 UTC (rev 122199)
+++ users/devans/dports/gnome/vte-gtk2-compat/files/patch-configure.diff	2014-07-17 18:41:58 UTC (rev 122200)
@@ -1,14 +0,0 @@
---- configure.orig	2010-05-03 18:10:18.000000000 -0700
-+++ configure	2010-09-13 00:27:15.000000000 -0700
-@@ -14982,9 +14982,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;'`
- 
- 
- 

Added: users/devans/dports/gnome/vte-gtk2-compat/files/patch-configure.in.diff
===================================================================
--- users/devans/dports/gnome/vte-gtk2-compat/files/patch-configure.in.diff	                        (rev 0)
+++ users/devans/dports/gnome/vte-gtk2-compat/files/patch-configure.in.diff	2014-07-17 18:41:58 UTC (rev 122200)
@@ -0,0 +1,32 @@
+--- configure.in.orig	2014-07-17 11:19:35.000000000 -0700
++++ configure.in	2014-07-17 11:28:45.000000000 -0700
+@@ -409,7 +409,7 @@
+ esac
+ 
+ # Search for the required modules.
+-
++	
+ # We have a direct dependency on X11 on gdk-x11, see bug #613525
+ AC_MSG_CHECKING([for GDK target])
+ GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
+@@ -459,8 +459,20 @@
+ 
+ if $BUILD_PYTHON ; then
+ 	AM_PATH_PYTHON
++	
+ 	if test -z "$PYTHON" ; then
+ 		BUILD_PYTHON=false
++	else
++		dnl Override standard python locations with MacPorts version specific ones
++
++		AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++		AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
++
++		am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++		am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++
++		AC_SUBST([pythondir], [$am_cv_python_pythondir])
++		AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+ 	fi
+ fi
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140717/0851e324/attachment-0001.html>