diff --git a/devel/autoconf/2.13/patches/patch-autoconf_texi b/devel/autoconf/2.13/patches/patch-autoconf_texi index 7484b03c68e..92bd80e7f32 100644 --- a/devel/autoconf/2.13/patches/patch-autoconf_texi +++ b/devel/autoconf/2.13/patches/patch-autoconf_texi @@ -1,6 +1,6 @@ -$OpenBSD: patch-autoconf_texi,v 1.2 2003/05/26 02:07:22 fgsch Exp $ ---- autoconf.texi.orig Tue Jan 5 10:28:37 1999 -+++ autoconf.texi Sun May 25 22:54:53 2003 +$OpenBSD: patch-autoconf_texi,v 1.3 2004/07/22 05:50:07 espie Exp $ +--- autoconf.texi.orig Tue Jan 5 14:28:37 1999 ++++ autoconf.texi Thu Jul 22 07:40:19 2004 @@ -4,6 +4,7 @@ @settitle Autoconf @c For double-sided printing, uncomment: @@ -14,7 +14,7 @@ $OpenBSD: patch-autoconf_texi,v 1.2 2003/05/26 02:07:22 fgsch Exp $ @format START-INFO-DIR-ENTRY -* Autoconf: (autoconf). Create source code configuration scripts. -+* Autoconf: (autoconf-2.13). Create source code configuration scripts. ++* Autoconf-2.13: (autoconf-2.13). Create source code configuration scripts. END-INFO-DIR-ENTRY @end format diff --git a/devel/autoconf/2.13/patches/patch-autoheader_sh b/devel/autoconf/2.13/patches/patch-autoheader_sh index af7da8f4e19..8cbde8e34cb 100644 --- a/devel/autoconf/2.13/patches/patch-autoheader_sh +++ b/devel/autoconf/2.13/patches/patch-autoheader_sh @@ -1,24 +1,12 @@ -$OpenBSD: patch-autoheader_sh,v 1.3 2003/02/16 00:17:29 brad Exp $ ---- autoheader.sh.orig Sat Feb 15 19:03:48 2003 -+++ autoheader.sh Sat Feb 15 19:10:03 2003 -@@ -110,19 +110,10 @@ else - use_localdir= - fi - --# Use the frozen version of Autoconf if available. --r= f= --# Some non-GNU m4's don't reject the --help option, so give them /dev/null. --case `$M4 --help < /dev/null 2>&1` in --*reload-state*) test -r $AC_MACRODIR/autoheader.m4f && { r=--reload f=f; } ;; --*traditional*) ;; --*) echo Autoconf requires GNU m4 1.1 or later >&2; exit 1 ;; --esac -- - # Extract assignments of SYMS, TYPES, FUNCS, HEADERS, and LIBS from the - # modified autoconf processing of the input file. The sed hair is - # necessary to win for multi-line macro invocations. --eval "`$M4 -I$AC_MACRODIR $use_localdir $r autoheader.m4$f $infile | -+eval "`$M4 -g -D__gnu__ -I$AC_MACRODIR $use_localdir autoheader.m4 $infile | - sed -n -e ' - : again - /^@@@.*@@@$/s/^@@@\(.*\)@@@$/\1/p +$OpenBSD: patch-autoheader_sh,v 1.4 2004/07/22 05:50:07 espie Exp $ +--- autoheader.sh.orig Tue Jan 5 14:28:39 1999 ++++ autoheader.sh Thu Jul 22 07:32:20 2004 +@@ -194,7 +194,7 @@ if test -n "$syms"; then + # Some fgrep's have limits on the number of lines that can be in the + # pattern on the command line, so use a temporary file containing the + # pattern. +- (fgrep_tmp=${TMPDIR-/tmp}/autoh$$ ++ (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1 + trap "rm -f $fgrep_tmp; exit 1" 1 2 15 + cat > $fgrep_tmp < $fgrep_tmp <&1 | grep reload-state >/dev/null"; -- ++$m4 .=" -g -D__gnu__"; + -# 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|-L) /; - -+$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; @@ -605,11 +597,11 @@ sub handle_m4 ($@) # We don't output directly to the cache files, to avoid problems # when we are interrupted (that leaves corrupted files). diff --git a/devel/autoconf/2.54/patches/patch-doc_autoconf_texi b/devel/autoconf/2.54/patches/patch-doc_autoconf_texi index 83be9f20f3b..6baeea2d4e6 100644 --- a/devel/autoconf/2.54/patches/patch-doc_autoconf_texi +++ b/devel/autoconf/2.54/patches/patch-doc_autoconf_texi @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2003/06/24 23:03:23 espie Exp $ +$OpenBSD: patch-doc_autoconf_texi,v 1.2 2004/07/22 05:50:07 espie Exp $ --- doc/autoconf.texi.orig Thu Sep 12 15:16:42 2002 -+++ doc/autoconf.texi Tue Jun 24 18:14:19 2003 ++++ doc/autoconf.texi Thu Jul 22 07:37:14 2004 @@ -4,6 +4,7 @@ @setfilename autoconf.info @include version.texi @@ -9,39 +9,45 @@ $OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2003/06/24 23:03:23 espie Exp $ @setchapternewpage odd @setcontentsaftertitlepage @finalout -@@ -101,25 +102,25 @@ Software Foundation raise funds for GNU +@@ -96,30 +97,30 @@ Software Foundation raise funds for GNU + + @dircategory GNU programming tools + @direntry +-* Autoconf: (autoconf). Create source code configuration scripts ++* Autoconf-2.54: (autoconf-2.54). Create source code configuration scripts + @end direntry @dircategory Individual utilities @direntry -* autoscan: (autoconf)autoscan Invocation. -+* autoscan: (autoconf-2.54)autoscan Invocation. ++* autoscan-2.54: (autoconf-2.54)autoscan Invocation. Semi-automatic @file{configure.ac} writing -* ifnames: (autoconf)ifnames Invocation. -+* ifnames: (autoconf-2.54)ifnames Invocation. ++* ifnames-2.54: (autoconf-2.54)ifnames Invocation. Listing the conditionals in source code -* autoconf: (autoconf)autoconf Invocation. -+* autoconf: (autoconf-2.54)autoconf Invocation. ++* autoconf-2.54: (autoconf-2.54)autoconf Invocation. How to create configuration scripts -* autoreconf: (autoconf)autoreconf Invocation. -+* autoreconf: (autoconf-2.54)autoreconf Invocation. ++* autoreconf-2.54: (autoconf-2.54)autoreconf Invocation. Remaking multiple @command{configure} scripts -* autoheader: (autoconf)autoheader Invocation. -+* autoheader: (autoconf-2.54)autoheader Invocation. ++* autoheader-2.54: (autoconf-2.54)autoheader Invocation. How to create configuration templates -* autom4te: (autoconf)Invoking autom4te. -+* autom4te: (autoconf-2.54)Invoking autom4te. ++* autom4te-2.54: (autoconf-2.54)Invoking autom4te. The Autoconf executables backbone -* configure: (autoconf)configure Invocation. -+* configure: (autoconf-2.54)configure Invocation. ++* configure-2.54: (autoconf-2.54)configure Invocation. Configuring a package -* autoupdate: (autoconf)autoupdate Invocation. -+* autoupdate: (autoconf-2.54)autoupdate Invocation. ++* autoupdate-2.54: (autoconf-2.54)autoupdate Invocation. Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. -+* config.status: (autoconf-2.54)config.status Invocation. ++* config.status-2.54: (autoconf-2.54)config.status Invocation. Recreating a configuration -* testsuite: (autoconf)testsuite Invocation. -+* testsuite: (autoconf-2.54)testsuite Invocation. ++* testsuite-2.54: (autoconf-2.54)testsuite Invocation. Running an Autotest test suite @end direntry diff --git a/devel/autoconf/2.54/pkg/PLIST b/devel/autoconf/2.54/pkg/PLIST index ddfbb7d11bf..1d9632921ab 100644 --- a/devel/autoconf/2.54/pkg/PLIST +++ b/devel/autoconf/2.54/pkg/PLIST @@ -1,7 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2003/06/24 23:03:23 espie Exp $ +@comment $OpenBSD: PLIST,v 1.2 2004/07/22 05:50:07 espie Exp $ @option no-default-conflict -@unexec install-info --delete --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @unexec install-info --delete --info-dir=%D/info %D/info/standards${SUFFIX}.info bin/autoconf${SUFFIX} bin/autoheader${SUFFIX} bin/autom4te${SUFFIX} @@ -9,8 +7,8 @@ bin/autoreconf${SUFFIX} bin/autoscan${SUFFIX} bin/autoupdate${SUFFIX} bin/ifnames${SUFFIX} -info/autoconf${SUFFIX}.info -@comment info/standards${SUFFIX}.info +@info info/autoconf${SUFFIX}.info +@comment @info info/standards${SUFFIX}.info man/man1/autoconf${SUFFIX}.1 man/man1/autoheader${SUFFIX}.1 man/man1/autom4te${SUFFIX}.1 @@ -20,10 +18,13 @@ man/man1/autoupdate${SUFFIX}.1 man/man1/config.guess${SUFFIX}.1 man/man1/config.sub${SUFFIX}.1 man/man1/ifnames${SUFFIX}.1 +@dir share/autoconf${SUFFIX} +@dir share/autoconf${SUFFIX}/Autom4te share/autoconf${SUFFIX}/Autom4te/General.pm share/autoconf${SUFFIX}/Autom4te/Struct.pm share/autoconf${SUFFIX}/Autom4te/XFile.pm share/autoconf${SUFFIX}/INSTALL +@dir share/autoconf${SUFFIX}/autoconf share/autoconf${SUFFIX}/autoconf/autoconf.m4 share/autoconf${SUFFIX}/autoconf/autoheader.m4 share/autoconf${SUFFIX}/autoconf/autotest.m4 @@ -41,22 +42,17 @@ share/autoconf${SUFFIX}/autoconf/specific.m4 share/autoconf${SUFFIX}/autoconf/status.m4 share/autoconf${SUFFIX}/autoconf/types.m4 share/autoconf${SUFFIX}/autom4te.cfg +@dir share/autoconf${SUFFIX}/autoscan share/autoconf${SUFFIX}/autoscan/functions share/autoconf${SUFFIX}/autoscan/headers share/autoconf${SUFFIX}/autoscan/identifiers share/autoconf${SUFFIX}/autoscan/libraries share/autoconf${SUFFIX}/autoscan/makevars share/autoconf${SUFFIX}/autoscan/programs +@dir share/autoconf${SUFFIX}/autotest share/autoconf${SUFFIX}/autotest/autotest.m4 share/autoconf${SUFFIX}/autotest/general.m4 +@dir share/autoconf${SUFFIX}/m4sugar share/autoconf${SUFFIX}/m4sugar/m4sh.m4 share/autoconf${SUFFIX}/m4sugar/m4sugar.m4 share/autoconf${SUFFIX}/m4sugar/version.m4 -@dirrm share/autoconf${SUFFIX}/m4sugar -@dirrm share/autoconf${SUFFIX}/autotest -@dirrm share/autoconf${SUFFIX}/autoscan -@dirrm share/autoconf${SUFFIX}/autoconf -@dirrm share/autoconf${SUFFIX}/Autom4te -@dirrm share/autoconf${SUFFIX} -@exec install-info --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @exec install-info --info-dir=%D/info %D/info/standards${SUFFIX}.info diff --git a/devel/autoconf/2.56/patches/patch-bin_autom4te_in b/devel/autoconf/2.56/patches/patch-bin_autom4te_in index 3a913713448..c1db13c6fbf 100644 --- a/devel/autoconf/2.56/patches/patch-bin_autom4te_in +++ b/devel/autoconf/2.56/patches/patch-bin_autom4te_in @@ -1,23 +1,24 @@ -$OpenBSD: patch-bin_autom4te_in,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $ +$OpenBSD: patch-bin_autom4te_in,v 1.2 2004/07/22 05:50:07 espie Exp $ --- bin/autom4te.in.orig Thu Oct 31 09:37:05 2002 -+++ bin/autom4te.in Tue Jun 24 17:59:13 2003 -@@ -276,15 +276,7 @@ my $freeze = 0; ++++ bin/autom4te.in Thu Jul 22 07:19:19 2004 +@@ -276,16 +276,8 @@ 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. -error "need GNU m4 1.4 or later: $m4" - if system "$m4 --help &1 | grep reload-state >/dev/null"; -- ++$m4 .=" -g -D__gnu__"; + -# 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|-L) /; - -+$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; @@ -660,12 +652,11 @@ sub handle_m4 ($@) # We don't output directly to the cache files, to avoid problems # when we are interrupted (that leaves corrupted files). diff --git a/devel/autoconf/2.56/patches/patch-doc_autoconf_texi b/devel/autoconf/2.56/patches/patch-doc_autoconf_texi index 6ddfba0079c..c8d7339c1b7 100644 --- a/devel/autoconf/2.56/patches/patch-doc_autoconf_texi +++ b/devel/autoconf/2.56/patches/patch-doc_autoconf_texi @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_autoconf_texi,v 1.2 2003/06/25 08:04:25 wilfried Exp $ ---- doc/autoconf.texi.orig Tue Dec 3 08:16:32 2002 -+++ doc/autoconf.texi Mon Jun 9 12:05:18 2003 +$OpenBSD: patch-doc_autoconf_texi,v 1.3 2004/07/22 05:50:07 espie Exp $ +--- doc/autoconf.texi.orig Thu Nov 14 09:41:42 2002 ++++ doc/autoconf.texi Thu Jul 22 07:37:54 2004 @@ -4,6 +4,7 @@ @setfilename autoconf.info @include version.texi @@ -20,34 +20,34 @@ $OpenBSD: patch-doc_autoconf_texi,v 1.2 2003/06/25 08:04:25 wilfried Exp $ @dircategory Individual utilities @direntry -* autoscan: (autoconf)autoscan Invocation. -+* autoscan: (autoconf-2.56)autoscan Invocation. ++* autoscan-2.56: (autoconf-2.56)autoscan Invocation. Semi-automatic @file{configure.ac} writing -* ifnames: (autoconf)ifnames Invocation. -+* ifnames: (autoconf-2.56)ifnames Invocation. ++* ifnames-2.56: (autoconf-2.56)ifnames Invocation. Listing the conditionals in source code -* autoconf: (autoconf)autoconf Invocation. -+* autoconf: (autoconf-2.56)autoconf Invocation. ++* autoconf-2.56: (autoconf-2.56)autoconf Invocation. How to create configuration scripts -* autoreconf: (autoconf)autoreconf Invocation. -+* autoreconf: (autoconf-2.56)autoreconf Invocation. ++* autoreconf-2.56: (autoconf-2.56)autoreconf Invocation. Remaking multiple @command{configure} scripts -* autoheader: (autoconf)autoheader Invocation. -+* autoheader: (autoconf-2.56)autoheader Invocation. ++* autoheader-2.56: (autoconf-2.56)autoheader Invocation. How to create configuration templates -* autom4te: (autoconf)autom4te Invocation. -+* autom4te: (autoconf-2.56)autom4te Invocation. ++* autom4te-2.56: (autoconf-2.56)autom4te Invocation. The Autoconf executables backbone -* configure: (autoconf)configure Invocation. -+* configure: (autoconf-2.56)configure Invocation. ++* configure-2.56: (autoconf-2.56)configure Invocation. Configuring a package -* autoupdate: (autoconf)autoupdate Invocation. -+* autoupdate: (autoconf-2.56)autoupdate Invocation. ++* autoupdate-2.56: (autoconf-2.56)autoupdate Invocation. Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. -+* config.status: (autoconf-2.56)config.status Invocation. ++* config.status-2.56: (autoconf-2.56)config.status Invocation. Recreating a configuration -* testsuite: (autoconf)testsuite Invocation. -+* testsuite: (autoconf-2.56)testsuite Invocation. ++* testsuite-2.56: (autoconf-2.56)testsuite Invocation. Running an Autotest test suite @end direntry diff --git a/devel/autoconf/2.56/pkg/PLIST b/devel/autoconf/2.56/pkg/PLIST index 8bb9ef6e6f9..2d9eff88eb8 100644 --- a/devel/autoconf/2.56/pkg/PLIST +++ b/devel/autoconf/2.56/pkg/PLIST @@ -1,7 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $ +@comment $OpenBSD: PLIST,v 1.2 2004/07/22 05:50:07 espie Exp $ @option no-default-conflict -@unexec install-info --delete --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @unexec install-info --delete --info-dir=%D/info %D/info/standards${SUFFIX}.info bin/autoconf${SUFFIX} bin/autoheader${SUFFIX} bin/autom4te${SUFFIX} @@ -9,8 +7,8 @@ bin/autoreconf${SUFFIX} bin/autoscan${SUFFIX} bin/autoupdate${SUFFIX} bin/ifnames${SUFFIX} -info/autoconf${SUFFIX}.info -@comment info/standards${SUFFIX}.info +@info info/autoconf${SUFFIX}.info +@comment @info info/standards${SUFFIX}.info man/man1/autoconf${SUFFIX}.1 man/man1/autoheader${SUFFIX}.1 man/man1/autom4te${SUFFIX}.1 @@ -20,10 +18,13 @@ man/man1/autoupdate${SUFFIX}.1 man/man1/config.guess${SUFFIX}.1 man/man1/config.sub${SUFFIX}.1 man/man1/ifnames${SUFFIX}.1 +@dir share/autoconf${SUFFIX} +@dir share/autoconf${SUFFIX}/Autom4te share/autoconf${SUFFIX}/Autom4te/General.pm share/autoconf${SUFFIX}/Autom4te/Struct.pm share/autoconf${SUFFIX}/Autom4te/XFile.pm share/autoconf${SUFFIX}/INSTALL +@dir share/autoconf${SUFFIX}/autoconf share/autoconf${SUFFIX}/autoconf/autoconf.m4 share/autoconf${SUFFIX}/autoconf/autoheader.m4 share/autoconf${SUFFIX}/autoconf/autoscan.m4 @@ -42,17 +43,12 @@ share/autoconf${SUFFIX}/autoconf/specific.m4 share/autoconf${SUFFIX}/autoconf/status.m4 share/autoconf${SUFFIX}/autoconf/types.m4 share/autoconf${SUFFIX}/autom4te.cfg +@dir share/autoconf${SUFFIX}/autoscan share/autoconf${SUFFIX}/autoscan/autoscan.list +@dir share/autoconf${SUFFIX}/autotest share/autoconf${SUFFIX}/autotest/autotest.m4 share/autoconf${SUFFIX}/autotest/general.m4 +@dir share/autoconf${SUFFIX}/m4sugar share/autoconf${SUFFIX}/m4sugar/m4sh.m4 share/autoconf${SUFFIX}/m4sugar/m4sugar.m4 share/autoconf${SUFFIX}/m4sugar/version.m4 -@dirrm share/autoconf${SUFFIX}/m4sugar -@dirrm share/autoconf${SUFFIX}/autotest -@dirrm share/autoconf${SUFFIX}/autoscan -@dirrm share/autoconf${SUFFIX}/autoconf -@dirrm share/autoconf${SUFFIX}/Autom4te -@dirrm share/autoconf${SUFFIX} -@exec install-info --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @exec install-info --info-dir=%D/info %D/info/standards${SUFFIX}.info diff --git a/devel/autoconf/2.57/patches/patch-bin_autom4te_in b/devel/autoconf/2.57/patches/patch-bin_autom4te_in index afaade4a8fa..97bf9df3c28 100644 --- a/devel/autoconf/2.57/patches/patch-bin_autom4te_in +++ b/devel/autoconf/2.57/patches/patch-bin_autom4te_in @@ -1,23 +1,24 @@ -$OpenBSD: patch-bin_autom4te_in,v 1.1.1.1 2003/06/09 12:04:15 espie Exp $ +$OpenBSD: patch-bin_autom4te_in,v 1.2 2004/07/22 05:50:07 espie Exp $ --- bin/autom4te.in.orig Tue Dec 3 09:20:16 2002 -+++ bin/autom4te.in Mon Jun 9 11:54:03 2003 -@@ -276,15 +276,7 @@ my $freeze = 0; ++++ bin/autom4te.in Thu Jul 22 07:19:33 2004 +@@ -276,16 +276,8 @@ 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. -error "need GNU m4 1.4 or later: $m4" - if system "$m4 --help &1 | grep reload-state >/dev/null"; -- ++$m4 .=" -g -D__gnu__"; + -# 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|-L) /; - -+$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; @@ -660,12 +652,11 @@ sub handle_m4 ($@) # We don't output directly to the cache files, to avoid problems # when we are interrupted (that leaves corrupted files). diff --git a/devel/autoconf/2.57/patches/patch-doc_autoconf_texi b/devel/autoconf/2.57/patches/patch-doc_autoconf_texi index cdf9e1bb66b..960690aa483 100644 --- a/devel/autoconf/2.57/patches/patch-doc_autoconf_texi +++ b/devel/autoconf/2.57/patches/patch-doc_autoconf_texi @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2003/06/09 12:04:15 espie Exp $ +$OpenBSD: patch-doc_autoconf_texi,v 1.2 2004/07/22 05:50:07 espie Exp $ --- doc/autoconf.texi.orig Tue Dec 3 08:16:32 2002 -+++ doc/autoconf.texi Mon Jun 9 12:05:18 2003 ++++ doc/autoconf.texi Thu Jul 22 07:38:29 2004 @@ -4,6 +4,7 @@ @setfilename autoconf.info @include version.texi @@ -20,34 +20,34 @@ $OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2003/06/09 12:04:15 espie Exp $ @dircategory Individual utilities @direntry -* autoscan: (autoconf)autoscan Invocation. -+* autoscan: (autoconf-2.57)autoscan Invocation. ++* autoscan-2.57: (autoconf-2.57)autoscan Invocation. Semi-automatic @file{configure.ac} writing -* ifnames: (autoconf)ifnames Invocation. -+* ifnames: (autoconf-2.57)ifnames Invocation. ++* ifnames-2.57: (autoconf-2.57)ifnames Invocation. Listing the conditionals in source code -* autoconf: (autoconf)autoconf Invocation. -+* autoconf: (autoconf-2.57)autoconf Invocation. ++* autoconf-2.57: (autoconf-2.57)autoconf Invocation. How to create configuration scripts -* autoreconf: (autoconf)autoreconf Invocation. -+* autoreconf: (autoconf-2.57)autoreconf Invocation. ++* autoreconf-2.57: (autoconf-2.57)autoreconf Invocation. Remaking multiple @command{configure} scripts -* autoheader: (autoconf)autoheader Invocation. -+* autoheader: (autoconf-2.57)autoheader Invocation. ++* autoheader-2.57: (autoconf-2.57)autoheader Invocation. How to create configuration templates -* autom4te: (autoconf)autom4te Invocation. -+* autom4te: (autoconf-2.57)autom4te Invocation. ++* autom4te-2.57: (autoconf-2.57)autom4te Invocation. The Autoconf executables backbone -* configure: (autoconf)configure Invocation. -+* configure: (autoconf-2.57)configure Invocation. ++* configure-2.57: (autoconf-2.57)configure Invocation. Configuring a package -* autoupdate: (autoconf)autoupdate Invocation. -+* autoupdate: (autoconf-2.57)autoupdate Invocation. ++* autoupdate-2.57: (autoconf-2.57)autoupdate Invocation. Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. -+* config.status: (autoconf-2.57)config.status Invocation. ++* config.status-2.57: (autoconf-2.57)config.status Invocation. Recreating a configuration -* testsuite: (autoconf)testsuite Invocation. -+* testsuite: (autoconf-2.57)testsuite Invocation. ++* testsuite-2.57: (autoconf-2.57)testsuite Invocation. Running an Autotest test suite @end direntry diff --git a/devel/autoconf/2.57/pkg/PLIST b/devel/autoconf/2.57/pkg/PLIST index 0e36d0e23e1..2d9eff88eb8 100644 --- a/devel/autoconf/2.57/pkg/PLIST +++ b/devel/autoconf/2.57/pkg/PLIST @@ -1,7 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2003/06/09 12:04:15 espie Exp $ +@comment $OpenBSD: PLIST,v 1.2 2004/07/22 05:50:07 espie Exp $ @option no-default-conflict -@unexec install-info --delete --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @unexec install-info --delete --info-dir=%D/info %D/info/standards${SUFFIX}.info bin/autoconf${SUFFIX} bin/autoheader${SUFFIX} bin/autom4te${SUFFIX} @@ -9,8 +7,8 @@ bin/autoreconf${SUFFIX} bin/autoscan${SUFFIX} bin/autoupdate${SUFFIX} bin/ifnames${SUFFIX} -info/autoconf${SUFFIX}.info -@comment info/standards${SUFFIX}.info +@info info/autoconf${SUFFIX}.info +@comment @info info/standards${SUFFIX}.info man/man1/autoconf${SUFFIX}.1 man/man1/autoheader${SUFFIX}.1 man/man1/autom4te${SUFFIX}.1 @@ -20,10 +18,13 @@ man/man1/autoupdate${SUFFIX}.1 man/man1/config.guess${SUFFIX}.1 man/man1/config.sub${SUFFIX}.1 man/man1/ifnames${SUFFIX}.1 +@dir share/autoconf${SUFFIX} +@dir share/autoconf${SUFFIX}/Autom4te share/autoconf${SUFFIX}/Autom4te/General.pm share/autoconf${SUFFIX}/Autom4te/Struct.pm share/autoconf${SUFFIX}/Autom4te/XFile.pm share/autoconf${SUFFIX}/INSTALL +@dir share/autoconf${SUFFIX}/autoconf share/autoconf${SUFFIX}/autoconf/autoconf.m4 share/autoconf${SUFFIX}/autoconf/autoheader.m4 share/autoconf${SUFFIX}/autoconf/autoscan.m4 @@ -42,17 +43,12 @@ share/autoconf${SUFFIX}/autoconf/specific.m4 share/autoconf${SUFFIX}/autoconf/status.m4 share/autoconf${SUFFIX}/autoconf/types.m4 share/autoconf${SUFFIX}/autom4te.cfg +@dir share/autoconf${SUFFIX}/autoscan share/autoconf${SUFFIX}/autoscan/autoscan.list +@dir share/autoconf${SUFFIX}/autotest share/autoconf${SUFFIX}/autotest/autotest.m4 share/autoconf${SUFFIX}/autotest/general.m4 +@dir share/autoconf${SUFFIX}/m4sugar share/autoconf${SUFFIX}/m4sugar/m4sh.m4 share/autoconf${SUFFIX}/m4sugar/m4sugar.m4 share/autoconf${SUFFIX}/m4sugar/version.m4 -@dirrm share/autoconf${SUFFIX}/m4sugar -@dirrm share/autoconf${SUFFIX}/autotest -@dirrm share/autoconf${SUFFIX}/autoscan -@dirrm share/autoconf${SUFFIX}/autoconf -@dirrm share/autoconf${SUFFIX}/Autom4te -@dirrm share/autoconf${SUFFIX} -@exec install-info --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @exec install-info --info-dir=%D/info %D/info/standards${SUFFIX}.info diff --git a/devel/autoconf/2.58/patches/patch-Makefile_in b/devel/autoconf/2.58/patches/patch-Makefile_in index 2085865becf..638a5d7c225 100644 --- a/devel/autoconf/2.58/patches/patch-Makefile_in +++ b/devel/autoconf/2.58/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- Makefile.in.orig 2003-11-06 10:33:26.000000000 +0100 -+++ Makefile.in 2004-02-09 22:11:40.000000000 +0100 -@@ -198,6 +198,7 @@ install-pkgdataDATA: $(pkgdata_DATA) +$OpenBSD: patch-Makefile_in,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- Makefile.in.orig Tue Nov 4 09:47:18 2003 ++++ Makefile.in Thu Jul 22 07:19:47 2004 +@@ -195,6 +195,7 @@ install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @list='$(pkgdata_DATA)'; for p in $$list; do \ diff --git a/devel/autoconf/2.58/patches/patch-bin_Makefile_in b/devel/autoconf/2.58/patches/patch-bin_Makefile_in index 51e1e5d5e5d..bcdd32e67ab 100644 --- a/devel/autoconf/2.58/patches/patch-bin_Makefile_in +++ b/devel/autoconf/2.58/patches/patch-bin_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-bin_Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- bin/Makefile.in.orig 2003-11-06 10:33:26.000000000 +0100 -+++ bin/Makefile.in 2004-02-09 22:43:26.000000000 +0100 -@@ -198,7 +198,7 @@ edit = sed \ +$OpenBSD: patch-bin_Makefile_in,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- bin/Makefile.in.orig Tue Nov 4 09:47:19 2003 ++++ bin/Makefile.in Thu Jul 22 07:19:47 2004 +@@ -195,7 +195,7 @@ edit = sed \ -e 's,@AWK\@,$(AWK),g' \ -e 's,@VERSION\@,$(VERSION),g' \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ @@ -10,7 +10,7 @@ $OpenBSD: patch-bin_Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ # autoconf is written in M4sh. -@@ -468,49 +468,49 @@ $(srcdir)/autoconf.in: $(srcdir)/autocon +@@ -465,49 +465,49 @@ $(srcdir)/autoconf.in: $(srcdir)/autocon autoconf: $(srcdir)/autoconf.in Makefile rm -f autoconf autoconf.tmp diff --git a/devel/autoconf/2.58/patches/patch-bin_autom4te_in b/devel/autoconf/2.58/patches/patch-bin_autom4te_in index 132749acc0e..28ad6e996b6 100644 --- a/devel/autoconf/2.58/patches/patch-bin_autom4te_in +++ b/devel/autoconf/2.58/patches/patch-bin_autom4te_in @@ -1,23 +1,24 @@ -$OpenBSD: patch-bin_autom4te_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- bin/autom4te.in.orig 2003-10-28 09:48:36.000000000 +0100 -+++ bin/autom4te.in 2004-02-09 22:15:48.000000000 +0100 -@@ -88,15 +88,8 @@ my $freeze = 0; +$OpenBSD: patch-bin_autom4te_in,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- bin/autom4te.in.orig Tue Oct 28 09:48:36 2003 ++++ bin/autom4te.in Thu Jul 22 07:19:47 2004 +@@ -88,16 +88,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|-L) /; - +$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; @@ -458,11 +451,11 @@ sub handle_m4 ($@) # We don't output directly to the cache files, to avoid problems # when we are interrupted (that leaves corrupted files). diff --git a/devel/autoconf/2.58/patches/patch-configure b/devel/autoconf/2.58/patches/patch-configure index ce1d75a89a3..827256c843e 100644 --- a/devel/autoconf/2.58/patches/patch-configure +++ b/devel/autoconf/2.58/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- configure.orig 2003-11-06 10:33:28.000000000 +0100 -+++ configure 2004-02-09 22:18:13.000000000 +0100 -@@ -1776,26 +1776,6 @@ fi +$OpenBSD: patch-configure,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- configure.orig Tue Nov 4 09:47:21 2003 ++++ configure Thu Jul 22 07:19:47 2004 +@@ -1742,26 +1742,6 @@ fi done test -n "$M4" || M4="m4" diff --git a/devel/autoconf/2.58/patches/patch-doc_Makefile_in b/devel/autoconf/2.58/patches/patch-doc_Makefile_in index 702029b25f6..5bc23d0b6e9 100644 --- a/devel/autoconf/2.58/patches/patch-doc_Makefile_in +++ b/devel/autoconf/2.58/patches/patch-doc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- doc/Makefile.in.orig 2003-11-06 10:33:27.000000000 +0100 -+++ doc/Makefile.in 2004-02-09 22:21:25.000000000 +0100 -@@ -255,6 +255,10 @@ dist-info: $(INFO_DEPS) +$OpenBSD: patch-doc_Makefile_in,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- doc/Makefile.in.orig Tue Nov 4 09:47:19 2003 ++++ doc/Makefile.in Thu Jul 22 07:19:47 2004 +@@ -252,6 +252,10 @@ dist-info: $(INFO_DEPS) if test -f $$base; then d=.; else d=$(srcdir); fi; \ for file in $$d/$$base*; do \ relfile=`expr "$$file" : "$$d/\(.*\)"`; \ @@ -12,7 +12,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ test -f $(distdir)/$$relfile || \ cp -p $$file $(distdir)/$$relfile; \ done; \ -@@ -383,6 +387,10 @@ install-info-am: $(INFO_DEPS) +@@ -380,6 +384,10 @@ install-info-am: $(INFO_DEPS) $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ if test -f $$ifile; then \ relfile=`echo "$$ifile" | sed 's|^.*/||'`; \ @@ -23,7 +23,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \ $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \ else : ; fi; \ -@@ -394,6 +402,10 @@ install-info-am: $(INFO_DEPS) +@@ -391,6 +399,10 @@ install-info-am: $(INFO_DEPS) list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ diff --git a/devel/autoconf/2.58/patches/patch-doc_autoconf_texi b/devel/autoconf/2.58/patches/patch-doc_autoconf_texi index e446deda124..449978ec166 100644 --- a/devel/autoconf/2.58/patches/patch-doc_autoconf_texi +++ b/devel/autoconf/2.58/patches/patch-doc_autoconf_texi @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- doc/autoconf.texi.orig 2003-11-05 11:38:29.000000000 +0100 -+++ doc/autoconf.texi 2004-02-09 22:22:30.000000000 +0100 +$OpenBSD: patch-doc_autoconf_texi,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- doc/autoconf.texi.orig Tue Nov 4 09:33:44 2003 ++++ doc/autoconf.texi Thu Jul 22 07:39:04 2004 @@ -4,6 +4,7 @@ @setfilename autoconf.info @include version.texi @@ -14,37 +14,37 @@ $OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ @dircategory Software development @direntry -* Autoconf: (autoconf). Create source code configuration scripts. -+* Autoconf-2.59: (autoconf-2.59). Create source code configuration scripts. ++* Autoconf-2.58: (autoconf-2.58). Create source code configuration scripts. @end direntry @dircategory Individual utilities @direntry -* autoscan: (autoconf)autoscan Invocation. -+* autoscan: (autoconf-2.59)autoscan Invocation. ++* autoscan-2.58: (autoconf-2.58)autoscan Invocation. Semi-automatic @file{configure.ac} writing -* ifnames: (autoconf)ifnames Invocation. Listing conditionals in source. -* autoconf: (autoconf)autoconf Invocation. -+* ifnames: (autoconf-2.59)ifnames Invocation. Listing conditionals in source. -+* autoconf: (autoconf-2.59)autoconf Invocation. ++* ifnames-2.58: (autoconf-2.58)ifnames Invocation. Listing conditionals in source. ++* autoconf-2.58: (autoconf-2.58)autoconf Invocation. How to create configuration scripts -* autoreconf: (autoconf)autoreconf Invocation. -+* autoreconf: (autoconf-2.59)autoreconf Invocation. ++* autoreconf-2.58: (autoconf-2.58)autoreconf Invocation. Remaking multiple @command{configure} scripts -* autoheader: (autoconf)autoheader Invocation. -+* autoheader: (autoconf-2.59)autoheader Invocation. ++* autoheader-2.58: (autoconf-2.58)autoheader Invocation. How to create configuration templates -* autom4te: (autoconf)autom4te Invocation. -+* autom4te: (autoconf-2.59)autom4te Invocation. ++* autom4te-2.58: (autoconf-2.58)autom4te Invocation. The Autoconf executables backbone -* configure: (autoconf)configure Invocation. Configuring a package. -* autoupdate: (autoconf)autoupdate Invocation. -+* configure: (autoconf-2.59)configure Invocation. Configuring a package. -+* autoupdate: (autoconf-2.59)autoupdate Invocation. ++* configure-2.58: (autoconf-2.58)configure Invocation. Configuring a package. ++* autoupdate-2.58: (autoconf-2.58)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: (autoconf-2.59)config.status Invocation. Recreating configurations. -+* testsuite: (autoconf-2.59)testsuite Invocation. Running an Autotest test suite. ++* config.status-2.58: (autoconf-2.58)config.status Invocation. Recreating configurations. ++* testsuite-2.58: (autoconf-2.58)testsuite Invocation. Running an Autotest test suite. @end direntry @titlepage diff --git a/devel/autoconf/2.58/patches/patch-lib_autoconf_Makefile_in b/devel/autoconf/2.58/patches/patch-lib_autoconf_Makefile_in index 33c35c0f69a..509e4fe1800 100644 --- a/devel/autoconf/2.58/patches/patch-lib_autoconf_Makefile_in +++ b/devel/autoconf/2.58/patches/patch-lib_autoconf_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_autoconf_Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- lib/autoconf/Makefile.in.orig 2003-11-06 10:33:27.000000000 +0100 -+++ lib/autoconf/Makefile.in 2004-02-09 22:11:41.000000000 +0100 -@@ -122,7 +122,7 @@ dist_autoconflib_DATA = \ +$OpenBSD: patch-lib_autoconf_Makefile_in,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- lib/autoconf/Makefile.in.orig Tue Nov 4 09:47:20 2003 ++++ lib/autoconf/Makefile.in Thu Jul 22 07:19:47 2004 +@@ -119,7 +119,7 @@ dist_autoconflib_DATA = \ lang.m4 c.m4 fortran.m4 \ functions.m4 headers.m4 types.m4 libs.m4 programs.m4 diff --git a/devel/autoconf/2.58/patches/patch-lib_autotest_Makefile_in b/devel/autoconf/2.58/patches/patch-lib_autotest_Makefile_in index c90824db9fd..5d4ffc8db17 100644 --- a/devel/autoconf/2.58/patches/patch-lib_autotest_Makefile_in +++ b/devel/autoconf/2.58/patches/patch-lib_autotest_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_autotest_Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- lib/autotest/Makefile.in.orig 2003-11-06 10:33:27.000000000 +0100 -+++ lib/autotest/Makefile.in 2004-02-09 22:11:41.000000000 +0100 -@@ -116,7 +116,7 @@ sysconfdir = @sysconfdir@ +$OpenBSD: patch-lib_autotest_Makefile_in,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- lib/autotest/Makefile.in.orig Tue Nov 4 09:47:20 2003 ++++ lib/autotest/Makefile.in Thu Jul 22 07:19:47 2004 +@@ -113,7 +113,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ autotestlibdir = $(pkgdatadir)/autotest dist_autotestlib_DATA = autotest.m4 general.m4 diff --git a/devel/autoconf/2.58/patches/patch-lib_m4sugar_Makefile_in b/devel/autoconf/2.58/patches/patch-lib_m4sugar_Makefile_in index 14054e0f8fd..cd5b4564082 100644 --- a/devel/autoconf/2.58/patches/patch-lib_m4sugar_Makefile_in +++ b/devel/autoconf/2.58/patches/patch-lib_m4sugar_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_m4sugar_Makefile_in,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ ---- lib/m4sugar/Makefile.in.orig 2003-11-06 10:33:28.000000000 +0100 -+++ lib/m4sugar/Makefile.in 2004-02-09 22:11:41.000000000 +0100 -@@ -116,7 +116,7 @@ sysconfdir = @sysconfdir@ +$OpenBSD: patch-lib_m4sugar_Makefile_in,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- lib/m4sugar/Makefile.in.orig Tue Nov 4 09:47:20 2003 ++++ lib/m4sugar/Makefile.in Thu Jul 22 07:19:47 2004 +@@ -113,7 +113,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ m4sugarlibdir = $(pkgdatadir)/m4sugar dist_m4sugarlib_DATA = m4sugar.m4 m4sh.m4 diff --git a/devel/autoconf/2.58/patches/patch-lib_m4sugar_m4sh_m4 b/devel/autoconf/2.58/patches/patch-lib_m4sugar_m4sh_m4 index 2faf9dea072..a80d1bffc0a 100644 --- a/devel/autoconf/2.58/patches/patch-lib_m4sugar_m4sh_m4 +++ b/devel/autoconf/2.58/patches/patch-lib_m4sugar_m4sh_m4 @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_m4sugar_m4sh_m4,v 1.1.1.1 2004/02/10 00:27:01 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_ +$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 # diff --git a/devel/autoconf/2.58/pkg/PLIST b/devel/autoconf/2.58/pkg/PLIST index be8511ee2ef..04cec202177 100644 --- a/devel/autoconf/2.58/pkg/PLIST +++ b/devel/autoconf/2.58/pkg/PLIST @@ -1,7 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $ +@comment $OpenBSD: PLIST,v 1.2 2004/07/22 05:50:07 espie Exp $ @option no-default-conflict -@unexec install-info --delete --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @unexec install-info --delete --info-dir=%D/info %D/info/standards${SUFFIX}.info bin/autoconf${SUFFIX} bin/autoheader${SUFFIX} bin/autom4te${SUFFIX} @@ -9,8 +7,8 @@ bin/autoreconf${SUFFIX} bin/autoscan${SUFFIX} bin/autoupdate${SUFFIX} bin/ifnames${SUFFIX} -info/autoconf${SUFFIX}.info -@comment info/standards${SUFFIX}.info +@info info/autoconf${SUFFIX}.info +@comment @info info/standards${SUFFIX}.info man/man1/autoconf${SUFFIX}.1 man/man1/autoheader${SUFFIX}.1 man/man1/autom4te${SUFFIX}.1 @@ -20,6 +18,8 @@ man/man1/autoupdate${SUFFIX}.1 man/man1/config.guess${SUFFIX}.1 man/man1/config.sub${SUFFIX}.1 man/man1/ifnames${SUFFIX}.1 +@dir share/autoconf${SUFFIX} +@dir share/autoconf${SUFFIX}/Autom4te share/autoconf${SUFFIX}/Autom4te/C4che.pm share/autoconf${SUFFIX}/Autom4te/ChannelDefs.pm share/autoconf${SUFFIX}/Autom4te/Channels.pm @@ -30,6 +30,7 @@ share/autoconf${SUFFIX}/Autom4te/Request.pm share/autoconf${SUFFIX}/Autom4te/Struct.pm share/autoconf${SUFFIX}/Autom4te/XFile.pm share/autoconf${SUFFIX}/INSTALL +@dir share/autoconf${SUFFIX}/autoconf share/autoconf${SUFFIX}/autoconf/autoconf.m4 share/autoconf${SUFFIX}/autoconf/autoheader.m4 share/autoconf${SUFFIX}/autoconf/autoscan.m4 @@ -48,17 +49,12 @@ share/autoconf${SUFFIX}/autoconf/specific.m4 share/autoconf${SUFFIX}/autoconf/status.m4 share/autoconf${SUFFIX}/autoconf/types.m4 share/autoconf${SUFFIX}/autom4te.cfg +@dir share/autoconf${SUFFIX}/autoscan share/autoconf${SUFFIX}/autoscan/autoscan.list +@dir share/autoconf${SUFFIX}/autotest share/autoconf${SUFFIX}/autotest/autotest.m4 share/autoconf${SUFFIX}/autotest/general.m4 +@dir share/autoconf${SUFFIX}/m4sugar share/autoconf${SUFFIX}/m4sugar/m4sh.m4 share/autoconf${SUFFIX}/m4sugar/m4sugar.m4 share/autoconf${SUFFIX}/m4sugar/version.m4 -@dirrm share/autoconf${SUFFIX}/m4sugar -@dirrm share/autoconf${SUFFIX}/autotest -@dirrm share/autoconf${SUFFIX}/autoscan -@dirrm share/autoconf${SUFFIX}/autoconf -@dirrm share/autoconf${SUFFIX}/Autom4te -@dirrm share/autoconf${SUFFIX} -@exec install-info --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @exec install-info --info-dir=%D/info %D/info/standards${SUFFIX}.info diff --git a/devel/autoconf/2.59/patches/patch-bin_autom4te_in b/devel/autoconf/2.59/patches/patch-bin_autom4te_in index 294dfc6bdae..6512a16678c 100644 --- a/devel/autoconf/2.59/patches/patch-bin_autom4te_in +++ b/devel/autoconf/2.59/patches/patch-bin_autom4te_in @@ -1,23 +1,24 @@ -$OpenBSD: patch-bin_autom4te_in,v 1.1.1.1 2004/02/10 00:00:14 espie Exp $ ---- bin/autom4te.in.orig 2003-10-28 09:48:36.000000000 +0100 -+++ bin/autom4te.in 2004-02-09 22:15:48.000000000 +0100 -@@ -88,15 +88,8 @@ my $freeze = 0; +$OpenBSD: patch-bin_autom4te_in,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- bin/autom4te.in.orig Tue Oct 28 09:48:36 2003 ++++ bin/autom4te.in Thu Jul 22 07:20:23 2004 +@@ -88,16 +88,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|-L) /; - +$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; @@ -458,11 +451,11 @@ sub handle_m4 ($@) # We don't output directly to the cache files, to avoid problems # when we are interrupted (that leaves corrupted files). diff --git a/devel/autoconf/2.59/patches/patch-doc_autoconf_texi b/devel/autoconf/2.59/patches/patch-doc_autoconf_texi index 815c4038d44..9adffa62af9 100644 --- a/devel/autoconf/2.59/patches/patch-doc_autoconf_texi +++ b/devel/autoconf/2.59/patches/patch-doc_autoconf_texi @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2004/02/10 00:00:14 espie Exp $ ---- doc/autoconf.texi.orig 2003-11-05 11:38:29.000000000 +0100 -+++ doc/autoconf.texi 2004-02-09 22:22:30.000000000 +0100 +$OpenBSD: patch-doc_autoconf_texi,v 1.2 2004/07/22 05:50:07 espie Exp $ +--- doc/autoconf.texi.orig Wed Nov 5 11:38:29 2003 ++++ doc/autoconf.texi Thu Jul 22 07:39:37 2004 @@ -4,6 +4,7 @@ @setfilename autoconf.info @include version.texi @@ -20,31 +20,31 @@ $OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2004/02/10 00:00:14 espie Exp $ @dircategory Individual utilities @direntry -* autoscan: (autoconf)autoscan Invocation. -+* autoscan: (autoconf-2.59)autoscan Invocation. ++* autoscan-2.59: (autoconf-2.59)autoscan Invocation. Semi-automatic @file{configure.ac} writing -* ifnames: (autoconf)ifnames Invocation. Listing conditionals in source. -* autoconf: (autoconf)autoconf Invocation. -+* ifnames: (autoconf-2.59)ifnames Invocation. Listing conditionals in source. -+* autoconf: (autoconf-2.59)autoconf Invocation. ++* ifnames-2.59: (autoconf-2.59)ifnames Invocation. Listing conditionals in source. ++* autoconf-2.59: (autoconf-2.59)autoconf Invocation. How to create configuration scripts -* autoreconf: (autoconf)autoreconf Invocation. -+* autoreconf: (autoconf-2.59)autoreconf Invocation. ++* autoreconf-2.59: (autoconf-2.59)autoreconf Invocation. Remaking multiple @command{configure} scripts -* autoheader: (autoconf)autoheader Invocation. -+* autoheader: (autoconf-2.59)autoheader Invocation. ++* autoheader-2.59: (autoconf-2.59)autoheader Invocation. How to create configuration templates -* autom4te: (autoconf)autom4te Invocation. -+* autom4te: (autoconf-2.59)autom4te Invocation. ++* autom4te-2.59: (autoconf-2.59)autom4te Invocation. The Autoconf executables backbone -* configure: (autoconf)configure Invocation. Configuring a package. -* autoupdate: (autoconf)autoupdate Invocation. -+* configure: (autoconf-2.59)configure Invocation. Configuring a package. -+* autoupdate: (autoconf-2.59)autoupdate Invocation. ++* configure-2.59: (autoconf-2.59)configure Invocation. Configuring a package. ++* autoupdate-2.59: (autoconf-2.59)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: (autoconf-2.59)config.status Invocation. Recreating configurations. -+* testsuite: (autoconf-2.59)testsuite Invocation. Running an Autotest test suite. ++* config.status-2.59: (autoconf-2.59)config.status Invocation. Recreating configurations. ++* testsuite-2.59: (autoconf-2.59)testsuite Invocation. Running an Autotest test suite. @end direntry @titlepage diff --git a/devel/autoconf/2.59/pkg/PLIST b/devel/autoconf/2.59/pkg/PLIST index 057eaab180a..04cec202177 100644 --- a/devel/autoconf/2.59/pkg/PLIST +++ b/devel/autoconf/2.59/pkg/PLIST @@ -1,7 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2004/02/10 00:00:14 espie Exp $ +@comment $OpenBSD: PLIST,v 1.2 2004/07/22 05:50:07 espie Exp $ @option no-default-conflict -@unexec install-info --delete --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @unexec install-info --delete --info-dir=%D/info %D/info/standards${SUFFIX}.info bin/autoconf${SUFFIX} bin/autoheader${SUFFIX} bin/autom4te${SUFFIX} @@ -9,8 +7,8 @@ bin/autoreconf${SUFFIX} bin/autoscan${SUFFIX} bin/autoupdate${SUFFIX} bin/ifnames${SUFFIX} -info/autoconf${SUFFIX}.info -@comment info/standards${SUFFIX}.info +@info info/autoconf${SUFFIX}.info +@comment @info info/standards${SUFFIX}.info man/man1/autoconf${SUFFIX}.1 man/man1/autoheader${SUFFIX}.1 man/man1/autom4te${SUFFIX}.1 @@ -20,6 +18,8 @@ man/man1/autoupdate${SUFFIX}.1 man/man1/config.guess${SUFFIX}.1 man/man1/config.sub${SUFFIX}.1 man/man1/ifnames${SUFFIX}.1 +@dir share/autoconf${SUFFIX} +@dir share/autoconf${SUFFIX}/Autom4te share/autoconf${SUFFIX}/Autom4te/C4che.pm share/autoconf${SUFFIX}/Autom4te/ChannelDefs.pm share/autoconf${SUFFIX}/Autom4te/Channels.pm @@ -30,6 +30,7 @@ share/autoconf${SUFFIX}/Autom4te/Request.pm share/autoconf${SUFFIX}/Autom4te/Struct.pm share/autoconf${SUFFIX}/Autom4te/XFile.pm share/autoconf${SUFFIX}/INSTALL +@dir share/autoconf${SUFFIX}/autoconf share/autoconf${SUFFIX}/autoconf/autoconf.m4 share/autoconf${SUFFIX}/autoconf/autoheader.m4 share/autoconf${SUFFIX}/autoconf/autoscan.m4 @@ -48,17 +49,12 @@ share/autoconf${SUFFIX}/autoconf/specific.m4 share/autoconf${SUFFIX}/autoconf/status.m4 share/autoconf${SUFFIX}/autoconf/types.m4 share/autoconf${SUFFIX}/autom4te.cfg +@dir share/autoconf${SUFFIX}/autoscan share/autoconf${SUFFIX}/autoscan/autoscan.list +@dir share/autoconf${SUFFIX}/autotest share/autoconf${SUFFIX}/autotest/autotest.m4 share/autoconf${SUFFIX}/autotest/general.m4 +@dir share/autoconf${SUFFIX}/m4sugar share/autoconf${SUFFIX}/m4sugar/m4sh.m4 share/autoconf${SUFFIX}/m4sugar/m4sugar.m4 share/autoconf${SUFFIX}/m4sugar/version.m4 -@dirrm share/autoconf${SUFFIX}/m4sugar -@dirrm share/autoconf${SUFFIX}/autotest -@dirrm share/autoconf${SUFFIX}/autoscan -@dirrm share/autoconf${SUFFIX}/autoconf -@dirrm share/autoconf${SUFFIX}/Autom4te -@dirrm share/autoconf${SUFFIX} -@exec install-info --info-dir=%D/info %D/info/autoconf${SUFFIX}.info -@comment @exec install-info --info-dir=%D/info %D/info/standards${SUFFIX}.info