From 3583b6b7d527e21d6110ffe0cf46613f27131efe Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 12 May 2011 00:10:33 +0000 Subject: [PATCH] Add autoconf-2.68, from Brad. --- devel/autoconf/2.68/Makefile | 16 +++++ devel/autoconf/2.68/distinfo | 5 ++ devel/autoconf/2.68/patches/patch-Makefile_in | 11 ++++ .../2.68/patches/patch-bin_autom4te_in | 38 +++++++++++ .../2.68/patches/patch-bin_autoupdate_in | 24 +++++++ devel/autoconf/2.68/patches/patch-configure | 40 ++++++++++++ .../2.68/patches/patch-doc_Makefile_in | 46 ++++++++++++++ .../2.68/patches/patch-doc_autoconf_texi | 42 +++++++++++++ .../patches/patch-lib_autoconf_Makefile_in | 12 ++++ .../patches/patch-lib_autotest_Makefile_in | 12 ++++ .../patches/patch-lib_m4sugar_Makefile_in | 12 ++++ .../2.68/patches/patch-lib_m4sugar_m4sugar_m4 | 26 ++++++++ .../2.68/patches/patch-tests_Makefile_in | 14 +++++ devel/autoconf/2.68/patches/patch-tests_c_at | 21 +++++++ .../2.68/patches/patch-tests_local_at | 11 ++++ .../2.68/patches/patch-tests_tools_at | 16 +++++ devel/autoconf/2.68/pkg/DESCR | 12 ++++ devel/autoconf/2.68/pkg/PLIST | 63 +++++++++++++++++++ 18 files changed, 421 insertions(+) create mode 100644 devel/autoconf/2.68/Makefile create mode 100644 devel/autoconf/2.68/distinfo create mode 100644 devel/autoconf/2.68/patches/patch-Makefile_in create mode 100644 devel/autoconf/2.68/patches/patch-bin_autom4te_in create mode 100644 devel/autoconf/2.68/patches/patch-bin_autoupdate_in create mode 100644 devel/autoconf/2.68/patches/patch-configure create mode 100644 devel/autoconf/2.68/patches/patch-doc_Makefile_in create mode 100644 devel/autoconf/2.68/patches/patch-doc_autoconf_texi create mode 100644 devel/autoconf/2.68/patches/patch-lib_autoconf_Makefile_in create mode 100644 devel/autoconf/2.68/patches/patch-lib_autotest_Makefile_in create mode 100644 devel/autoconf/2.68/patches/patch-lib_m4sugar_Makefile_in create mode 100644 devel/autoconf/2.68/patches/patch-lib_m4sugar_m4sugar_m4 create mode 100644 devel/autoconf/2.68/patches/patch-tests_Makefile_in create mode 100644 devel/autoconf/2.68/patches/patch-tests_c_at create mode 100644 devel/autoconf/2.68/patches/patch-tests_local_at create mode 100644 devel/autoconf/2.68/patches/patch-tests_tools_at create mode 100644 devel/autoconf/2.68/pkg/DESCR create mode 100644 devel/autoconf/2.68/pkg/PLIST diff --git a/devel/autoconf/2.68/Makefile b/devel/autoconf/2.68/Makefile new file mode 100644 index 00000000000..99438fa71c2 --- /dev/null +++ b/devel/autoconf/2.68/Makefile @@ -0,0 +1,16 @@ +# $OpenBSD: Makefile,v 1.1 2011/05/12 00:10:33 sthen Exp $ + +VERSION = 2.68 + +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 diff --git a/devel/autoconf/2.68/distinfo b/devel/autoconf/2.68/distinfo new file mode 100644 index 00000000000..da2dcf1759a --- /dev/null +++ b/devel/autoconf/2.68/distinfo @@ -0,0 +1,5 @@ +MD5 (autoconf-2.68.tar.gz) = w7UkdZLOaU9wl4c6oH1m/g== +RMD160 (autoconf-2.68.tar.gz) = ffJn35Z6lzp7Meja4qnW6QCXxzk= +SHA1 (autoconf-2.68.tar.gz) = hD99/Mat3xKdwsixL31y03FHj0I= +SHA256 (autoconf-2.68.tar.gz) = 7/cKKRby4rPtf+ii1+Y9cs86I2hLVkVrMZw+vOBwXZk= +SIZE (autoconf-2.68.tar.gz) = 1860672 diff --git a/devel/autoconf/2.68/patches/patch-Makefile_in b/devel/autoconf/2.68/patches/patch-Makefile_in new file mode 100644 index 00000000000..3b0ee8ace32 --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- Makefile.in.orig Wed Sep 22 18:36:18 2010 ++++ Makefile.in Sun May 1 20:49:42 2011 +@@ -323,6 +323,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) | \ diff --git a/devel/autoconf/2.68/patches/patch-bin_autom4te_in b/devel/autoconf/2.68/patches/patch-bin_autom4te_in new file mode 100644 index 00000000000..4fc7844c31f --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-bin_autom4te_in @@ -0,0 +1,38 @@ +$OpenBSD: patch-bin_autom4te_in,v 1.1 2011/05/12 00:10:33 sthen 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 &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")); + diff --git a/devel/autoconf/2.68/patches/patch-bin_autoupdate_in b/devel/autoconf/2.68/patches/patch-bin_autoupdate_in new file mode 100644 index 00000000000..b8e86302990 --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-bin_autoupdate_in @@ -0,0 +1,24 @@ +$OpenBSD: patch-bin_autoupdate_in,v 1.1 2011/05/12 00:10:33 sthen 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"); diff --git a/devel/autoconf/2.68/patches/patch-configure b/devel/autoconf/2.68/patches/patch-configure new file mode 100644 index 00000000000..b259858e40d --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-configure @@ -0,0 +1,40 @@ +$OpenBSD: patch-configure,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- configure.orig Wed Sep 22 18:38:20 2010 ++++ configure Sun May 1 20:52:34 2011 +@@ -2509,14 +2509,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(,mac,bug)' +- ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl +- test -z "`$ac_path_M4 -F conftest.m4f &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 +@@ -2561,19 +2554,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 ${ac_cv_prog_gnu_m4_debugfile+:} false; 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 + + + diff --git a/devel/autoconf/2.68/patches/patch-doc_Makefile_in b/devel/autoconf/2.68/patches/patch-doc_Makefile_in new file mode 100644 index 00000000000..95cc172fa80 --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-doc_Makefile_in @@ -0,0 +1,46 @@ +$OpenBSD: patch-doc_Makefile_in,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- doc/Makefile.in.orig Wed Sep 22 18:36:18 2010 ++++ doc/Makefile.in Sun May 1 20:49:42 2011 +@@ -396,6 +396,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; \ +@@ -577,19 +581,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; \ diff --git a/devel/autoconf/2.68/patches/patch-doc_autoconf_texi b/devel/autoconf/2.68/patches/patch-doc_autoconf_texi new file mode 100644 index 00000000000..1fd182dd1b7 --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-doc_autoconf_texi @@ -0,0 +1,42 @@ +$OpenBSD: patch-doc_autoconf_texi,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- doc/autoconf.texi.orig Tue Sep 21 16:14:56 2010 ++++ doc/autoconf.texi Sun May 1 20:49:42 2011 +@@ -226,27 +226,27 @@ freedom.'' + + @dircategory Software development + @direntry +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf-2.68: (autoconf-2.68). Create source code configuration scripts. + @end direntry + + @dircategory Individual utilities + @direntry +-* autoscan: (autoconf)autoscan Invocation. ++* autoscan-2.68: (autoconf-2.68)autoscan Invocation. + Semi-automatic @file{configure.ac} writing +-* ifnames: (autoconf)ifnames Invocation. Listing conditionals in source. +-* autoconf-invocation: (autoconf)autoconf Invocation. ++* ifnames-2.68: (autoconf-2.68)ifnames Invocation. Listing conditionals in source. ++* autoconf-invocation-2.68: (autoconf-2.68)autoconf Invocation. + How to create configuration scripts +-* autoreconf: (autoconf)autoreconf Invocation. ++* autoreconf-2.68: (autoconf-2.68)autoreconf Invocation. + Remaking multiple @command{configure} scripts +-* autoheader: (autoconf)autoheader Invocation. ++* autoheader-2.68: (autoconf-2.68)autoheader Invocation. + How to create configuration templates +-* autom4te: (autoconf)autom4te Invocation. ++* autom4te-2.68: (autoconf-2.68)autom4te Invocation. + The Autoconf executables backbone +-* configure: (autoconf)configure Invocation. Configuring a package. +-* autoupdate: (autoconf)autoupdate Invocation. ++* configure-2.68: (autoconf-2.68)configure Invocation. Configuring a package. ++* autoupdate-2.68: (autoconf-2.68)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.68: (autoconf-2.68)config.status Invocation. Recreating configurations. ++* testsuite-2.68: (autoconf-2.68)testsuite Invocation. Running an Autotest test suite. + @end direntry + + @titlepage diff --git a/devel/autoconf/2.68/patches/patch-lib_autoconf_Makefile_in b/devel/autoconf/2.68/patches/patch-lib_autoconf_Makefile_in new file mode 100644 index 00000000000..28960174260 --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-lib_autoconf_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-lib_autoconf_Makefile_in,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- lib/autoconf/Makefile.in.orig Wed Sep 22 18:36:18 2010 ++++ lib/autoconf/Makefile.in Sun May 1 20:49:42 2011 +@@ -216,7 +216,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) diff --git a/devel/autoconf/2.68/patches/patch-lib_autotest_Makefile_in b/devel/autoconf/2.68/patches/patch-lib_autotest_Makefile_in new file mode 100644 index 00000000000..fdb088d5a5d --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-lib_autotest_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-lib_autotest_Makefile_in,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- lib/autotest/Makefile.in.orig Wed Sep 22 18:36:18 2010 ++++ lib/autotest/Makefile.in Sun May 1 20:49:42 2011 +@@ -209,7 +209,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) diff --git a/devel/autoconf/2.68/patches/patch-lib_m4sugar_Makefile_in b/devel/autoconf/2.68/patches/patch-lib_m4sugar_Makefile_in new file mode 100644 index 00000000000..cc8ab47bca3 --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-lib_m4sugar_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-lib_m4sugar_Makefile_in,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- lib/m4sugar/Makefile.in.orig Wed Sep 22 18:36:18 2010 ++++ lib/m4sugar/Makefile.in Sun May 1 20:49:42 2011 +@@ -210,7 +210,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. diff --git a/devel/autoconf/2.68/patches/patch-lib_m4sugar_m4sugar_m4 b/devel/autoconf/2.68/patches/patch-lib_m4sugar_m4sugar_m4 new file mode 100644 index 00000000000..9d76bfdc959 --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-lib_m4sugar_m4sugar_m4 @@ -0,0 +1,26 @@ +$OpenBSD: patch-lib_m4sugar_m4sugar_m4,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- lib/m4sugar/m4sugar.m4.orig Wed Sep 22 17:38:26 2010 ++++ lib/m4sugar/m4sugar.m4 Sun May 1 22:23:55 2011 +@@ -2127,6 +2127,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) +@@ -3278,13 +3279,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__)))[[)])])]) + diff --git a/devel/autoconf/2.68/patches/patch-tests_Makefile_in b/devel/autoconf/2.68/patches/patch-tests_Makefile_in new file mode 100644 index 00000000000..5ed843f85eb --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-tests_Makefile_in @@ -0,0 +1,14 @@ +$OpenBSD: patch-tests_Makefile_in,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- tests/Makefile.in.orig Wed Sep 22 18:36:18 2010 ++++ tests/Makefile.in Sun May 1 20:49:42 2011 +@@ -576,9 +576,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 $@ + diff --git a/devel/autoconf/2.68/patches/patch-tests_c_at b/devel/autoconf/2.68/patches/patch-tests_c_at new file mode 100644 index 00000000000..35e962cf313 --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-tests_c_at @@ -0,0 +1,21 @@ +$OpenBSD: patch-tests_c_at,v 1.1 2011/05/12 00:10:33 sthen 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 ' | /lib/cpp || exit 77]], ++AT_CHECK([[echo '#include ' | /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 ' | /lib/cpp || exit 77]], ++AT_CHECK([[echo '#include ' | /usr/bin/cpp || exit 77]], + [], [ignore], [ignore]) + + AT_DATA([mycc], diff --git a/devel/autoconf/2.68/patches/patch-tests_local_at b/devel/autoconf/2.68/patches/patch-tests_local_at new file mode 100644 index 00000000000..e33729a897b --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-tests_local_at @@ -0,0 +1,11 @@ +$OpenBSD: patch-tests_local_at,v 1.1 2011/05/12 00:10:33 sthen Exp $ +--- tests/local.at.orig Sat Aug 14 14:00:57 2010 ++++ tests/local.at Sun May 1 20:49:42 2011 +@@ -119,6 +119,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])]) + ]) + diff --git a/devel/autoconf/2.68/patches/patch-tests_tools_at b/devel/autoconf/2.68/patches/patch-tests_tools_at new file mode 100644 index 00000000000..9cc30c0776f --- /dev/null +++ b/devel/autoconf/2.68/patches/patch-tests_tools_at @@ -0,0 +1,16 @@ +$OpenBSD: patch-tests_tools_at,v 1.1 2011/05/12 00:10:33 sthen 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 diff --git a/devel/autoconf/2.68/pkg/DESCR b/devel/autoconf/2.68/pkg/DESCR new file mode 100644 index 00000000000..10025590461 --- /dev/null +++ b/devel/autoconf/2.68/pkg/DESCR @@ -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. diff --git a/devel/autoconf/2.68/pkg/PLIST b/devel/autoconf/2.68/pkg/PLIST new file mode 100644 index 00000000000..115f365ca55 --- /dev/null +++ b/devel/autoconf/2.68/pkg/PLIST @@ -0,0 +1,63 @@ +@comment $OpenBSD: PLIST,v 1.1 2011/05/12 00:10:33 sthen 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