Mostly taken from 2.65 with an upstream patch added to make things
work with older pkgconfig. Tested with lighttpd and emacs23.
Ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/autoconf/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 22 Mar 2010 20:54:24 -0000 1.37
+++ Makefile 29 Mar 2011 10:10:51 -0000
@@ -14,5 +14,6 @@ SUBDIR += 2.62
SUBDIR += 2.63
SUBDIR += 2.64
SUBDIR += 2.65
+SUBDIR += 2.67
.include <bsd.port.subdir.mk>
Index: 2.67/Makefile
===================================================================
RCS file: 2.67/Makefile
diff -N 2.67/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/Makefile 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,16 @@
+# $OpenBSD: Makefile,v 1.7 2011/03/24 12:34:10 espie Exp $
+
+VERSION = 2.67
+
+BUILD_DEPENDS = devel/help2man
+
+CONFIGURE_ARGS += --without-lispdir \
+ --mandir=${PREFIX}/man \
+ --infodir=${PREFIX}/info
+MODGNU_CONFIG_GUESS_DIRS =${WRKSRC}/build-aux
+MAKE_FLAGS = EMACS=no
+FAKE_FLAGS = EMACS=no
+REGRESS_DEPENDS = devel/automake/1.9
+REGRESS_FLAGS += AUTOMAKE_VERSION=1.9
+
+.include <bsd.port.mk>
Index: 2.67/distinfo
===================================================================
RCS file: 2.67/distinfo
diff -N 2.67/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/distinfo 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,5 @@
+MD5 (autoconf-2.67.tar.gz) = YHj1Pf2pEb37Uj459Nf7LQ==
+RMD160 (autoconf-2.67.tar.gz) = mMg21rdGoxyclibTMp9pihcP/Ag=
+SHA1 (autoconf-2.67.tar.gz) = EuhGQjNqjSP7gyDUAn/IYPJcm2A=
+SHA256 (autoconf-2.67.tar.gz) = JrdSxCdkctOyH6Kmz9+0lX451dYQik9AILEyNP+6ZtE=
+SIZE (autoconf-2.67.tar.gz) = 1837052
Index: 2.67/patches/patch-Makefile_in
===================================================================
RCS file: 2.67/patches/patch-Makefile_in
diff -N 2.67/patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-Makefile_in 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,11 @@
+$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- Makefile.in.orig Sat Nov 21 14:59:19 2009
++++ Makefile.in Mon Mar 8 12:26:47 2010
+@@ -312,6 +312,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
++ p=`basename $$p`; \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
Index: 2.67/patches/patch-bin_autom4te_in
===================================================================
RCS file: 2.67/patches/patch-bin_autom4te_in
diff -N 2.67/patches/patch-bin_autom4te_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-bin_autom4te_in 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,38 @@
+$OpenBSD: patch-bin_autom4te_in,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- bin/autom4te.in.orig Wed Jul 22 14:45:09 2009
++++ bin/autom4te.in Mon Mar 8 12:06:34 2010
+@@ -89,16 +89,9 @@ my $freeze = 0;
+
+ # $M4.
+ my $m4 = $ENV{"M4"} || '@M4@';
+-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
+-fatal "need GNU m4 1.4 or later: $m4"
+- if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
+
+-# Set some high recursion limit as the default limit, 250, has already
+-# been hit with AC_OUTPUT. Don't override the user's choice.
+-$m4 .= ' --nesting-limit=1024'
+- if " $m4 " !~ / (--nesting-limit(=[0-9]+)?|-L[0-9]*) /;
++$m4 .= " -g -D__gnu__";
+
+-
+ # @M4_BUILTIN -- M4 builtins and a useful comment.
+ my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
+ map { s/:.*//;s/\W// } @m4_builtin;
+@@ -464,11 +457,11 @@ sub handle_m4 ($@)
+ # We don't output directly to the cache files, to avoid problems
+ # when we are interrupted (that leaves corrupted files).
+ xsystem ("$m4 @M4_GNU@"
+- . join (' --include=', '', map { shell_quote ($_) } @include)
+- . ' --debug=aflq'
+- . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
+- . " @M4_DEBUGFILE@=" . shell_quote ("$tcache" . $req->id . "t")
+- . join (' --trace=', '', map { shell_quote ($_) } sort @macro)
++ . join (' -I', '', map { shell_quote ($_) } @include)
++ . ' -daflq'
++# . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
++ . " -o" . shell_quote ($tcache . $req->id . "t")
++ . join (' -t', '', map { shell_quote ($_) } sort @macro)
+ . " " . files_to_options (@ARGV)
+ . " > " . shell_quote ("$ocache" . $req->id . "t"));
+
Index: 2.67/patches/patch-bin_autoupdate_in
===================================================================
RCS file: 2.67/patches/patch-bin_autoupdate_in
diff -N 2.67/patches/patch-bin_autoupdate_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-bin_autoupdate_in 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,24 @@
+$OpenBSD: patch-bin_autoupdate_in,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- bin/autoupdate.in.orig Thu Oct 29 02:53:40 2009
++++ bin/autoupdate.in Mon Mar 8 12:26:47 2010
+@@ -55,6 +55,7 @@ my @include = ('@pkgdatadir@');
+ my $force = 0;
+ # m4.
+ my $m4 = $ENV{"M4"} || '@M4@';
++$m4.=" -g -D__gnu__";
+
+
+ # $HELP
+@@ -398,9 +399,9 @@ EOF
+ or error "cannot close $tmp/input.m4: $!";
+
+ # Now ask m4 to perform the update.
+- xsystem ("$m4 --include=" . shell_quote ($tmp)
+- . join (' --include=', '', map { shell_quote ($_) } reverse
(@prepend_include))
+- . join (' --include=', '', map { shell_quote ($_) } @include)
++ xsystem ("$m4 -I" . shell_quote ($tmp)
++ . join (' -I', '', map { shell_quote ($_) } reverse
(@prepend_include))
++ . join (' -I', '', map { shell_quote ($_) } @include)
+ . " " . shell_quote ("$tmp/input.m4") . " > " . shell_quote
("$tmp/updated"));
+ update_file ("$tmp/updated",
+ "$file" eq "$tmp/stdin" ? '-' : "$file");
Index: 2.67/patches/patch-configure
===================================================================
RCS file: 2.67/patches/patch-configure
diff -N 2.67/patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-configure 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,40 @@
+$OpenBSD: patch-configure,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- configure.orig Wed Jul 21 17:42:30 2010
++++ configure Thu Mar 24 23:07:00 2011
+@@ -2384,14 +2384,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_M4="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_M4" && $as_test_x "$ac_path_M4"; } || continue
+- # Root out GNU M4 1.4.5, as well as non-GNU m4 that ignore -t, -F.
+- ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
+- ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
+- test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
+- && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
+- && test -f conftest.m4f \
+- && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
+- rm -f conftest.m4f
++ ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
+ $ac_path_M4_found && break 3
+ done
+ done
+@@ -2436,19 +2429,7 @@ $as_echo "$as_me: WARNING: the version of M4 that was
+ $as_echo "$as_me: WARNING: using it with POSIXLY_CORRECT set may cause
problems" >&2;}
+ fi
+ fi
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how m4 supports trace
files" >&5
+-$as_echo_n "checking how m4 supports trace files... " >&6; }
+-if test "${ac_cv_prog_gnu_m4_debugfile+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case `$M4 --help < /dev/null 2>&1` in
+- *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
+- *) ac_cv_prog_gnu_m4_debugfile=--error-output ;;
+- esac
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_prog_gnu_m4_debugfile" >&5
+-$as_echo "$ac_cv_prog_gnu_m4_debugfile" >&6; }
+- M4_DEBUGFILE=$ac_cv_prog_gnu_m4_debugfile
++ M4_DEBUGFILE=-o
+
+
+
Index: 2.67/patches/patch-doc_Makefile_in
===================================================================
RCS file: 2.67/patches/patch-doc_Makefile_in
diff -N 2.67/patches/patch-doc_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-doc_Makefile_in 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,46 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- doc/Makefile.in.orig Sat Nov 21 14:59:18 2009
++++ doc/Makefile.in Mon Mar 8 12:26:47 2010
+@@ -385,6 +385,10 @@ dist-info: $(INFO_DEPS)
+ for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9]
$$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
+ if test -f $$file; then \
+ relfile=`expr "$$file" : "$$d/\(.*\)"`; \
++ ext=`echo $$relfile | sed -e 's/^.*\\.//'`; \
++ relfile=`echo $$relfile | sed -e 's/\\.[0-9a-z]*$$//'`; \
++ relfile=`echo $$relfile | sed -e 's/^.*\///'`; \
++ relfile=`echo $$relfile | sed '$(transform)'`.$$ext; \
+ test -f "$(distdir)/$$relfile" || \
+ cp -p $$file "$(distdir)/$$relfile"; \
+ else :; fi; \
+@@ -566,19 +570,26 @@ install-info-am: $(INFO_DEPS)
+ for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
+ $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+ if test -f $$ifile; then \
+- echo "$$ifile"; \
++ relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
++ ext=`echo $$relfile | sed -e 's/^.*\\.//'`; \
++ relfile=`echo $$relfile | sed -e 's/\\.[0-9a-z]*$$//'`; \
++ relfile=`echo $$relfile | sed -e 's/^.*\///'`; \
++ relfile=`echo $$relfile | sed '$(transform)'`.$$ext; \
++ echo " $(INSTALL_DATA) '$$ifile'
'$(DESTDIR)$(infodir)/$$relfile'"; \
++ $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
+ else : ; fi; \
+ done; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
++ done
+ @$(POST_INSTALL)
+ @if (install-info --version && \
+ install-info --version 2>&1 | sed 1q | grep -i -v debian)
>/dev/null 2>&1; then \
+ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+ for file in $$list; do \
+ relfile=`echo "$$file" | sed 's|^.*/||'`; \
++ ext=`echo $$relfile | sed -e 's/^.*\\.//'`; \
++ relfile=`echo $$relfile | sed -e 's/\\.[0-9a-z]*$$//'`; \
++ relfile=`echo $$relfile | sed -e 's/^.*\///'`; \
++ relfile=`echo $$relfile | sed '$(transform)'`.$$ext; \
+ echo " install-info --info-dir='$(DESTDIR)$(infodir)'
'$(DESTDIR)$(infodir)/$$relfile'";\
+ install-info --info-dir="$(DESTDIR)$(infodir)"
"$(DESTDIR)$(infodir)/$$relfile" || :;\
+ done; \
Index: 2.67/patches/patch-doc_autoconf_texi
===================================================================
RCS file: 2.67/patches/patch-doc_autoconf_texi
diff -N 2.67/patches/patch-doc_autoconf_texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-doc_autoconf_texi 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,42 @@
+$OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- doc/autoconf.texi.orig Thu Nov 5 03:42:15 2009
++++ doc/autoconf.texi Mon Mar 8 12:26:47 2010
+@@ -222,27 +222,27 @@ freedom.''
+
+ @dircategory Software development
+ @direntry
+-* Autoconf: (autoconf). Create source code configuration scripts.
++* Autoconf-2.67: (autoconf-2.67). Create source code configuration
scripts.
+ @end direntry
+
+ @dircategory Individual utilities
+ @direntry
+-* autoscan: (autoconf)autoscan Invocation.
++* autoscan-2.67: (autoconf-2.67)autoscan Invocation.
+ Semi-automatic @file{configure.ac} writing
+-* ifnames: (autoconf)ifnames Invocation. Listing conditionals in
source.
+-* autoconf-invocation: (autoconf)autoconf Invocation.
++* ifnames-2.67: (autoconf-2.67)ifnames Invocation. Listing
conditionals in source.
++* autoconf-invocation-2.67: (autoconf-2.67)autoconf Invocation.
+ How to create configuration scripts
+-* autoreconf: (autoconf)autoreconf Invocation.
++* autoreconf-2.67: (autoconf-2.67)autoreconf Invocation.
+ Remaking multiple @command{configure} scripts
+-* autoheader: (autoconf)autoheader Invocation.
++* autoheader-2.67: (autoconf-2.67)autoheader Invocation.
+ How to create configuration templates
+-* autom4te: (autoconf)autom4te Invocation.
++* autom4te-2.67: (autoconf-2.67)autom4te Invocation.
+ The Autoconf executables backbone
+-* configure: (autoconf)configure Invocation. Configuring a package.
+-* autoupdate: (autoconf)autoupdate Invocation.
++* configure-2.67: (autoconf-2.67)configure Invocation. Configuring a
package.
++* autoupdate-2.67: (autoconf-2.67)autoupdate Invocation.
+ Automatic update of @file{configure.ac}
+-* config.status: (autoconf)config.status Invocation. Recreating
configurations.
+-* testsuite: (autoconf)testsuite Invocation. Running an Autotest test
suite.
++* config.status-2.67: (autoconf-2.67)config.status Invocation. Recreating
configurations.
++* testsuite-2.67: (autoconf-2.67)testsuite Invocation. Running an Autotest
test suite.
+ @end direntry
+
+ @titlepage
Index: 2.67/patches/patch-lib_autoconf_Makefile_in
===================================================================
RCS file: 2.67/patches/patch-lib_autoconf_Makefile_in
diff -N 2.67/patches/patch-lib_autoconf_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-lib_autoconf_Makefile_in 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_autoconf_Makefile_in,v 1.1.1.1 2010/03/22 20:54:07 espie
Exp $
+--- lib/autoconf/Makefile.in.orig Tue Jul 20 16:41:14 2010
++++ lib/autoconf/Makefile.in Thu Mar 24 23:05:42 2011
+@@ -205,7 +205,7 @@ dist_autoconflib_DATA = \
+ lang.m4 c.m4 erlang.m4 fortran.m4 \
+ functions.m4 headers.m4 types.m4 libs.m4 programs.m4
+
+-nodist_autoconflib_DATA = autoconf.m4f
++nodist_autoconflib_DATA = # autoconf.m4f
+ CLEANFILES = $(nodist_autoconflib_DATA)
+ TAGS_FILES = $(dist_autoconflib_DATA)
+ ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
Index: 2.67/patches/patch-lib_autotest_Makefile_in
===================================================================
RCS file: 2.67/patches/patch-lib_autotest_Makefile_in
diff -N 2.67/patches/patch-lib_autotest_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-lib_autotest_Makefile_in 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_autotest_Makefile_in,v 1.1.1.1 2010/03/22 20:54:07 espie
Exp $
+--- lib/autotest/Makefile.in.orig Sat Nov 21 14:59:18 2009
++++ lib/autotest/Makefile.in Mon Mar 8 12:27:30 2010
+@@ -198,7 +198,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ autotestlibdir = $(pkgdatadir)/autotest
+ dist_autotestlib_DATA = autotest.m4 general.m4 specific.m4
+-nodist_autotestlib_DATA = autotest.m4f
++nodist_autotestlib_DATA = #autotest.m4f
+ CLEANFILES = $(nodist_autotestlib_DATA)
+ TAGS_FILES = $(dist_autotestlib_DATA)
+ ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
Index: 2.67/patches/patch-lib_m4sugar_Makefile_in
===================================================================
RCS file: 2.67/patches/patch-lib_m4sugar_Makefile_in
diff -N 2.67/patches/patch-lib_m4sugar_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-lib_m4sugar_Makefile_in 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_m4sugar_Makefile_in,v 1.1.1.1 2010/03/22 20:54:07 espie
Exp $
+--- lib/m4sugar/Makefile.in.orig Mon Jul 27 05:28:45 2009
++++ lib/m4sugar/Makefile.in Mon Mar 8 12:04:46 2010
+@@ -199,7 +199,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ m4sugarlibdir = $(pkgdatadir)/m4sugar
+ dist_m4sugarlib_DATA = m4sugar.m4 foreach.m4 m4sh.m4
+-nodist_m4sugarlib_DATA = version.m4 m4sugar.m4f m4sh.m4f
++nodist_m4sugarlib_DATA = version.m4 #m4sugar.m4f m4sh.m4f
+ CLEANFILES = $(nodist_m4sugarlib_DATA)
+
+ # Get the release year from ../ChangeLog.
Index: 2.67/patches/patch-lib_m4sugar_m4sugar_m4
===================================================================
RCS file: 2.67/patches/patch-lib_m4sugar_m4sugar_m4
diff -N 2.67/patches/patch-lib_m4sugar_m4sugar_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-lib_m4sugar_m4sugar_m4 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,38 @@
+$OpenBSD: patch-lib_m4sugar_m4sugar_m4,v 1.1.1.1 2010/03/22 20:54:07 espie Exp
$
+
+first hunk: from commit f6030a3204a9b87e9b346e6eff4ce1117382fc86
+
+--- lib/m4sugar/m4sugar.m4.orig Fri Jul 2 19:22:08 2010
++++ lib/m4sugar/m4sugar.m4 Tue Mar 29 10:59:54 2011
+@@ -1973,7 +1973,7 @@ m4_define([m4_defun],
+ # m4_defun'd, we can add a parameter, similar to the third parameter
+ # to m4_defun.
+ m4_define([m4_defun_init],
+-[m4_define([$1], [$3])m4_defun([$1],
++[m4_define([$1], [$3[]])m4_defun([$1],
+ [$2[]_m4_popdef(]m4_dquote($[0])[)m4_indir(]m4_dquote($[0])dnl
+ [m4_if(]m4_dquote($[#])[, [0], [], ]m4_dquote([,$]@)[))], [m4_pushdef])])
+
+@@ -2126,6 +2126,7 @@ m4_define([m4_provide],
+ [m4_ifdef([m4_provide($1)], [],
+ [m4_set_add([_m4_provide], [$1], [m4_define([m4_provide($1)],
+ m4_ifdef([_m4_diverting], [_m4_defn([_m4_diverting])]))])])])
++m4_provide([AM_SANITY_CHECK])
+
+
+ # m4_provide_if(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -3277,13 +3278,10 @@ m4_pattern_forbid([^dnl$])
+ #
+ # Use the raw builtin to avoid tripping up include tracing.
+ # Meanwhile, avoid m4_copy, since it temporarily undefines m4_defn.
+-m4_ifdef([__m4_version__],
+-[m4_debugmode([+do])
+ m4_define([m4_defn], _m4_defn([_m4_defn]))
+ m4_define([m4_dumpdef], _m4_defn([_m4_dumpdef]))
+ m4_define([m4_popdef], _m4_defn([_m4_popdef]))
+-m4_define([m4_undefine], _m4_defn([_m4_undefine]))],
+-[m4_builtin([include], [m4sugar/foreach.m4])
++m4_define([m4_undefine], _m4_defn([_m4_undefine]))
+ m4_wrap_lifo([m4_if(__line__, [0], [m4_pushdef([m4_location],
+ ]]m4_dquote(m4_dquote(m4_dquote(__file__:__line__)))[[)])])])
+
Index: 2.67/patches/patch-tests_Makefile_in
===================================================================
RCS file: 2.67/patches/patch-tests_Makefile_in
diff -N 2.67/patches/patch-tests_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-tests_Makefile_in 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,14 @@
+$OpenBSD: patch-tests_Makefile_in,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- tests/Makefile.in.orig Sat Nov 21 14:59:19 2009
++++ tests/Makefile.in Mon Mar 8 12:26:48 2010
+@@ -565,9 +565,7 @@ $(wrappers): wrapper.in
+ mv -f $@.tmp $@
+ $(TESTSUITE): package.m4 \
+ local.at \
+- $(TESTSUITE_AT) \
+- $(autotest_m4f_dependencies)
+- cd $(top_builddir)/lib/autotest && $(MAKE) $(AM_MAKEFLAGS) autotest.m4f
++ $(TESTSUITE_AT)
+ $(AUTOTEST) -I . -I $(srcdir) suite.at -o $@.tmp
+ mv $@.tmp $@
+
Index: 2.67/patches/patch-tests_c_at
===================================================================
RCS file: 2.67/patches/patch-tests_c_at
diff -N 2.67/patches/patch-tests_c_at
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-tests_c_at 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,21 @@
+$OpenBSD: patch-tests_c_at,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- tests/c.at.orig Sat Oct 31 13:33:00 2009
++++ tests/c.at Mon Mar 8 12:26:48 2010
+@@ -141,7 +141,7 @@ AT_CLEANUP
+ AT_SETUP([AC_PROG_CPP without warnings])
+
+ # Ignore if /lib/cpp doesn't work
+-AT_CHECK([[echo '#include <stdio.h>' | /lib/cpp || exit 77]],
++AT_CHECK([[echo '#include <stdio.h>' | /usr/bin/cpp || exit 77]],
+ [], [ignore], [ignore])
+
+ # A cpp which exit status is meaningless.
+@@ -181,7 +181,7 @@ AT_CLEANUP
+ AT_SETUP([AC_PROG_CPP via CC])
+
+ # Ignore if /lib/cpp doesn't work
+-AT_CHECK([[echo '#include <stdio.h>' | /lib/cpp || exit 77]],
++AT_CHECK([[echo '#include <stdio.h>' | /usr/bin/cpp || exit 77]],
+ [], [ignore], [ignore])
+
+ AT_DATA([mycc],
Index: 2.67/patches/patch-tests_local_at
===================================================================
RCS file: 2.67/patches/patch-tests_local_at
diff -N 2.67/patches/patch-tests_local_at
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-tests_local_at 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,11 @@
+$OpenBSD: patch-tests_local_at,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- tests/local.at.orig Fri Jun 18 16:11:08 2010
++++ tests/local.at Thu Mar 24 23:05:42 2011
+@@ -114,6 +114,7 @@ m4_case([$4], [], [], [ignore], [],
+ s/: include:\( cannot open\)/:\1/
+ s/^autom4te: [^ ]*m4[.ex]* /autom4te: m4 /
+ s/ (E[A-Z]*)$//
++ s/: \(.*\) at line \([0-9]*\): include(\(.*\)):/:\1:\2: cannot open
`\3'\'':/
+ ' stderr >&2]], [0], [], [$4])])
+ ])
+
Index: 2.67/patches/patch-tests_tools_at
===================================================================
RCS file: 2.67/patches/patch-tests_tools_at
diff -N 2.67/patches/patch-tests_tools_at
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/patches/patch-tests_tools_at 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,16 @@
+$OpenBSD: patch-tests_tools_at,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- tests/tools.at.orig Tue Jun 8 02:07:04 2010
++++ tests/tools.at Thu Mar 24 23:05:42 2011
+@@ -198,12 +198,6 @@ END
+ [m4@&t@_init[]m4@&t@_include(foo.m4)
+ m4@&t@_divert([])d@&t@nl]
+ END
+- rm -rf "$file.m4f"
+- AT_CHECK_AUTOM4TE([-C "$cachedir" -I "$dir" --language=m4sugar --freeze -o
"$file.m4f" "$file"])
+- AT_CHECK([test -s "$file.m4f"])
+-
+- # Check --reload-state
+- AT_CHECK_AUTOM4TE([-C "$cachedir" --language=m4sugar -o "$outfile"
"$file.m4f" /dev/null])
+
+ test ! -f b
+ done
Index: 2.67/pkg/DESCR
===================================================================
RCS file: 2.67/pkg/DESCR
diff -N 2.67/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/pkg/DESCR 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,12 @@
+Autoconf is an extensible package of m4 macros that produce shell
+scripts to automatically configure software source code packages.
+These scripts allegedly can adapt the packages to many kinds of UNIX-like
+systems without manual user intervention. Autoconf creates a
+configuration script for a package from a template file that lists the
+operating system features that the package can use, in the form of m4
+macro calls.
+
+This is autoconf${SUFFIX}.
+
+The actual autoconf drivers for selecting autoconf version are in
+the metaauto package.
Index: 2.67/pkg/PLIST
===================================================================
RCS file: 2.67/pkg/PLIST
diff -N 2.67/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 2.67/pkg/PLIST 29 Mar 2011 10:10:51 -0000
@@ -0,0 +1,63 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+@option no-default-conflict
+bin/autoconf${SUFFIX}
+bin/autoheader${SUFFIX}
+bin/autom4te${SUFFIX}
+bin/autoreconf${SUFFIX}
+bin/autoscan${SUFFIX}
+bin/autoupdate${SUFFIX}
+bin/ifnames${SUFFIX}
+@info info/autoconf${SUFFIX}.info
+@comment @info info/standards${SUFFIX}.info
+@man man/man1/autoconf${SUFFIX}.1
+@man man/man1/autoheader${SUFFIX}.1
+@man man/man1/autom4te${SUFFIX}.1
+@man man/man1/autoreconf${SUFFIX}.1
+@man man/man1/autoscan${SUFFIX}.1
+@man man/man1/autoupdate${SUFFIX}.1
+@man man/man1/config.guess${SUFFIX}.1
+@man man/man1/config.sub${SUFFIX}.1
+@man man/man1/ifnames${SUFFIX}.1
+share/autoconf${SUFFIX}/
+share/autoconf${SUFFIX}/Autom4te/
+share/autoconf${SUFFIX}/Autom4te/C4che.pm
+share/autoconf${SUFFIX}/Autom4te/ChannelDefs.pm
+share/autoconf${SUFFIX}/Autom4te/Channels.pm
+share/autoconf${SUFFIX}/Autom4te/Configure_ac.pm
+share/autoconf${SUFFIX}/Autom4te/FileUtils.pm
+share/autoconf${SUFFIX}/Autom4te/General.pm
+share/autoconf${SUFFIX}/Autom4te/Request.pm
+share/autoconf${SUFFIX}/Autom4te/Struct.pm
+share/autoconf${SUFFIX}/Autom4te/XFile.pm
+share/autoconf${SUFFIX}/INSTALL
+share/autoconf${SUFFIX}/autoconf/
+share/autoconf${SUFFIX}/autoconf/autoconf.m4
+share/autoconf${SUFFIX}/autoconf/autoheader.m4
+share/autoconf${SUFFIX}/autoconf/autoscan.m4
+share/autoconf${SUFFIX}/autoconf/autotest.m4
+share/autoconf${SUFFIX}/autoconf/autoupdate.m4
+share/autoconf${SUFFIX}/autoconf/c.m4
+share/autoconf${SUFFIX}/autoconf/erlang.m4
+share/autoconf${SUFFIX}/autoconf/fortran.m4
+share/autoconf${SUFFIX}/autoconf/functions.m4
+share/autoconf${SUFFIX}/autoconf/general.m4
+share/autoconf${SUFFIX}/autoconf/headers.m4
+share/autoconf${SUFFIX}/autoconf/lang.m4
+share/autoconf${SUFFIX}/autoconf/libs.m4
+share/autoconf${SUFFIX}/autoconf/oldnames.m4
+share/autoconf${SUFFIX}/autoconf/programs.m4
+share/autoconf${SUFFIX}/autoconf/specific.m4
+share/autoconf${SUFFIX}/autoconf/status.m4
+share/autoconf${SUFFIX}/autoconf/types.m4
+share/autoconf${SUFFIX}/autom4te.cfg
+share/autoconf${SUFFIX}/autoscan/
+share/autoconf${SUFFIX}/autoscan/autoscan.list
+share/autoconf${SUFFIX}/autotest/
+share/autoconf${SUFFIX}/autotest/autotest.m4
+share/autoconf${SUFFIX}/autotest/general.m4
+share/autoconf${SUFFIX}/autotest/specific.m4
+share/autoconf${SUFFIX}/m4sugar/
+share/autoconf${SUFFIX}/m4sugar/foreach.m4
+share/autoconf${SUFFIX}/m4sugar/m4sh.m4
+share/autoconf${SUFFIX}/m4sugar/m4sugar.m4
+share/autoconf${SUFFIX}/m4sugar/version.m4
