version 2.58, identical to 2.59 except for a bug-fix.

intended usage is to be able to diff configure scripts generated by
autoconf 2.58 for trojans.
This commit is contained in:
espie 2004-02-10 00:27:01 +00:00
parent cd5bf47ef6
commit e36921e702
14 changed files with 425 additions and 0 deletions

View File

@ -0,0 +1,33 @@
# $OpenBSD: Makefile,v 1.1.1.1 2004/02/10 00:27:01 espie Exp $
COMMENT= "automatically configure source code on many Un*x platforms"
DISTNAME= autoconf-2.58
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=autoconf/}
HOMEPAGE= http://www.gnu.org/software/autoconf/
MAINTAINER= Marc Espie <espie@openbsd.org>
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
BUILD_DEPENDS= :help2man-*:devel/help2man
SUFFIX= -2.58
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --program-suffix=${SUFFIX} \
--without-lispdir
CONFIGURE_ENV+= M4="/usr/bin/m4"
CONFIGURE_ENV+= AWK="${AWK}"
MAKE_FLAGS= pkgdatadir=${PREFIX}/share/autoconf${SUFFIX}
FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST} lispdir=
#USE_GMAKE= Yes
SUBST_VARS= SUFFIX
NO_REGRESS= Yes
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
MD5 (autoconf-2.58.tar.gz) = 1ca9011a39a8692eb429a60cce4e702d
RMD160 (autoconf-2.58.tar.gz) = 2a511f9f4a661a2337f73d87920fb5c75932018e
SHA1 (autoconf-2.58.tar.gz) = bee5e92a0f0d8b0fdc04f46d1cda491f6d5bee1c

View File

@ -0,0 +1,11 @@
$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)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
+ p=`basename $$p`; \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \

View File

@ -0,0 +1,69 @@
$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 \
-e 's,@AWK\@,$(AWK),g' \
-e 's,@VERSION\@,$(VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
- -e 's,@configure_input\@,Generated from $<; do not edit by hand.,g'
+ -e 's,@configure_input\@,Generated from $$a; do not edit by hand.,g' $$a
# autoconf is written in M4sh.
@@ -468,49 +468,49 @@ $(srcdir)/autoconf.in: $(srcdir)/autocon
autoconf: $(srcdir)/autoconf.in Makefile
rm -f autoconf autoconf.tmp
- $(edit) $(srcdir)/autoconf.in >autoconf.tmp
+ a=$(srcdir)/autoconf.in; $(edit) >autoconf.tmp
chmod +x autoconf.tmp
chmod -w autoconf.tmp
mv -f autoconf.tmp autoconf
autoheader: $(srcdir)/autoheader.in Makefile
rm -f autoheader autoheader.tmp
- $(edit) $(srcdir)/autoheader.in >autoheader.tmp
+ a=$(srcdir)/autoheader.in;$(edit) >autoheader.tmp
chmod +x autoheader.tmp
chmod -w autoheader.tmp
mv -f autoheader.tmp autoheader
autom4te: $(srcdir)/autom4te.in Makefile
rm -f autom4te autom4te.tmp
- $(edit) $(srcdir)/autom4te.in >autom4te.tmp
+ a=$(srcdir)/autom4te.in;$(edit) >autom4te.tmp
chmod +x autom4te.tmp
chmod -w autom4te.tmp
mv -f autom4te.tmp autom4te
autoreconf: $(srcdir)/autoreconf.in Makefile
rm -f autoreconf autoreconf.tmp
- $(edit) $(srcdir)/autoreconf.in >autoreconf.tmp
+ a=$(srcdir)/autoreconf.in;$(edit) >autoreconf.tmp
chmod +x autoreconf.tmp
chmod -w autoreconf.tmp
mv -f autoreconf.tmp autoreconf
autoscan: $(srcdir)/autoscan.in Makefile
rm -f autoscan autoscan.tmp
- $(edit) $(srcdir)/autoscan.in >autoscan.tmp
+ a=$(srcdir)/autoscan.in;$(edit) >autoscan.tmp
chmod +x autoscan.tmp
chmod -w autoscan.tmp
mv -f autoscan.tmp autoscan
autoupdate: $(srcdir)/autoupdate.in Makefile
rm -f autoupdate autoupdate.tmp
- $(edit) $(srcdir)/autoupdate.in >autoupdate.tmp
+ a=$(srcdir)/autoupdate.in;$(edit) >autoupdate.tmp
chmod +x autoupdate.tmp
chmod -w autoupdate.tmp
mv -f autoupdate.tmp autoupdate
ifnames: $(srcdir)/ifnames.in Makefile
rm -f ifnames ifnames.tmp
- $(edit) $(srcdir)/ifnames.in >ifnames.tmp
+ a=$(srcdir)/ifnames.in;$(edit) >ifnames.tmp
chmod +x ifnames.tmp
chmod -w ifnames.tmp
mv -f ifnames.tmp ifnames

View File

@ -0,0 +1,57 @@
$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;
# $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|-L) /;
+$m4 .= " -g -D__gnu__";
# @M4_BUILTIN -- M4 builtins and a useful comment.
my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
@@ -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).
xsystem ("$m4"
- . join (' --include=', '', @include)
- . ' --debug=aflq'
- . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
- . " --error-output=$tcache" . $req->id . "t"
- . join (' --trace=', '', sort @macro)
+ . join (' -I ', '', @include)
+ . ' -daflq'
+# . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
+ . " -o$tcache" . $req->id . "t"
+ . join (' -t', '', sort @macro)
. " " . files_to_options (@ARGV)
. ' </dev/null'
. " >$ocache" . $req->id . "t");
@@ -914,8 +907,7 @@ sub freeze ($)
# When processing the file with diversion disabled, there must be no
# output but comments and empty lines.
my $result = xqx ("$m4"
- . ' --fatal-warning'
- . join (' --include=', '', @include)
+ . join (' -I ', '', @include)
. ' --define=divert'
. " " . files_to_options (@ARGV)
. ' </dev/null');
@@ -928,8 +920,7 @@ sub freeze ($)
# If freezing produces output, something went wrong: a bad `divert',
# or an improper paren etc.
xsystem ("$m4"
- . ' --fatal-warning'
- . join (' --include=', '', @include)
+ . join (' -I ', '', @include)
. " --freeze-state=$output"
. " " . files_to_options (@ARGV)
. ' </dev/null');

View File

@ -0,0 +1,30 @@
$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
done
test -n "$M4" || M4="m4"
-echo "$as_me:$LINENO: checking whether m4 supports frozen files" >&5
-echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
-if test "${ac_cv_prog_gnu_m4+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_prog_gnu_m4=no
-if test x"$M4" != x; then
- case `$M4 --help < /dev/null 2>&1` in
- *reload-state*) ac_cv_prog_gnu_m4=yes ;;
- esac
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_m4" >&5
-echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6
-if test x"$ac_cv_prog_gnu_m4" != xyes; then
- { { echo "$as_me:$LINENO: error: GNU M4 1.4 is required" >&5
-echo "$as_me: error: GNU M4 1.4 is required" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
## ----------- ##
## Man pages. ##
## ----------- ##

View File

@ -0,0 +1,36 @@
$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)
if test -f $$base; then d=.; else d=$(srcdir); fi; \
for file in $$d/$$base*; do \
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; \
done; \
@@ -383,6 +387,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|^.*/||'`; \
+ 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; \
@@ -394,6 +402,10 @@ install-info-am: $(INFO_DEPS)
list='$(INFO_DEPS)'; \
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; \

View File

@ -0,0 +1,50 @@
$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
@@ -4,6 +4,7 @@
@setfilename autoconf.info
@include version.texi
@settitle Autoconf
+@dircategory Programming & development tools
@setchapternewpage odd
@setcontentsaftertitlepage
@finalout
@@ -210,27 +211,27 @@ published by the Free Software Foundatio
@dircategory Software development
@direntry
-* Autoconf: (autoconf). Create source code configuration scripts.
+* Autoconf-2.59: (autoconf-2.59). Create source code configuration scripts.
@end direntry
@dircategory Individual utilities
@direntry
-* autoscan: (autoconf)autoscan Invocation.
+* autoscan: (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.
How to create configuration scripts
-* autoreconf: (autoconf)autoreconf Invocation.
+* autoreconf: (autoconf-2.59)autoreconf Invocation.
Remaking multiple @command{configure} scripts
-* autoheader: (autoconf)autoheader Invocation.
+* autoheader: (autoconf-2.59)autoheader Invocation.
How to create configuration templates
-* autom4te: (autoconf)autom4te Invocation.
+* autom4te: (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.
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.
@end direntry
@titlepage

View File

@ -0,0 +1,12 @@
$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 = \
lang.m4 c.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)

View File

@ -0,0 +1,12 @@
$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@
target_alias = @target_alias@
autotestlibdir = $(pkgdatadir)/autotest
dist_autotestlib_DATA = autotest.m4 general.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)

View File

@ -0,0 +1,12 @@
$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@
target_alias = @target_alias@
m4sugarlibdir = $(pkgdatadir)/m4sugar
dist_m4sugarlib_DATA = m4sugar.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)
TAGS_FILES = $(dist_m4sugarlib_DATA)
ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)

View File

@ -0,0 +1,19 @@
$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_
# | column 2 |
# column 0 column 26
#
+m4_define([AS_PadLeft],
+ [m4_if(m4_eval([$1] > [$2]),1,[[ ]AS_PadLeft([$1]-1,[$2])])])
m4_define([AS_HELP_STRING],
[m4_pushdef([AS_Prefix], m4_default([$3], [ ]))dnl
-m4_pushdef([AS_Prefix_Format],
- [ %-]m4_eval(m4_len(AS_Prefix) - 3)[s ])dnl [ %-23s ]
-m4_text_wrap([$2], AS_Prefix, m4_format(AS_Prefix_Format, [$1]))dnl
-m4_popdef([AS_Prefix_Format])dnl
+m4_text_wrap([$2], AS_Prefix, [ $1]AS_PadLeft(m4_len(AS_Prefix),m4_len([$1])+2))dnl
m4_popdef([AS_Prefix])dnl
])

View File

@ -0,0 +1,17 @@
Autoconf is an extensible package of m4 macros that produce shell
scripts to automatically configure software source code packages.
These scripts alledgedly 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${SUFX}.
The actual autoconf drivers for selecting autoconf version are in
the metaauto package.
This version only exists to be able to diff configure scripts created
by autoconf${SUFX}, autoconf-2.59 fixes a bug in it and
introduces no incompatibility.

View File

@ -0,0 +1,64 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/02/10 00:27:01 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}
bin/autoreconf${SUFFIX}
bin/autoscan${SUFFIX}
bin/autoupdate${SUFFIX}
bin/ifnames${SUFFIX}
info/autoconf${SUFFIX}.info
@comment info/standards${SUFFIX}.info
man/man1/autoconf${SUFFIX}.1
man/man1/autoheader${SUFFIX}.1
man/man1/autom4te${SUFFIX}.1
man/man1/autoreconf${SUFFIX}.1
man/man1/autoscan${SUFFIX}.1
man/man1/autoupdate${SUFFIX}.1
man/man1/config.guess${SUFFIX}.1
man/man1/config.sub${SUFFIX}.1
man/man1/ifnames${SUFFIX}.1
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/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/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/autoscan.list
share/autoconf${SUFFIX}/autotest/autotest.m4
share/autoconf${SUFFIX}/autotest/general.m4
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