aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgahr <gahr@FreeBSD.org>2010-01-07 22:04:34 +0800
committergahr <gahr@FreeBSD.org>2010-01-07 22:04:34 +0800
commit3ae22a6f644dd681984e4cdd70cd96ddbb496fdb (patch)
treecdd508ca73e85b14a2c4c8625b12972780a8be7e
parenta472db85ca814adf22e8f1d8b4a24f2fd896e444 (diff)
downloadfreebsd-ports-gnome-3ae22a6f644dd681984e4cdd70cd96ddbb496fdb.tar.gz
freebsd-ports-gnome-3ae22a6f644dd681984e4cdd70cd96ddbb496fdb.tar.zst
freebsd-ports-gnome-3ae22a6f644dd681984e4cdd70cd96ddbb496fdb.zip
- Add support to python2.6 in configure script
Approved by: kwm (for gnome@)
-rw-r--r--x11/gnome-panel/files/patch-configure21
1 files changed, 15 insertions, 6 deletions
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
index 1d73358932d3..dc6445b93f13 100644
--- a/x11/gnome-panel/files/patch-configure
+++ b/x11/gnome-panel/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig 2009-10-04 17:26:08.000000000 -0400
-+++ configure 2009-10-04 17:31:11.000000000 -0400
-@@ -14954,12 +14955,12 @@ if test -n "$CLOCK_CFLAGS"; then
+--- configure.orig 2010-01-07 14:47:10.000000000 +0100
++++ configure 2010-01-07 14:47:58.000000000 +0100
+@@ -13318,7 +13318,7 @@
+
+ # Find any Python interpreter.
+ if test -z "$PYTHON"; then
+- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
++ for ac_prog in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -14954,12 +14954,12 @@
pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -16,7 +25,7 @@
else
pkg_failed=yes
fi
-@@ -14970,12 +14971,12 @@ if test -n "$CLOCK_LIBS"; then
+@@ -14970,12 +14970,12 @@
pkg_cv_CLOCK_LIBS="$CLOCK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -32,7 +41,7 @@
else
pkg_failed=yes
fi
-@@ -14993,14 +14994,14 @@ else
+@@ -14993,14 +14993,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -50,7 +59,7 @@
$CLOCK_PKG_ERRORS
-@@ -15011,7 +15012,7 @@ Alternatively, you may set the environme
+@@ -15011,7 +15011,7 @@
and CLOCK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5