I noticed the automake python macro does not know how to find
Python 2.6. Here is a patch to fix this.


Index: 1.10/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.10/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- 1.10/Makefile       26 Nov 2010 14:17:17 -0000      1.7
+++ 1.10/Makefile       12 Mar 2011 01:02:36 -0000
@@ -4,7 +4,7 @@ COMMENT=        GNU standards-compliant Makefil
 
 VERSION=       1.10
 DISTNAME=      automake-${VERSION}.3
-REVISION =     0
+REVISION =     1
 PKGSPEC =      automake->=${VERSION},<1.11
 
 CATEGORIES=    devel
@@ -62,7 +62,7 @@ do-regress:
                    -f ${MAKE_FILE} ${REGRESS_TARGET}
 
 pre-configure:
-       ${SUBST_CMD} ${WRKSRC}/doc/automake.texi
+       @${SUBST_CMD} ${WRKSRC}/doc/automake.texi
 
 post-install:
        cd ${PREFIX}/info && mv automake.info automake${SUFFIX}.info
Index: 1.10/patches/patch-m4_python_m4
===================================================================
RCS file: 1.10/patches/patch-m4_python_m4
diff -N 1.10/patches/patch-m4_python_m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 1.10/patches/patch-m4_python_m4     12 Mar 2011 01:01:45 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/python.m4.orig  Fri Mar 11 20:00:52 2011
++++ m4/python.m4       Fri Mar 11 20:01:38 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.6 python2.5 python2.4 python2.3 
python2.2 dnl
+ python2.1 python2.0 python1.6 python1.5])
+ 
+   m4_if([$1],[],[
Index: 1.4/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.4/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- 1.4/Makefile        26 Nov 2010 07:58:43 -0000      1.10
+++ 1.4/Makefile        12 Mar 2011 01:08:27 -0000
@@ -28,7 +28,7 @@ SUFFIX=               -${VERSION}
 SUBST_VARS=    SUFFIX
 
 pre-configure:
-       ${SUBST_CMD} ${WRKSRC}/automake.texi
+       @${SUBST_CMD} ${WRKSRC}/automake.texi
 
 post-install:
        cd ${PREFIX}/info && mv automake.info automake${SUFFIX}.info
Index: 1.8/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.8/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- 1.8/Makefile        26 Nov 2010 07:58:43 -0000      1.11
+++ 1.8/Makefile        12 Mar 2011 01:06:53 -0000
@@ -4,7 +4,7 @@ COMMENT=        GNU standards-compliant Makefil
 
 VERSION=       1.8
 DISTNAME=      automake-${VERSION}.5
-REVISION=      2
+REVISION=      3
 PKGSPEC =      automake->=${VERSION},<1.9
 
 CATEGORIES=    devel
@@ -36,7 +36,7 @@ REGRESS_DEPENDS=      ${MODGNU_AUTOCONF_DEPEN
 REGRESS_FLAGS=         AUTOCONF_VERSION=${AUTOCONF_VERSION}
 
 pre-configure:
-       ${SUBST_CMD} ${WRKSRC}/doc/automake.texi
+       @${SUBST_CMD} ${WRKSRC}/doc/automake.texi
 
 post-install:
        cd ${PREFIX}/info && mv automake.info automake${SUFFIX}.info
Index: 1.8/patches/patch-m4_python_m4
===================================================================
RCS file: 1.8/patches/patch-m4_python_m4
diff -N 1.8/patches/patch-m4_python_m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 1.8/patches/patch-m4_python_m4      12 Mar 2011 01:06:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/python.m4.orig  Fri Mar 11 20:05:36 2011
++++ m4/python.m4       Fri Mar 11 20:06:21 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.6 python2.5 python2.4 python2.3 python2.2 
dnl
+ python2.1 python2.0 python1.6 python1.5])
+ 
+   m4_if([$1],[],[
Index: 1.9/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.9/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- 1.9/Makefile        26 Nov 2010 07:58:43 -0000      1.17
+++ 1.9/Makefile        12 Mar 2011 01:04:08 -0000
@@ -4,7 +4,7 @@ COMMENT=        GNU standards-compliant Makefil
 
 VERSION=       1.9
 DISTNAME=      automake-${VERSION}.6
-REVISION=      5
+REVISION=      6
 PKGSPEC =      automake->=${VERSION},<1.10
 
 CATEGORIES=    devel
@@ -64,7 +64,7 @@ do-regress:
                    ${REGRESS_TARGET}
 
 pre-configure:
-       ${SUBST_CMD} ${WRKSRC}/doc/automake.texi
+       @${SUBST_CMD} ${WRKSRC}/doc/automake.texi
 
 post-install:
        cd ${PREFIX}/info && mv automake.info automake${SUFFIX}.info
Index: 1.9/patches/patch-m4_python_m4
===================================================================
RCS file: 1.9/patches/patch-m4_python_m4
diff -N 1.9/patches/patch-m4_python_m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 1.9/patches/patch-m4_python_m4      12 Mar 2011 01:04:35 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/python.m4.orig  Fri Mar 11 20:04:18 2011
++++ m4/python.m4       Fri Mar 11 20:04:27 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.6 python2.5 python2.4 python2.3 
python2.2 dnl
+ python2.1 python2.0 python1.6 python1.5])
+ 
+   m4_if([$1],[],[

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply via email to