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.
This commit is contained in:
espie
parent
92759b023b
commit
336fddee48
@ -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/}
|
||||
|
||||
|
||||
@ -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
|
||||
])
|
||||
|
||||
@ -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 <espie@openbsd.org>
|
||||
|
||||
@ -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
|
||||
])
|
||||
|
||||
@ -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/
|
||||
|
||||
@ -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
|
||||
])
|
||||
|
||||
@ -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
|
||||
])
|
||||
|
||||
@ -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 <espie@openbsd.org>
|
||||
|
||||
@ -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
|
||||
])
|
||||
|
||||
@ -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 <espie@openbsd.org>
|
||||
|
||||
@ -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
|
||||
])
|
||||
|
||||
11
devel/autoconf/2.59/patches/patch-tests_local_at
Normal file
11
devel/autoconf/2.59/patches/patch-tests_local_at
Normal file
@ -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])])
|
||||
])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user