From 336fddee48b81547dba5b7335a0de3d01c651e43 Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 9 Jul 2006 23:14:26 +0000 Subject: [PATCH] zap old patch that's no longer needed with format() support in m4. patch 2.59's testsuite so that it passes one more test after converting from our m4 to gnum4's error output format. --- devel/autoconf/2.52/Makefile | 4 ++-- .../autoconf/2.52/patches/patch-acgeneral_m4 | 19 ------------------- devel/autoconf/2.54/Makefile | 4 ++-- .../patches/patch-lib_autoconf_general_m4 | 19 ------------------- devel/autoconf/2.56/Makefile | 3 ++- .../patches/patch-lib_autoconf_general_m4 | 19 ------------------- .../patches/patch-lib_autoconf_general_m4 | 19 ------------------- devel/autoconf/2.58/Makefile | 4 ++-- .../2.58/patches/patch-lib_m4sugar_m4sh_m4 | 19 ------------------- devel/autoconf/2.59/Makefile | 4 ++-- .../2.59/patches/patch-lib_m4sugar_m4sh_m4 | 19 ------------------- .../2.59/patches/patch-tests_local_at | 11 +++++++++++ 12 files changed, 21 insertions(+), 123 deletions(-) delete mode 100644 devel/autoconf/2.52/patches/patch-acgeneral_m4 delete mode 100644 devel/autoconf/2.54/patches/patch-lib_autoconf_general_m4 delete mode 100644 devel/autoconf/2.56/patches/patch-lib_autoconf_general_m4 delete mode 100644 devel/autoconf/2.57/patches/patch-lib_autoconf_general_m4 delete mode 100644 devel/autoconf/2.58/patches/patch-lib_m4sugar_m4sh_m4 delete mode 100644 devel/autoconf/2.59/patches/patch-lib_m4sugar_m4sh_m4 create mode 100644 devel/autoconf/2.59/patches/patch-tests_local_at diff --git a/devel/autoconf/2.52/Makefile b/devel/autoconf/2.52/Makefile index 22eb38d7d92..1e660eb68ff 100644 --- a/devel/autoconf/2.52/Makefile +++ b/devel/autoconf/2.52/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2004/07/31 21:17:21 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2006/07/09 23:14:26 espie Exp $ COMMENT= "automatically configure source code on many Un*x platforms" VERSION= 2.52 DISTNAME= autoconf-${VERSION} -PKGNAME= autoconf-${VERSION}p0 +PKGNAME= autoconf-${VERSION}p1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=autoconf/} diff --git a/devel/autoconf/2.52/patches/patch-acgeneral_m4 b/devel/autoconf/2.52/patches/patch-acgeneral_m4 deleted file mode 100644 index b7f66875dc4..00000000000 --- a/devel/autoconf/2.52/patches/patch-acgeneral_m4 +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-acgeneral_m4,v 1.1.1.1 2003/02/15 14:03:28 espie Exp $ ---- acgeneral.m4.orig Fri Sep 28 17:11:56 2001 -+++ acgeneral.m4 Fri Sep 28 17:45:51 2001 -@@ -413,12 +413,11 @@ m4_define([AC_FOREACH], - # | column 2 | - # column 0 column 26 - # -+m4_define([AC_PadLeft], -+ [m4_if(m4_eval([$1] > [$2]),1,[[ ]AC_PadLeft([$1]-1,[$2])])]) - m4_define([AC_HELP_STRING], - [m4_pushdef([AC_Prefix], m4_default([$3], [ ]))dnl --m4_pushdef([AC_Prefix_Format], -- [ %-]m4_eval(m4_len(AC_Prefix) - 3)[s ])dnl [ %-23s ] --m4_text_wrap([$2], AC_Prefix, m4_format(AC_Prefix_Format, [$1]))dnl --m4_popdef([AC_Prefix_Format])dnl -+m4_text_wrap([$2], AC_Prefix, [ $1]AC_PadLeft(m4_len(AC_Prefix),m4_len([$1])+2))dnl - m4_popdef([AC_Prefix])dnl - ]) - diff --git a/devel/autoconf/2.54/Makefile b/devel/autoconf/2.54/Makefile index 9f3fb9ea9ad..3c18def49a9 100644 --- a/devel/autoconf/2.54/Makefile +++ b/devel/autoconf/2.54/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2006/07/08 17:04:40 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2006/07/09 23:14:26 espie Exp $ COMMENT= "automatically configure source code on many Un*x platforms" DISTNAME= autoconf-2.54 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=autoconf/} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 HOMEPAGE= http://www.gnu.org/software/autoconf/ MAINTAINER= Marc Espie diff --git a/devel/autoconf/2.54/patches/patch-lib_autoconf_general_m4 b/devel/autoconf/2.54/patches/patch-lib_autoconf_general_m4 deleted file mode 100644 index dda0c4b53f0..00000000000 --- a/devel/autoconf/2.54/patches/patch-lib_autoconf_general_m4 +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-lib_autoconf_general_m4,v 1.1.1.1 2003/06/24 23:03:23 espie Exp $ ---- lib/autoconf/general.m4.orig Tue Nov 12 11:54:46 2002 -+++ lib/autoconf/general.m4 Tue Jun 24 17:51:08 2003 -@@ -255,12 +255,11 @@ m4_define([AC_FOREACH], - # | column 2 | - # column 0 column 26 - # -+m4_define([AC_PadLeft], -+ [m4_if(m4_eval([$1] > [$2]),1,[[ ]AC_PadLeft([$1]-1,[$2])])]) - m4_define([AC_HELP_STRING], - [m4_pushdef([AC_Prefix], m4_default([$3], [ ]))dnl --m4_pushdef([AC_Prefix_Format], -- [ %-]m4_eval(m4_len(AC_Prefix) - 3)[s ])dnl [ %-23s ] --m4_text_wrap([$2], AC_Prefix, m4_format(AC_Prefix_Format, [$1]))dnl --m4_popdef([AC_Prefix_Format])dnl -+m4_text_wrap([$2], AC_Prefix, [ $1]AC_PadLeft(m4_len(AC_Prefix),m4_len([$1])+2))dnl - m4_popdef([AC_Prefix])dnl - ]) - diff --git a/devel/autoconf/2.56/Makefile b/devel/autoconf/2.56/Makefile index a9103e12c74..1a56203114f 100644 --- a/devel/autoconf/2.56/Makefile +++ b/devel/autoconf/2.56/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2004/07/31 21:17:21 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2006/07/09 23:14:26 espie Exp $ COMMENT= "automatically configure source code on many Un*x platforms" DISTNAME= autoconf-2.56 CATEGORIES= devel +PKGNAME= $(DISTNAME)p0 MASTER_SITES= ${MASTER_SITE_GNU:=autoconf/} HOMEPAGE= http://www.gnu.org/software/autoconf/ diff --git a/devel/autoconf/2.56/patches/patch-lib_autoconf_general_m4 b/devel/autoconf/2.56/patches/patch-lib_autoconf_general_m4 deleted file mode 100644 index 479b5628cbe..00000000000 --- a/devel/autoconf/2.56/patches/patch-lib_autoconf_general_m4 +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-lib_autoconf_general_m4,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $ ---- lib/autoconf/general.m4.orig Tue Nov 12 11:54:46 2002 -+++ lib/autoconf/general.m4 Tue Jun 24 17:51:08 2003 -@@ -255,12 +255,11 @@ m4_define([AC_FOREACH], - # | column 2 | - # column 0 column 26 - # -+m4_define([AC_PadLeft], -+ [m4_if(m4_eval([$1] > [$2]),1,[[ ]AC_PadLeft([$1]-1,[$2])])]) - m4_define([AC_HELP_STRING], - [m4_pushdef([AC_Prefix], m4_default([$3], [ ]))dnl --m4_pushdef([AC_Prefix_Format], -- [ %-]m4_eval(m4_len(AC_Prefix) - 3)[s ])dnl [ %-23s ] --m4_text_wrap([$2], AC_Prefix, m4_format(AC_Prefix_Format, [$1]))dnl --m4_popdef([AC_Prefix_Format])dnl -+m4_text_wrap([$2], AC_Prefix, [ $1]AC_PadLeft(m4_len(AC_Prefix),m4_len([$1])+2))dnl - m4_popdef([AC_Prefix])dnl - ]) - diff --git a/devel/autoconf/2.57/patches/patch-lib_autoconf_general_m4 b/devel/autoconf/2.57/patches/patch-lib_autoconf_general_m4 deleted file mode 100644 index 6d04d532002..00000000000 --- a/devel/autoconf/2.57/patches/patch-lib_autoconf_general_m4 +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-lib_autoconf_general_m4,v 1.1 2003/06/24 15:57:33 espie Exp $ ---- lib/autoconf/general.m4.orig Tue Nov 12 11:54:46 2002 -+++ lib/autoconf/general.m4 Tue Jun 24 17:51:08 2003 -@@ -255,12 +255,11 @@ m4_define([AC_FOREACH], - # | column 2 | - # column 0 column 26 - # -+m4_define([AC_PadLeft], -+ [m4_if(m4_eval([$1] > [$2]),1,[[ ]AC_PadLeft([$1]-1,[$2])])]) - m4_define([AC_HELP_STRING], - [m4_pushdef([AC_Prefix], m4_default([$3], [ ]))dnl --m4_pushdef([AC_Prefix_Format], -- [ %-]m4_eval(m4_len(AC_Prefix) - 3)[s ])dnl [ %-23s ] --m4_text_wrap([$2], AC_Prefix, m4_format(AC_Prefix_Format, [$1]))dnl --m4_popdef([AC_Prefix_Format])dnl -+m4_text_wrap([$2], AC_Prefix, [ $1]AC_PadLeft(m4_len(AC_Prefix),m4_len([$1])+2))dnl - m4_popdef([AC_Prefix])dnl - ]) - diff --git a/devel/autoconf/2.58/Makefile b/devel/autoconf/2.58/Makefile index 0887a169abf..46e1c6df9a2 100644 --- a/devel/autoconf/2.58/Makefile +++ b/devel/autoconf/2.58/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2006/07/08 17:04:40 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2006/07/09 23:14:26 espie Exp $ COMMENT= "automatically configure source code on many Un*x platforms" DISTNAME= autoconf-2.58 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=autoconf/} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 HOMEPAGE= http://www.gnu.org/software/autoconf/ MAINTAINER= Marc Espie diff --git a/devel/autoconf/2.58/patches/patch-lib_m4sugar_m4sh_m4 b/devel/autoconf/2.58/patches/patch-lib_m4sugar_m4sh_m4 deleted file mode 100644 index a80d1bffc0a..00000000000 --- a/devel/autoconf/2.58/patches/patch-lib_m4sugar_m4sh_m4 +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-lib_m4sugar_m4sh_m4,v 1.2 2004/07/22 05:50:07 espie Exp $ ---- lib/m4sugar/m4sh.m4.orig Tue Nov 4 09:28:53 2003 -+++ lib/m4sugar/m4sh.m4 Thu Jul 22 07:19:47 2004 -@@ -915,12 +915,11 @@ _AS_PATH_WALK([$PATH], [echo "PATH: $as_ - # | column 2 | - # column 0 column 26 - # -+m4_define([AS_PadLeft], -+ [m4_if(m4_eval([$1] > [$2]),1,[[ ]AS_PadLeft([$1]-1,[$2])])]) - m4_define([AS_HELP_STRING], - [m4_pushdef([AS_Prefix], m4_default([$3], [ ]))dnl --m4_pushdef([AS_Prefix_Format], -- [ %-]m4_eval(m4_len(AS_Prefix) - 3)[s ])dnl [ %-23s ] --m4_text_wrap([$2], AS_Prefix, m4_format(AS_Prefix_Format, [$1]))dnl --m4_popdef([AS_Prefix_Format])dnl -+m4_text_wrap([$2], AS_Prefix, [ $1]AS_PadLeft(m4_len(AS_Prefix),m4_len([$1])+2))dnl - m4_popdef([AS_Prefix])dnl - ]) - diff --git a/devel/autoconf/2.59/Makefile b/devel/autoconf/2.59/Makefile index ec88d5a60d2..e6414aeb775 100644 --- a/devel/autoconf/2.59/Makefile +++ b/devel/autoconf/2.59/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2006/07/08 17:04:40 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2006/07/09 23:14:26 espie Exp $ COMMENT= "automatically configure source code on many Un*x platforms" DISTNAME= autoconf-2.59 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=autoconf/} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 HOMEPAGE= http://www.gnu.org/software/autoconf/ MAINTAINER= Marc Espie diff --git a/devel/autoconf/2.59/patches/patch-lib_m4sugar_m4sh_m4 b/devel/autoconf/2.59/patches/patch-lib_m4sugar_m4sh_m4 deleted file mode 100644 index 0d257e8ccd3..00000000000 --- a/devel/autoconf/2.59/patches/patch-lib_m4sugar_m4sh_m4 +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-lib_m4sugar_m4sh_m4,v 1.1.1.1 2004/02/10 00:00:14 espie Exp $ ---- lib/m4sugar/m4sh.m4.orig 2003-11-06 09:46:24.000000000 +0100 -+++ lib/m4sugar/m4sh.m4 2004-02-10 00:43:32.000000000 +0100 -@@ -913,12 +913,11 @@ _AS_PATH_WALK([$PATH], [echo "PATH: $as_ - # | column 2 | - # column 0 column 26 - # -+m4_define([AS_PadLeft], -+ [m4_if(m4_eval([$1] > [$2]),1,[[ ]AS_PadLeft([$1]-1,[$2])])]) - m4_define([AS_HELP_STRING], - [m4_pushdef([AS_Prefix], m4_default([$3], [ ]))dnl --m4_pushdef([AS_Prefix_Format], -- [ %-]m4_eval(m4_len(AS_Prefix) - 3)[s ])dnl [ %-23s ] --m4_text_wrap([$2], AS_Prefix, m4_format(AS_Prefix_Format, [$1]))dnl --m4_popdef([AS_Prefix_Format])dnl -+m4_text_wrap([$2], AS_Prefix, [ $1]AS_PadLeft(m4_len(AS_Prefix),m4_len([$1])+2))dnl - m4_popdef([AS_Prefix])dnl - ]) - diff --git a/devel/autoconf/2.59/patches/patch-tests_local_at b/devel/autoconf/2.59/patches/patch-tests_local_at new file mode 100644 index 00000000000..bc179f57099 --- /dev/null +++ b/devel/autoconf/2.59/patches/patch-tests_local_at @@ -0,0 +1,11 @@ +$OpenBSD: patch-tests_local_at,v 1.1 2006/07/09 23:14:26 espie Exp $ +--- tests/local.at.orig Wed Aug 27 16:52:26 2003 ++++ tests/local.at Mon Jul 10 00:15:39 2006 +@@ -65,6 +65,7 @@ m4_ifval([$4], + -e 's/^autom4te: [^ ]*m4 /autom4te: m4 /' \ + -e 's/^autom4te: [^ ]*m4.exe /autom4te: m4 /' \ + -e 's/ (E[A-Z]*)$//' \ ++ -e 's/ at line \([0-9]*\): include(\(.*\)):/: \1: Cannot open \2:/' \ + stderr]], [0],[$4])]) + ]) +