autoconf 2.56, for checking gnu configure scripts.

This commit is contained in:
espie 2003-06-24 23:03:54 +00:00
parent fc50ada19f
commit 460f043af8
13 changed files with 359 additions and 0 deletions

View File

@ -0,0 +1,33 @@
# $OpenBSD: Makefile,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
COMMENT= "automatically configure source code on many Un*x platforms"
DISTNAME= autoconf-2.56
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.56
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.56.tar.gz) = 0e142e9bc890786845950e84ffb52adf
RMD160 (autoconf-2.56.tar.gz) = 4f9d7ed5dc639b67acadae89bc415c69e495a2de
SHA1 (autoconf-2.56.tar.gz) = afff4a43d0b71a05de7b72e5a493a3e94219160c

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
--- Makefile.in.orig Fri Nov 15 16:00:09 2002
+++ Makefile.in Mon Nov 25 16:05:22 2002
@@ -169,6 +169,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,67 @@
$OpenBSD: patch-bin_autom4te_in,v 1.1.1.1 2003/06/24 23:03:54 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;
# $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 </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`;
@@ -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).
xsystem ("$m4"
- . join (' --include=', '', @include)
- . " --define=m4_warnings=$m4_warnings"
- . ' --debug=aflq'
- . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
- . " --error-output=$tcache" . $req->id . "t"
- . join (' --trace=', '', sort @macro)
+ . join (' -I ', '', @include)
+ . " -Dm4_warnings=$m4_warnings"
+ . ' -daflq'
+ . " -o$tcache" . $req->id . "t"
+ . join (' -t', '', sort @macro)
. " " . files_to_options (@ARGV)
. ' </dev/null'
. " >$ocache" . $req->id . "t");
@@ -1116,8 +1107,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');
@@ -1130,8 +1120,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');
@@ -1144,7 +1133,7 @@ sub freeze ($)
mktmpdir ('am4t');
load_configuration ($ENV{'AUTOM4TE_CFG'} || "$datadir/autom4te.cfg");
load_configuration ("$ENV{'HOME'}/.autom4te.cfg")
- if -f "$ENV{'HOME'}/.autom4te.cfg";
+ if defined $ENV{'HOME'} and -f "$ENV{'HOME'}/.autom4te.cfg";
load_configuration (".autom4te.cfg")
if -f ".autom4te.cfg";
parse_args;

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-configure,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
--- configure.orig Mon Nov 25 16:06:13 2002
+++ configure Mon Nov 25 16:06:29 2002
@@ -1713,26 +1713,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.
ac_config_files="$ac_config_files man/Makefile"

View File

@ -0,0 +1,36 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
--- doc/Makefile.in.orig Fri Nov 15 16:01:00 2002
+++ doc/Makefile.in Mon Nov 25 16:05:22 2002
@@ -201,6 +201,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; \
@@ -328,6 +332,10 @@ install-info-am: $(INFO_DEPS)
for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
if test -f $$ifile; then \
relfile=`expr "$$ifile" : "$$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; \
echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
$(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
else : ; fi; \
@@ -338,6 +346,10 @@ install-info-am: $(INFO_DEPS)
install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
+ ext=`echo $$file | sed -e 's/^.*\\.//'`; \
+ file=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ file=`echo $$file | sed -e 's/^.*\///'`; \
+ file=`echo $$file | sed '$(transform)'`.$$ext; \
echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
done; \

View File

@ -0,0 +1,53 @@
$OpenBSD: patch-doc_autoconf_texi,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
--- doc/autoconf.texi.orig Tue Dec 3 08:16:32 2002
+++ doc/autoconf.texi Mon Jun 9 12:05:18 2003
@@ -4,6 +4,7 @@
@setfilename autoconf.info
@include version.texi
@settitle Autoconf
+@dircategory Programming & development tools
@setchapternewpage odd
@setcontentsaftertitlepage
@finalout
@@ -97,30 +98,30 @@ published by the Free Software Foundatio
@dircategory GNU programming tools
@direntry
-* Autoconf: (autoconf). Create source code configuration scripts
+* Autoconf-2.57: (autoconf-2.57). Create source code configuration scripts
@end direntry
@dircategory Individual utilities
@direntry
-* autoscan: (autoconf)autoscan Invocation.
+* autoscan: (autoconf-2.57)autoscan Invocation.
Semi-automatic @file{configure.ac} writing
-* ifnames: (autoconf)ifnames Invocation.
+* ifnames: (autoconf-2.57)ifnames Invocation.
Listing the conditionals in source code
-* autoconf: (autoconf)autoconf Invocation.
+* autoconf: (autoconf-2.57)autoconf Invocation.
How to create configuration scripts
-* autoreconf: (autoconf)autoreconf Invocation.
+* autoreconf: (autoconf-2.57)autoreconf Invocation.
Remaking multiple @command{configure} scripts
-* autoheader: (autoconf)autoheader Invocation.
+* autoheader: (autoconf-2.57)autoheader Invocation.
How to create configuration templates
-* autom4te: (autoconf)autom4te Invocation.
+* autom4te: (autoconf-2.57)autom4te Invocation.
The Autoconf executables backbone
-* configure: (autoconf)configure Invocation.
+* configure: (autoconf-2.57)configure Invocation.
Configuring a package
-* autoupdate: (autoconf)autoupdate Invocation.
+* autoupdate: (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.
Recreating a configuration
-* testsuite: (autoconf)testsuite Invocation.
+* testsuite: (autoconf-2.57)testsuite Invocation.
Running an Autotest test suite
@end direntry

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_autoconf_Makefile_in,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
--- lib/autoconf/Makefile.in.orig Mon Nov 25 17:00:51 2002
+++ lib/autoconf/Makefile.in Mon Nov 25 17:01:01 2002
@@ -101,7 +101,7 @@ dist_autoconflib_DATA = \
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)

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-lib_autoconf_general_m4,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
--- lib/autoconf/general.m4.orig Tue Nov 12 11:54:46 2002
+++ lib/autoconf/general.m4 Tue Jun 24 17:51:08 2003
@@ -255,12 +255,11 @@ m4_define([AC_FOREACH],
# | column 2 |
# column 0 column 26
#
+m4_define([AC_PadLeft],
+ [m4_if(m4_eval([$1] > [$2]),1,[[ ]AC_PadLeft([$1]-1,[$2])])])
m4_define([AC_HELP_STRING],
[m4_pushdef([AC_Prefix], m4_default([$3], [ ]))dnl
-m4_pushdef([AC_Prefix_Format],
- [ %-]m4_eval(m4_len(AC_Prefix) - 3)[s ])dnl [ %-23s ]
-m4_text_wrap([$2], AC_Prefix, m4_format(AC_Prefix_Format, [$1]))dnl
-m4_popdef([AC_Prefix_Format])dnl
+m4_text_wrap([$2], AC_Prefix, [ $1]AC_PadLeft(m4_len(AC_Prefix),m4_len([$1])+2))dnl
m4_popdef([AC_Prefix])dnl
])

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_autotest_Makefile_in,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
--- lib/autotest/Makefile.in.orig Mon Nov 25 17:01:27 2002
+++ lib/autotest/Makefile.in Mon Nov 25 17:01:41 2002
@@ -94,7 +94,7 @@ 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)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_m4sugar_Makefile_in,v 1.1.1.1 2003/06/24 23:03:54 espie Exp $
--- lib/m4sugar/Makefile.in.orig Mon Nov 25 16:59:24 2002
+++ lib/m4sugar/Makefile.in Mon Nov 25 16:59:40 2002
@@ -94,7 +94,7 @@ 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)

View File

@ -0,0 +1,13 @@
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.
The FSF would make you believe that only gnu-m4 can handle autoconf.
As of OpenBSD 2.7, this is no longer true. This package does not depend
on gnu-m4.
WWW: ${HOMEPAGE}

View File

@ -0,0 +1,58 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2003/06/24 23:03:54 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/General.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