From 25b0f1cb158126a50f12f24536b1b3b8cb514805 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 20 Jun 2011 20:28:44 +0000 Subject: [PATCH] Add missing python versions to automake to make them work with python 2.6 and 2.7, since a lot of software use these macros to detect the installed python version and since we use 2.7 as the default now, these were all failing. patch from Brad, ok jasper@ and sthen@ --- devel/automake/1.10/Makefile | 4 ++-- devel/automake/1.10/patches/patch-m4_python_m4 | 12 ++++++++++++ devel/automake/1.11/Makefile | 4 ++-- devel/automake/1.11/patches/patch-m4_python_m4 | 12 ++++++++++++ devel/automake/1.8/Makefile | 4 ++-- devel/automake/1.8/patches/patch-m4_python_m4 | 12 ++++++++++++ devel/automake/1.9/Makefile | 4 ++-- devel/automake/1.9/patches/patch-m4_python_m4 | 12 ++++++++++++ 8 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 devel/automake/1.10/patches/patch-m4_python_m4 create mode 100644 devel/automake/1.11/patches/patch-m4_python_m4 create mode 100644 devel/automake/1.8/patches/patch-m4_python_m4 create mode 100644 devel/automake/1.9/patches/patch-m4_python_m4 diff --git a/devel/automake/1.10/Makefile b/devel/automake/1.10/Makefile index 2718fd867bc..4b083382f26 100644 --- a/devel/automake/1.10/Makefile +++ b/devel/automake/1.10/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2011/05/21 20:28:58 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2011/06/20 20:28:44 robert Exp $ COMMENT= GNU standards-compliant Makefile generator VERSION= 1.10 DISTNAME= automake-${VERSION}.3 -REVISION= 2 +REVISION= 3 PKGSPEC= automake->=${VERSION},<1.11 CATEGORIES= devel diff --git a/devel/automake/1.10/patches/patch-m4_python_m4 b/devel/automake/1.10/patches/patch-m4_python_m4 new file mode 100644 index 00000000000..1e80ffc5005 --- /dev/null +++ b/devel/automake/1.10/patches/patch-m4_python_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-m4_python_m4,v 1.1 2011/06/20 20:28:44 robert Exp $ +--- m4/python.m4.orig Tue Dec 8 14:35:33 2009 ++++ m4/python.m4 Sat Mar 12 13:33:29 2011 +@@ -39,7 +39,7 @@ AC_DEFUN([AM_PATH_PYTHON], + dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages + dnl in 1.5. + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], +- [python python2 python2.5 python2.4 python2.3 python2.2 dnl ++ [python python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl + python2.1 python2.0 python1.6 python1.5]) + + m4_if([$1],[],[ diff --git a/devel/automake/1.11/Makefile b/devel/automake/1.11/Makefile index eff58a2a999..7ca2fa62ec3 100644 --- a/devel/automake/1.11/Makefile +++ b/devel/automake/1.11/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2011/05/21 20:28:58 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2011/06/20 20:28:44 robert Exp $ COMMENT= GNU standards-compliant Makefile generator VERSION= 1.11 DISTNAME= automake-${VERSION}.1 -REVISION= 1 +REVISION= 2 PKGSPEC= automake->=${VERSION},<1.12 CATEGORIES= devel diff --git a/devel/automake/1.11/patches/patch-m4_python_m4 b/devel/automake/1.11/patches/patch-m4_python_m4 new file mode 100644 index 00000000000..22342d7515c --- /dev/null +++ b/devel/automake/1.11/patches/patch-m4_python_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-m4_python_m4,v 1.1 2011/06/20 20:28:44 robert Exp $ +--- m4/python.m4.orig Tue Dec 8 13:02:32 2009 ++++ m4/python.m4 Wed Jun 15 15:46:57 2011 +@@ -37,7 +37,7 @@ AC_DEFUN([AM_PATH_PYTHON], + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], +- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl ++ [python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl + python2.1 python2.0]) + + m4_if([$1],[],[ diff --git a/devel/automake/1.8/Makefile b/devel/automake/1.8/Makefile index b62c35a75cb..3506833a667 100644 --- a/devel/automake/1.8/Makefile +++ b/devel/automake/1.8/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.13 2011/05/30 09:08:24 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2011/06/20 20:28:44 robert Exp $ COMMENT= GNU standards-compliant Makefile generator VERSION= 1.8 DISTNAME= automake-${VERSION}.5 -REVISION= 4 +REVISION= 5 PKGSPEC = automake->=${VERSION},<1.9 CATEGORIES= devel diff --git a/devel/automake/1.8/patches/patch-m4_python_m4 b/devel/automake/1.8/patches/patch-m4_python_m4 new file mode 100644 index 00000000000..4952faab568 --- /dev/null +++ b/devel/automake/1.8/patches/patch-m4_python_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-m4_python_m4,v 1.1 2011/06/20 20:28:44 robert Exp $ +--- m4/python.m4.orig Fri Mar 26 15:50:01 2004 ++++ m4/python.m4 Sat Mar 12 13:35:48 2011 +@@ -52,7 +52,7 @@ AC_DEFUN([AM_PATH_PYTHON], + dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages + dnl in 1.5. + m4_define([_AM_PYTHON_INTERPRETER_LIST], +- [python python2 python2.4 python2.3 python2.2 dnl ++ [python python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl + python2.1 python2.0 python1.6 python1.5]) + + m4_if([$1],[],[ diff --git a/devel/automake/1.9/Makefile b/devel/automake/1.9/Makefile index 10c3747737b..eafdbc2c748 100644 --- a/devel/automake/1.9/Makefile +++ b/devel/automake/1.9/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.19 2011/05/18 19:38:15 matthieu Exp $ +# $OpenBSD: Makefile,v 1.20 2011/06/20 20:28:44 robert Exp $ COMMENT= GNU standards-compliant Makefile generator VERSION= 1.9 DISTNAME= automake-${VERSION}.6 -REVISION= 7 +REVISION= 8 PKGSPEC = automake->=${VERSION},<1.10 CATEGORIES= devel diff --git a/devel/automake/1.9/patches/patch-m4_python_m4 b/devel/automake/1.9/patches/patch-m4_python_m4 new file mode 100644 index 00000000000..a227c06d60b --- /dev/null +++ b/devel/automake/1.9/patches/patch-m4_python_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-m4_python_m4,v 1.1 2011/06/20 20:28:44 robert Exp $ +--- m4/python.m4.orig Fri Jul 1 17:39:16 2005 ++++ m4/python.m4 Sat Mar 12 13:34:20 2011 +@@ -39,7 +39,7 @@ AC_DEFUN([AM_PATH_PYTHON], + dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages + dnl in 1.5. + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], +- [python python2 python2.5 python2.4 python2.3 python2.2 dnl ++ [python python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl + python2.1 python2.0 python1.6 python1.5]) + + m4_if([$1],[],[