diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2022-05-02 08:55:28 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2022-05-27 09:51:04 +0000 |
| commit | ec2102597a4ed2e4c9075d3c4b6399e13c0956c2 (patch) | |
| tree | 24332e71e8488ddf2882f617f7a5b15b130073f1 | |
| parent | 6fd90bd6606b1a8f648cf807b2f959e037505c66 (diff) | |
| download | ports-ec2102597a4ed2e4c9075d3c4b6399e13c0956c2.tar.gz ports-ec2102597a4ed2e4c9075d3c4b6399e13c0956c2.zip | |
devel/autoconf*: restructure to prepare for 2.71
- Rename autoconf 2.13 port directory, package, and command all to
autoconf2.13 just like ports like perl and python.
- Let USES=autoreconf run gtkdocize if necessary.
- Rewrite autoconf-wrapper and rename it autoconf-switch to reflect
better what it does.
- Delete patch-bison. It has been reverted upstream.
- Add a patch to let autoreconf set the AUTOCONF environment variable
so subprocesses like automake use the correct version.
- Make building of info files optional.
- Address portlint, portclippy, portfmt issues in devel/autoconf*.
PR: 259556, 263970
43 files changed, 405 insertions, 519 deletions
@@ -17178,3 +17178,5 @@ java/openjdk16||2022-05-24|Has expired: EOLed since 30 September 2021 sysutils/uefi-edk2-bhyve|sysutils/edk2@bhyve|2022-05-24|No more need for this port: please use sysutils/edk2 FLAVOR bhyve instead archivers/p7zip|archivers/7-zip|2022-05-25|Unmaintained for years and has known vulnerabilities. Use 7-Zip instead graphics/blender-lts28|graphics/blender-lts29|2022-05-26|Has expired: EOLed +devel/autoconf-wrapper|devel/autoconf-switch|2022-05-27|Autoconf restructuring +devel/autoconf213|devel/autoconf2.13|2022-05-27|Autoconf restructuring diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk index 8353e5a01818..7da3b85d5825 100644 --- a/Mk/Uses/autoreconf.mk +++ b/Mk/Uses/autoreconf.mk @@ -37,6 +37,22 @@ # gettext-tools is not optional. If the run dependency on # gettext is optional this can be specified with # NLS_USES=gettext-runtime. +# gtkdocize Provided by textproc/gtk-doc. Updates gtk-doc related *.m4 +# files included with the source code and build scripts such as +# gtk-doc.make. Run by autoreconf if configure.ac contains +# GTK_DOC_CHECK. The build dependency can be made optional with +# DOCS option and DOCS_BUILD_DEPENDS+=gtkdocize:textproc/gtk-doc +# on condition that you remove GTK_DOC_CHECK from configure.ac, +# for instance using a post-patch-DOCS-off target with the +# following command: +# @${REINPLACE_CMD} /^GTK_DOC_CHECK/d ${WRKSRC}/configure.ac +# It is likely that more patching is needed to eliminate or avoid +# use of gtk-doc. +# intltoolize Provided by textproc/intltool. Updates intltool related *.m4 +# files included with the source code and build scripts such as +# po/Makefile.in.in. Run by autoreconf if configure.ac contains +# (AC|IT)_PROG_INTLTOOL. A build dependency on textproc/intltool +# can be added with USES+=gnome and USE_GNOME+=intltool. # libtoolize Provided by devel/libtool. Updates libtool related *.m4 files # included with the source code and build scripts such as # ltmain.sh. Run by autoreconf if configure.ac (or one of the @@ -76,14 +92,20 @@ do-autoreconf: # Don't modify time stamps if the files already exist @test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f} . endfor -. if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool} @(cd ${AUTORECONF_WRKSRC} && \ if test -f configure.ac; then configure=configure.ac; \ else configure=configure.in; fi && \ + if ${GREP} -q '^GTK_DOC_CHECK' $${configure}; \ + then if ! ${LOCALBASE}/bin/gtkdocize --copy; then \ + ${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running gtkdocize'; \ + ${FALSE}; fi; fi && \ if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \ - then ${LOCALBASE}/bin/intltoolize -f -c; fi) -. endif - @(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i) + then if ! ${LOCALBASE}/bin/intltoolize -f -c; then \ + ${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running intltoolize'; \ + ${FALSE}; fi; fi) + @(cd ${AUTORECONF_WRKSRC} && if ! ${AUTORECONF} -f -i; then \ + ${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running ${AUTORECONF}'; \ + ${FALSE}; fi) . elif ! ${autoreconf_ARGS:Mbuild} IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]' . endif diff --git a/databases/jlog/Makefile b/databases/jlog/Makefile index de64d7dffd8c..cf12d1e75469 100644 --- a/databases/jlog/Makefile +++ b/databases/jlog/Makefile @@ -10,7 +10,7 @@ COMMENT= Journaled log library LICENSE= BSD3CLAUSE -BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 +BUILD_DEPENDS= autoconf2.13:devel/autoconf2.13 USE_GITHUB= yes GH_ACCOUNT= omniti-labs @@ -31,6 +31,6 @@ PERL_CONFIGURE_ON= --with-perl-lib=site PERL_CONFIGURE_WITH= perl pre-configure: - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) + (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13) .include <bsd.port.mk> diff --git a/devel/Makefile b/devel/Makefile index 9a1939fd9961..172f2809e00f 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -218,8 +218,8 @@ SUBDIR += autobook SUBDIR += autoconf SUBDIR += autoconf-archive - SUBDIR += autoconf-wrapper - SUBDIR += autoconf213 + SUBDIR += autoconf-switch + SUBDIR += autoconf2.13 SUBDIR += autodia SUBDIR += autogen SUBDIR += automake diff --git a/devel/autoconf-switch/Makefile b/devel/autoconf-switch/Makefile new file mode 100644 index 000000000000..d3ff22068e74 --- /dev/null +++ b/devel/autoconf-switch/Makefile @@ -0,0 +1,22 @@ +PORTNAME= autoconf +PORTVERSION= 20220527 +CATEGORIES= devel +MASTER_SITES= # none +PKGNAMESUFFIX= -switch +DISTFILES= # none + +MAINTAINER= tijl@FreeBSD.org +COMMENT= Wrapper script to switch between autoconf versions + +LICENSE= BSD2CLAUSE + +NO_ARCH= yes +NO_BUILD= yes + +do-install: + ${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ +.for l in autoheader autom4te autoreconf autoscan autoupdate ifnames + ${LN} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${l} +.endfor + +.include <bsd.port.mk> diff --git a/devel/autoconf-switch/files/autoconf b/devel/autoconf-switch/files/autoconf new file mode 100644 index 000000000000..1bb3a9dce192 --- /dev/null +++ b/devel/autoconf-switch/files/autoconf @@ -0,0 +1,4 @@ +#! /bin/sh +${DEFAULT_AUTOCONF:+exec "$0${DEFAULT_AUTOCONF}" "$@"} +c=$(ls -d "$0"[0-9]* 2>/dev/null | sort -Vr | head -n1) +exec "${c:?$0: not installed}" "$@" diff --git a/devel/autoconf-switch/pkg-descr b/devel/autoconf-switch/pkg-descr new file mode 100644 index 000000000000..b96385717974 --- /dev/null +++ b/devel/autoconf-switch/pkg-descr @@ -0,0 +1,4 @@ +This port installs a wrapper script for each tool included with autoconf. +The script will run the version of autoconf specified in the environment +variable DEFAULT_AUTOCONF. If DEFAULT_AUTOCONF is empty or unset it will run +the most recent version of autoconf currently installed. diff --git a/devel/autoconf-switch/pkg-plist b/devel/autoconf-switch/pkg-plist new file mode 100644 index 000000000000..3dca19e7c737 --- /dev/null +++ b/devel/autoconf-switch/pkg-plist @@ -0,0 +1,7 @@ +bin/autoconf +bin/autoheader +bin/autom4te +bin/autoreconf +bin/autoscan +bin/autoupdate +bin/ifnames diff --git a/devel/autoconf-wrapper/Makefile b/devel/autoconf-wrapper/Makefile deleted file mode 100644 index 9810aaefaf0d..000000000000 --- a/devel/autoconf-wrapper/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -PORTNAME?= autoconf-wrapper -PORTVERSION= 20131203 -CATEGORIES= devel -MASTER_SITES= # none -DISTFILES= # none - -MAINTAINER= tijl@FreeBSD.org -COMMENT?= Wrapper script for GNU autoconf - -LICENSE= BSD2CLAUSE - -CONFLICTS_INSTALL= autoscan - -WRKSRC= ${WRKDIR} -NO_ARCH= yes -NO_BUILD= YES - -TOOL?= AUTOCONF -WRAPPED_TOOLS?= autoconf autoheader autom4te autoreconf autoscan \ - autoupdate ifnames - -.include <bsd.port.pre.mk> - -TOOLS_CASE!= ${ECHO_CMD} ${WRAPPED_TOOLS} | ${TR} ' ' '|' -PLIST_FILES= bin/${PORTNAME} -.for tool in ${WRAPPED_TOOLS} -PLIST_FILES+= bin/${tool} -.endfor - -do-configure: - @${SED} \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%TOOL%%,${TOOL},g' \ - -e 's,%%TOOLS_CASE%%,${TOOLS_CASE},g' \ - <${FILESDIR}/autotools-wrapper.sh >${WRKDIR}/${PORTNAME}.sh - -do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.for tool in ${WRAPPED_TOOLS} - ${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${tool} -.endfor - -.include <bsd.port.post.mk> diff --git a/devel/autoconf-wrapper/files/autotools-wrapper.sh b/devel/autoconf-wrapper/files/autotools-wrapper.sh deleted file mode 100644 index c9eb6dd4c576..000000000000 --- a/devel/autoconf-wrapper/files/autotools-wrapper.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -#- -# Copyright (c) 2007 Dag-Erling Smørgrav -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer -# in this position and unchanged. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -bindir=%%PREFIX%%/bin -tool=$(basename $0) - -exec 4<&0 - -error() { - echo "$@" 1>&2 - exit 1 -} - -# Verify that the requested tool is one we know about -case ${tool} in -%%TOOLS_CASE%%) - ;; -*) - error "${tool}: unknown tool" - ;; -esac - -if [ -n "${AUTOTOOLS_DEBUG}" -a -n "${%%TOOL%%_VERSION}" ] ; then - echo "Requested ${tool} version ${%%TOOL%%_VERSION}" 1>&2 -fi - -# -# Identify available versions. -# -# The double sort is necessary to correctly identify 1.10 as newer -# than 1.9. -# -# Note that it is conceivable that version A.BC of the requested tool -# is present both as "toolABC" and as "tool-A.BC". We take no special -# measures to handle this case. -# -/usr/bin/find ${bindir}/ -name "${tool}*[0-9]" | /usr/bin/sed -E \ - -e "s@^.*/${tool}-([0-9])\\.([0-9]+)\$@\1 \2 \1.\2@" | \ - /usr/bin/sort -n -k1 | /usr/bin/sort -n -s -k2 | { -while read maj min suffix ; do - selected_version=$suffix - if [ -n "${%%TOOL%%_VERSION}" -a \ - "x${%%TOOL%%_VERSION}" = x${selected_version} ] ; then - break - fi -done - -if [ -z "${selected_version}" ] ; then - error "${tool}: not installed" -fi - -if [ -n "${%%TOOL%%_VERSION}" -a \ - "x${%%TOOL%%_VERSION}" != x${selected_version} ] ; then - error "${tool}: required version" \ - "${%%TOOL%%_VERSION} not found" -fi - -if [ -n "${AUTOTOOLS_DEBUG}" ] ; then - echo "Selecting ${tool} version ${selected_version}" \ - "(${bindir}/${tool}-${selected_version})" 1>&2 -fi - -exec 0<&4 4<&- -exec ${bindir}/${tool}-${selected_version} "$@" -} diff --git a/devel/autoconf-wrapper/pkg-descr b/devel/autoconf-wrapper/pkg-descr deleted file mode 100644 index ee8c066ca729..000000000000 --- a/devel/autoconf-wrapper/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This port installs a wrapper script for autoconf, with symlinks to the -unversioned name of each tool included with autoconf. This allows the -correct version to be selected depending on the user's requirements. diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index ecd2df746ebc..d4c1cd8094e7 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -2,56 +2,83 @@ PORTNAME= autoconf PORTVERSION= 2.69 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= GNU MAINTAINER= tijl@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms +COMMENT= Generate configure scripts and related files -LICENSE= GPLv2+ GPLv3+ GFDL AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION +LICENSE= EXCEPTION GFDL GPLv2+ GPLv3+ LICENSE_COMB= multi -LICENSE_NAME_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= AUTOCONF CONFIGURE SCRIPT EXCEPTION +LICENSE_NAME_EXCEPTION= AUTOCONF CONFIGURE SCRIPT EXCEPTION +LICENSE_FILE_EXCEPTION= ${WRKSRC}/COPYING.EXCEPTION +LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYINGv3 -LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi -LICENSE_FILE_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= ${WRKSRC}/COPYING.EXCEPTION -LICENSE_PERMS_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_EXCEPTION=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= gm4:devel/m4 \ - help2man:misc/help2man -RUN_DEPENDS= gm4:devel/m4 \ - autoconf-wrapper:devel/autoconf-wrapper +BUILD_DEPENDS= gm4:devel/m4 +RUN_DEPENDS= autoconf-switch>=0:devel/autoconf-switch \ + gm4:devel/m4 -BUILD_VERSION= 2.69 -PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -USES= gmake makeinfo perl5 tar:xz -INFO= autoconf +VERSION= 2.69 +USES= perl5 tar:xz GNU_CONFIGURE= yes -CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 AWK=${AWK} \ - ac_cv_prog_TEST_EMACS=no -CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} --without-lispdir - -GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing -GENERIC_LINKS= autoconf autoheader autom4te autoreconf autoscan autoupdate \ - ifnames +CONFIGURE_ARGS= --program-suffix=${VERSION} \ + --without-lispdir +CONFIGURE_ENV= AWK=${AWK} \ + EMACS=no \ + M4=${LOCALBASE}/bin/gm4 +DATADIR= ${PREFIX}/share/autoconf${VERSION} NO_ARCH= yes +PLIST_SUB= VERSION=${VERSION} + +OPTIONS_DEFINE= INFO +OPTIONS_DEFAULT=INFO + +INFO_USES= makeinfo +INFO_INFO= autoconf${VERSION} + post-patch: - @(cd ${WRKSRC}/man && \ - for file in *.[1x]; do \ - ${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2-${BUILD_VERSION},g ; \ - s,(config\.guess|config\.sub|ifnames),\1-${BUILD_VERSION},g' $$file ; \ - done) - @(cd ${WRKSRC}/doc && ${RM} *.info) - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|@PACKAGE@$$|@PACKAGE@-@VERSION@|' - -post-install: -.for FILE in ${GENERIC_TOOLS} - ${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION} -.endfor + @${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \ + '/^pkgdatadir =/s/@PACKAGE@/&@VERSION@/' {} + + @${REINPLACE_CMD} -E \ + -e 's/[^-/]auto(conf|header|reconf|scan|update)/&${VERSION}/g' \ + -e 's/config\.guess|config\.sub|ifnames/&${VERSION}/g' \ + ${WRKSRC}/man/*.1 +# Save timestamps. + @${LN} ${WRKSRC}/build-aux/config.guess \ + ${WRKSRC}/build-aux/config.guess.orig + @${LN} ${WRKSRC}/build-aux/config.sub \ + ${WRKSRC}/build-aux/config.sub.orig + +post-patch-INFO-on: + @${REINPLACE_CMD} -E 's/autoconf\.(info|texi)/autoconf${VERSION}.\1/g' \ + ${WRKSRC}/doc/Makefile.in + @${CP} ${WRKSRC}/doc/autoconf.texi ${WRKSRC}/doc/autoconf${VERSION}.texi + @${REINPLACE_CMD} \ + -e 's/autoconf\.info/autoconf${VERSION}.info/' \ + -e '/^@direntry/,/^@end/ { \ + s/^\*[^-:]*/&${VERSION}/ ; \ + s/(autoconf)/(autoconf${VERSION})/ ; \ + s/ \{2,9\}/ / ; }' \ + ${WRKSRC}/doc/autoconf${VERSION}.texi +# Restore timestamp in .info file. + @${TOUCH} -r ${WRKSRC}/doc/autoconf.texi.orig \ + ${WRKSRC}/doc/autoconf${VERSION}.texi + +post-patch-INFO-off: + @${REINPLACE_CMD} '/^INFO_DEPS =/d' ${WRKSRC}/doc/Makefile.in + +post-configure: +# Restore timestamps to prevent regeneration of man pages. + @${TOUCH} -r ${WRKSRC}/build-aux/config.guess.orig \ + ${WRKSRC}/build-aux/config.guess + @${TOUCH} -r ${WRKSRC}/build-aux/config.sub.orig \ + ${WRKSRC}/build-aux/config.sub .include <bsd.port.mk> diff --git a/devel/autoconf/files/patch-bin_autoreconf.in b/devel/autoconf/files/patch-bin_autoreconf.in new file mode 100644 index 000000000000..6d94c0774c85 --- /dev/null +++ b/devel/autoconf/files/patch-bin_autoreconf.in @@ -0,0 +1,10 @@ +--- bin/autoreconf.in.orig 2012-04-24 22:00:28 UTC ++++ bin/autoreconf.in +@@ -692,6 +692,7 @@ parse_args; + + # Autoreconf all the given configure.ac. Unless `--no-recursive' is passed, + # AC_CONFIG_SUBDIRS will be traversed in &autoreconf_current_directory. ++$ENV{'AUTOCONF'} = $autoconf; + $ENV{'AUTOM4TE'} = $autom4te; + for my $directory (@ARGV) + { diff --git a/devel/autoconf/files/patch-bin-autoscan.in b/devel/autoconf/files/patch-bin_autoscan.in index a55345cc5593..a55345cc5593 100644 --- a/devel/autoconf/files/patch-bin-autoscan.in +++ b/devel/autoconf/files/patch-bin_autoscan.in diff --git a/devel/autoconf/files/patch-bison b/devel/autoconf/files/patch-bison deleted file mode 100644 index b26d60799d4b..000000000000 --- a/devel/autoconf/files/patch-bison +++ /dev/null @@ -1,53 +0,0 @@ -From 42761668c0300afa7f8bf5ba736458a818cd5d15 Mon Sep 17 00:00:00 2001 -From: Akim Demaille <akim@lrde.epita.fr> -Date: Tue, 19 Mar 2013 11:19:17 -0700 -Subject: AC_PROG_YACC: don't force Bison to warn against its own features - -When invoked with -y/--yacc, Bison warns when its extensions over -POSIX Yacc are used. Yet many packages requiring GNU Bison use -Autoconf/Automake's Yacc support, which passes -y to Bison. It -turns out that passing '-o y.tab.c' has exactly the desired -effect: generating not only y.tab.c but also y.tab.h with -d and -y.output with -v. See: -http://lists.gnu.org/archive/html/bison-patches/2013-02/msg00100.html -* lib/autoconf/programs.m4 (AC_PROG_YACC): Use bison -o y.tab.c. -* NEWS, doc/autoconf.texi: Document this change. ---- - NEWS | 4 ++++ - doc/autoconf.texi | 2 +- - lib/autoconf/programs.m4 | 4 ++-- - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/doc/autoconf.texi b/doc/autoconf.texi -index c54c5b3..f895e47 100644 ---- doc/autoconf.texi -+++ doc/autoconf.texi -@@ -4222,7 +4222,7 @@ and is cached in the @code{ac_cv_path_SED} variable. - @ovindex YACC - @caindex prog_YACC - If @code{bison} is found, set output variable @code{YACC} to @samp{bison ---y}. Otherwise, if @code{byacc} is found, set @code{YACC} to -+-o y.tab.c}. Otherwise, if @code{byacc} is found, set @code{YACC} to - @samp{byacc}. Otherwise set @code{YACC} to @samp{yacc}. - The result of this test can be influenced by setting the variable - @code{YACC} or the cache variable @code{ac_cv_prog_YACC}. -diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4 -index f7af8b5..2057e78 100644 ---- lib/autoconf/programs.m4 -+++ lib/autoconf/programs.m4 -@@ -892,10 +892,10 @@ AN_PROGRAM([yacc], [AC_PROG_YACC]) - AN_PROGRAM([byacc], [AC_PROG_YACC]) - AN_PROGRAM([bison], [AC_PROG_YACC]) - AC_DEFUN([AC_PROG_YACC], --[AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)dnl -+[AC_CHECK_PROGS(YACC, 'bison -o y.tab.c' byacc, yacc)dnl - AC_ARG_VAR(YACC, - [The `Yet Another Compiler Compiler' implementation to use. Defaults to --the first program found out of: `bison -y', `byacc', `yacc'.])dnl -+the first program found out of: `bison -o y.tab.c', `byacc', `yacc'.])dnl - AC_ARG_VAR(YFLAGS, - [The list of arguments that will be passed by default to $YACC. This script - will default YFLAGS to the empty string to avoid a default value of `-d' given --- -cgit v1.0-41-gc330 - diff --git a/devel/autoconf/files/patch-doc-Makefile.in b/devel/autoconf/files/patch-doc_Makefile.in index e0dad60b094c..8c3263afeb19 100644 --- a/devel/autoconf/files/patch-doc-Makefile.in +++ b/devel/autoconf/files/patch-doc_Makefile.in @@ -1,6 +1,6 @@ --- doc/Makefile.in.orig 2012-04-25 02:40:26 UTC +++ doc/Makefile.in -@@ -65,13 +65,13 @@ CONFIG_CLEAN_FILES = +@@ -65,7 +65,7 @@ DIST_SOURCES = CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -9,10 +9,3 @@ am__TEXINFO_TEX_DIR = $(srcdir)/../build-aux DVIS = autoconf.dvi standards.dvi PDFS = autoconf.pdf standards.pdf - PSS = autoconf.ps standards.ps - HTMLS = autoconf.html standards.html --TEXINFOS = autoconf.texi standards.texi -+TEXINFOS = autoconf.texi - TEXI2DVI = texi2dvi - TEXI2PDF = $(TEXI2DVI) --pdf --batch - MAKEINFOHTML = $(MAKEINFO) --html diff --git a/devel/autoconf/files/patch-doc_autoconf.texi b/devel/autoconf/files/patch-doc_autoconf.texi index fc6059d97712..9cca043de0d3 100644 --- a/devel/autoconf/files/patch-doc_autoconf.texi +++ b/devel/autoconf/files/patch-doc_autoconf.texi @@ -1,6 +1,16 @@ --- doc/autoconf.texi.orig 2012-04-25 02:14:19 UTC +++ doc/autoconf.texi -@@ -15,7 +15,7 @@ +@@ -5,9 +5,6 @@ + @include version.texi + @settitle Autoconf + @setchapternewpage odd +-@ifnothtml +-@setcontentsaftertitlepage +-@end ifnothtml + @finalout + + @c @ovar(ARG) +@@ -15,7 +12,7 @@ @c The ARG is an optional argument. To be used for macro arguments in @c their documentation (@defmac). @macro ovar{varname} @@ -9,7 +19,7 @@ @end macro @c @dvar(ARG, DEFAULT) -@@ -23,7 +23,7 @@ +@@ -23,7 +20,7 @@ @c The ARG is an optional argument, defaulting to DEFAULT. To be used @c for macro arguments in their documentation (@defmac). @macro dvar{varname, default} @@ -18,36 +28,3 @@ @end macro @c Handling the indexes with Texinfo yields several different problems. -@@ -217,31 +217,11 @@ entitled ``GNU Free Documentation Licens - - - --@dircategory Software development -+@dircategory Programming & development tools - @direntry - * Autoconf: (autoconf). Create source code configuration scripts. - @end direntry - --@dircategory Individual utilities --@direntry --* autoscan: (autoconf)autoscan Invocation. -- Semi-automatic @file{configure.ac} writing --* ifnames: (autoconf)ifnames Invocation. Listing conditionals in source. --* autoconf-invocation: (autoconf)autoconf Invocation. -- How to create configuration scripts --* autoreconf: (autoconf)autoreconf Invocation. -- Remaking multiple @command{configure} scripts --* autoheader: (autoconf)autoheader Invocation. -- How to create configuration templates --* autom4te: (autoconf)autom4te Invocation. -- The Autoconf executables backbone --* configure: (autoconf)configure Invocation. Configuring a package. --* autoupdate: (autoconf)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. --@end direntry -- - @titlepage - @title Autoconf - @subtitle Creating Automatic Configuration Scripts diff --git a/devel/autoconf/files/patch-texinfo b/devel/autoconf/files/patch-texinfo deleted file mode 100644 index 45cdf9f0f74c..000000000000 --- a/devel/autoconf/files/patch-texinfo +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/autoconf.texi.orig 2012-04-25 02:14:19 UTC -+++ doc/autoconf.texi -@@ -5,9 +5,6 @@ - @include version.texi - @settitle Autoconf - @setchapternewpage odd --@ifnothtml --@setcontentsaftertitlepage --@end ifnothtml - @finalout - - @c @ovar(ARG) diff --git a/devel/autoconf/pkg-descr b/devel/autoconf/pkg-descr index c404cc852ea8..c0c821a08849 100644 --- a/devel/autoconf/pkg-descr +++ b/devel/autoconf/pkg-descr @@ -1,9 +1,9 @@ -Autoconf is an extensible package of m4 macros that produce shell +Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages. These scripts 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 +operating system features that the package can use, in the form of M4 macro calls. -WWW: http://www.gnu.org/software/autoconf/ +WWW: https://www.gnu.org/software/autoconf/ diff --git a/devel/autoconf/pkg-plist b/devel/autoconf/pkg-plist index 9e806e5a15c8..a1f8fe3aeae6 100644 --- a/devel/autoconf/pkg-plist +++ b/devel/autoconf/pkg-plist @@ -1,64 +1,58 @@ -bin/autoconf-%%BUILD_VERSION%% -bin/autoheader-%%BUILD_VERSION%% -bin/autom4te-%%BUILD_VERSION%% -bin/autoreconf-%%BUILD_VERSION%% -bin/autoscan-%%BUILD_VERSION%% -bin/autoupdate-%%BUILD_VERSION%% -bin/ifnames-%%BUILD_VERSION%% -man/man1/autoconf-2.69.1.gz -man/man1/autoheader-2.69.1.gz -man/man1/autom4te-2.69.1.gz -man/man1/autoreconf-2.69.1.gz -man/man1/autoscan-2.69.1.gz -man/man1/autoupdate-2.69.1.gz -man/man1/config.guess-2.69.1.gz -man/man1/config.sub-2.69.1.gz -man/man1/ifnames-2.69.1.gz -share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/Channels.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/Configure_ac.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/FileUtils.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/General.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/Getopt.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/Request.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/XFile.pm -share/autoconf-%%BUILD_VERSION%%/INSTALL -share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4f -share/autoconf-%%BUILD_VERSION%%/autoconf/autoheader.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/autoscan.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/autotest.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/autoupdate.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/c.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/erlang.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/fortran.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/functions.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/general.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/go.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/headers.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4 -share/autoconf-%%BUILD_VERSION%%/autom4te.cfg -share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list -share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4 -share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f -share/autoconf-%%BUILD_VERSION%%/autotest/general.m4 -share/autoconf-%%BUILD_VERSION%%/autotest/specific.m4 -share/autoconf-%%BUILD_VERSION%%/config.guess -share/autoconf-%%BUILD_VERSION%%/config.sub -share/autoconf-%%BUILD_VERSION%%/elisp-comp -share/autoconf-%%BUILD_VERSION%%/install-sh -share/autoconf-%%BUILD_VERSION%%/m4sugar/foreach.m4 -share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4 -share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f -share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4 -share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f -share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4 -share/autoconf-%%BUILD_VERSION%%/mdate-sh -share/autoconf-%%BUILD_VERSION%%/missing +bin/autoconf%%VERSION%% +bin/autoheader%%VERSION%% +bin/autom4te%%VERSION%% +bin/autoreconf%%VERSION%% +bin/autoscan%%VERSION%% +bin/autoupdate%%VERSION%% +bin/ifnames%%VERSION%% +man/man1/autoconf%%VERSION%%.1.gz +man/man1/autoheader%%VERSION%%.1.gz +man/man1/autom4te%%VERSION%%.1.gz +man/man1/autoreconf%%VERSION%%.1.gz +man/man1/autoscan%%VERSION%%.1.gz +man/man1/autoupdate%%VERSION%%.1.gz +man/man1/config.guess%%VERSION%%.1.gz +man/man1/config.sub%%VERSION%%.1.gz +man/man1/ifnames%%VERSION%%.1.gz +%%DATADIR%%/Autom4te/C4che.pm +%%DATADIR%%/Autom4te/ChannelDefs.pm +%%DATADIR%%/Autom4te/Channels.pm +%%DATADIR%%/Autom4te/Configure_ac.pm +%%DATADIR%%/Autom4te/FileUtils.pm +%%DATADIR%%/Autom4te/General.pm +%%DATADIR%%/Autom4te/Getopt.pm +%%DATADIR%%/Autom4te/Request.pm +%%DATADIR%%/Autom4te/XFile.pm +%%DATADIR%%/INSTALL +%%DATADIR%%/autoconf/autoconf.m4 +%%DATADIR%%/autoconf/autoconf.m4f +%%DATADIR%%/autoconf/autoheader.m4 +%%DATADIR%%/autoconf/autoscan.m4 +%%DATADIR%%/autoconf/autotest.m4 +%%DATADIR%%/autoconf/autoupdate.m4 +%%DATADIR%%/autoconf/c.m4 +%%DATADIR%%/autoconf/erlang.m4 +%%DATADIR%%/autoconf/fortran.m4 +%%DATADIR%%/autoconf/functions.m4 +%%DATADIR%%/autoconf/general.m4 +%%DATADIR%%/autoconf/go.m4 +%%DATADIR%%/autoconf/headers.m4 +%%DATADIR%%/autoconf/lang.m4 +%%DATADIR%%/autoconf/libs.m4 +%%DATADIR%%/autoconf/oldnames.m4 +%%DATADIR%%/autoconf/programs.m4 +%%DATADIR%%/autoconf/specific.m4 +%%DATADIR%%/autoconf/status.m4 +%%DATADIR%%/autoconf/types.m4 +%%DATADIR%%/autom4te.cfg +%%DATADIR%%/autoscan/autoscan.list +%%DATADIR%%/autotest/autotest.m4 +%%DATADIR%%/autotest/autotest.m4f +%%DATADIR%%/autotest/general.m4 +%%DATADIR%%/autotest/specific.m4 +%%DATADIR%%/m4sugar/foreach.m4 +%%DATADIR%%/m4sugar/m4sh.m4 +%%DATADIR%%/m4sugar/m4sh.m4f +%%DATADIR%%/m4sugar/m4sugar.m4 +%%DATADIR%%/m4sugar/m4sugar.m4f +%%DATADIR%%/m4sugar/version.m4 diff --git a/devel/autoconf2.13/Makefile b/devel/autoconf2.13/Makefile new file mode 100644 index 000000000000..8d42bb10400c --- /dev/null +++ b/devel/autoconf2.13/Makefile @@ -0,0 +1,66 @@ +# Created by: torstenb@FreeBSD.org + +PORTNAME= autoconf +PORTVERSION= 2.13 +CATEGORIES= devel +MASTER_SITES= LOCAL/ade/gnu +PKGNAMESUFFIX= ${VERSION} +DISTNAME= autoconf-000227 # 2000-02-27 snapshot post 2.13 + +MAINTAINER= tijl@FreeBSD.org +COMMENT= Generate configure scripts and related files + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= gm4:devel/m4 +RUN_DEPENDS= autoconf-switch>=0:devel/autoconf-switch \ + gm4:devel/m4 + +VERSION= 2.13 +USES= desthack perl5 tar:bzip2 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --program-suffix=${VERSION} +CONFIGURE_ENV= AWK=${AWK} \ + M4=${LOCALBASE}/bin/gm4 + +STRIP= +DATADIR= ${PREFIX}/share/autoconf${VERSION} +NO_ARCH= yes +PORTSCOUT= ignore + +WRKSRC= ${WRKDIR}/autoconf + +PLIST_SUB= VERSION=${VERSION} + +OPTIONS_DEFINE= INFO +OPTIONS_DEFAULT=INFO + +INFO_USES= makeinfo +INFO_INFO= autoconf${VERSION} + +post-patch: + @${REINPLACE_CMD} '/^acdatadir =/s/autoconf/&${VERSION}/' \ + ${WRKSRC}/Makefile.in + @${RM} ${WRKSRC}/standards.texi + +post-patch-INFO-on: + @${REINPLACE_CMD} -E 's/autoconf\.(info|texi)/autoconf${VERSION}.\1/g' \ + ${WRKSRC}/Makefile.in + @${CP} ${WRKSRC}/autoconf.texi ${WRKSRC}/autoconf${VERSION}.texi + @${REINPLACE_CMD} \ + -e 's/autoconf\.info/autoconf${VERSION}.info/' \ + -e '/^@direntry/,/^@end/ { \ + s/^\*[^-:]*/&${VERSION}/ ; \ + s/(autoconf)/(autoconf${VERSION})/ ; \ + s/ \{2,9\}/ / ; }' \ + ${WRKSRC}/autoconf${VERSION}.texi + +post-patch-INFO-off: + @${REINPLACE_CMD} \ + -e '/^all:/s/ info//' \ + -e '/^install:/s/ install-info//' \ + ${WRKSRC}/Makefile.in + +.include <bsd.port.mk> diff --git a/devel/autoconf213/distinfo b/devel/autoconf2.13/distinfo index 2950114fdc6c..62091b1ca17e 100644 --- a/devel/autoconf213/distinfo +++ b/devel/autoconf2.13/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1653644576 SHA256 (autoconf-000227.tar.bz2) = 43cf23a479dc7513fde1bfb63471c86bf33ba1956a2cf6e321480da6c350e73c SIZE (autoconf-000227.tar.bz2) = 259210 diff --git a/devel/autoconf213/files/patch-acspecific.m4 b/devel/autoconf2.13/files/patch-acspecific.m4 index 0ab4f683e3de..0c8149027cfa 100644 --- a/devel/autoconf213/files/patch-acspecific.m4 +++ b/devel/autoconf2.13/files/patch-acspecific.m4 @@ -1,6 +1,6 @@ ---- acspecific.m4.orig Sun Aug 13 19:42:57 2000 -+++ acspecific.m4 Sun Aug 13 19:43:24 2000 -@@ -2659,7 +2659,7 @@ +--- acspecific.m4.orig 2000-02-27 16:18:10 UTC ++++ acspecific.m4 +@@ -2681,7 +2681,7 @@ else if AC_TRY_EVAL(ac_link); then for file in conftest.*; do case $file in diff --git a/devel/autoconf213/files/patch-autoconf.sh b/devel/autoconf2.13/files/patch-autoconf.sh index 20401d060f61..8b13d484becc 100644 --- a/devel/autoconf213/files/patch-autoconf.sh +++ b/devel/autoconf2.13/files/patch-autoconf.sh @@ -1,10 +1,16 @@ ---- autoconf.sh.orig Tue Jan 5 07:27:53 1999 -+++ autoconf.sh Thu May 31 15:56:39 2001 -@@ -47,3 +47,2 @@ +--- autoconf.sh.orig 2000-02-27 16:18:10 UTC ++++ autoconf.sh +@@ -45,7 +45,6 @@ esac + esac + : ${TMPDIR=/tmp} -tmpout=${TMPDIR}/acout.$$ localdir= -@@ -97,5 +96,8 @@ + show_version=no + +@@ -95,9 +94,12 @@ esac + *) echo "$usage" >&2; exit 1 ;; + esac +tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1 +tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; } @@ -14,13 +20,22 @@ -tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's. +# Always set this, to avoid bogus errors from some rm's. if test z$infile = z-; then -@@ -120,3 +122,3 @@ + infile=$tmpin + cat > $infile +@@ -118,7 +120,7 @@ case `$M4 --help < /dev/null 2>&1` in + case `$M4 --help < /dev/null 2>&1` in + *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; *traditional*) ;; -*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; +*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;; esac -@@ -156,3 +158,3 @@ + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || +@@ -154,6 +156,6 @@ $AWK ' + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ + ' >&4 -rm -f $tmpout +rm -f $tmpin $tmpout + exit $status diff --git a/devel/autoconf2.13/files/patch-autoconf.texi b/devel/autoconf2.13/files/patch-autoconf.texi new file mode 100644 index 000000000000..0012a58f5210 --- /dev/null +++ b/devel/autoconf2.13/files/patch-autoconf.texi @@ -0,0 +1,17 @@ +--- autoconf.texi.orig 2000-02-27 16:18:10 UTC ++++ autoconf.texi +@@ -15,11 +15,10 @@ + @end iftex + + @ifinfo +-@format +-START-INFO-DIR-ENTRY ++@dircategory Software development ++@direntry + * Autoconf: (autoconf). Create source code configuration scripts. +-END-INFO-DIR-ENTRY +-@end format ++@end direntry + + Autoconf: Creating Automatic Configuration Scripts, by David MacKenzie. + diff --git a/devel/autoconf213/files/patch-autohader.sh b/devel/autoconf2.13/files/patch-autoheader.sh index 87e6102e3ba9..be18a7e6066f 100644 --- a/devel/autoconf213/files/patch-autohader.sh +++ b/devel/autoconf2.13/files/patch-autoheader.sh @@ -1,6 +1,6 @@ ---- autoheader.sh.orig Mon Nov 22 21:50:45 1999 -+++ autoheader.sh Mon Nov 22 21:52:02 1999 -@@ -194,7 +194,7 @@ +--- autoheader.sh.orig 2000-02-27 16:18:10 UTC ++++ autoheader.sh +@@ -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. diff --git a/devel/autoconf213/files/patch-autoupdate.sh b/devel/autoconf2.13/files/patch-autoupdate.sh index d40bc0ee9e7a..d48b34966968 100644 --- a/devel/autoconf213/files/patch-autoupdate.sh +++ b/devel/autoconf2.13/files/patch-autoupdate.sh @@ -1,6 +1,6 @@ ---- autoupdate.sh.orig Mon Nov 22 21:52:26 1999 -+++ autoupdate.sh Mon Nov 22 21:54:30 1999 -@@ -26,7 +26,7 @@ +--- autoupdate.sh.orig 2000-02-27 16:18:10 UTC ++++ autoupdate.sh +@@ -26,7 +26,7 @@ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=d Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] [--version] [template-file]" @@ -9,7 +9,7 @@ # For debugging. #sedtmp=/tmp/acups show_version=no -@@ -66,7 +66,7 @@ +@@ -66,7 +66,7 @@ fi : ${SIMPLE_BACKUP_SUFFIX='~'} diff --git a/devel/autoconf213/pkg-descr b/devel/autoconf2.13/pkg-descr index 15068b072867..c0c821a08849 100644 --- a/devel/autoconf213/pkg-descr +++ b/devel/autoconf2.13/pkg-descr @@ -1,12 +1,9 @@ -This is the legacy 2.13 version of autoconf. It is explicitly for use with -older software packages that are not buildable with the current autoconf. - -Autoconf is an extensible package of m4 macros that produce shell +Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages. These scripts 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 +operating system features that the package can use, in the form of M4 macro calls. -WWW: https://www.gnu.org/software/autoconf/autoconf.html +WWW: https://www.gnu.org/software/autoconf/ diff --git a/devel/autoconf2.13/pkg-plist b/devel/autoconf2.13/pkg-plist new file mode 100644 index 000000000000..a12c0f9cfa27 --- /dev/null +++ b/devel/autoconf2.13/pkg-plist @@ -0,0 +1,19 @@ +bin/autoconf%%VERSION%% +bin/autoheader%%VERSION%% +bin/autoreconf%%VERSION%% +bin/autoscan%%VERSION%% +bin/autoupdate%%VERSION%% +bin/ifnames%%VERSION%% +%%DATADIR%%/acconfig.h +%%DATADIR%%/acfunctions +%%DATADIR%%/acgeneral.m4 +%%DATADIR%%/acheaders +%%DATADIR%%/acidentifiers +%%DATADIR%%/acmakevars +%%DATADIR%%/acoldnames.m4 +%%DATADIR%%/acprograms +%%DATADIR%%/acspecific.m4 +%%DATADIR%%/autoconf.m4 +%%DATADIR%%/autoconf.m4f +%%DATADIR%%/autoheader.m4 +%%DATADIR%%/autoheader.m4f diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile deleted file mode 100644 index 13d6ecf251c6..000000000000 --- a/devel/autoconf213/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# Created by: torstenb@FreeBSD.org - -PORTNAME= autoconf -PORTVERSION= 2.13.000227 -PORTREVISION= 7 -CATEGORIES= devel -MASTER_SITES= LOCAL/ade/gnu -DISTNAME= autoconf-000227 -PKGNAMESUFFIX= 213 - -# note: before committing to this port, contact portmgr to arrange for an -# experimental ports run. Untested commits may be backed out at portmgr's -# discretion. -MAINTAINER= tijl@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (legacy 2.13) - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING - -BUILD_DEPENDS= gm4:devel/m4 -RUN_DEPENDS= gm4:devel/m4 \ - autoconf-wrapper:devel/autoconf-wrapper - -BUILD_VERSION= 2.13 -PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -USES= perl5 desthack makeinfo tar:bzip2 -GNU_CONFIGURE= yes -CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 AWK=${AWK} -CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} -WRKSRC= ${WRKDIR}/autoconf -INFO= autoconf-${BUILD_VERSION} - -STRIP= # none - -NO_ARCH= yes - -post-patch: - @${RM} ${WRKSRC}/*.info* >/dev/null 2>&1 || true - -post-install: - ${CHMOD} +x ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION}/config.* - ${INSTALL_SCRIPT} ${WRKSRC}/install-sh \ - ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION} - -.include <bsd.port.mk> diff --git a/devel/autoconf213/files/patch-Makefile.in b/devel/autoconf213/files/patch-Makefile.in deleted file mode 100644 index cddd63509ff7..000000000000 --- a/devel/autoconf213/files/patch-Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ ---- Makefile.in.orig Sun Feb 27 08:18:10 2000 -+++ Makefile.in Thu Apr 5 02:14:57 2007 -@@ -51,3 +51,3 @@ - datadir = @datadir@ --acdatadir = $(datadir)/autoconf -+acdatadir = $(datadir)/autoconf-2.13 - -@@ -70,3 +70,3 @@ - acconfig.h acfunctions acheaders acidentifiers \ -- acmakevars acprograms autoconf.info* \ -+ acmakevars acprograms autoconf-2.13.info* \ - autoconf.sh autoconf.texi install.texi \ -@@ -108,6 +108,6 @@ - --info: autoconf.info @standards_info@ INSTALL -+info: autoconf-2.13.info - - # Use --no-split to avoid creating filenames > 14 chars. --autoconf.info: autoconf.texi install.texi -+autoconf-2.13.info: autoconf.texi install.texi - $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ -@@ -154,3 +154,3 @@ - for i in acfunctions acheaders acidentifiers acprograms \ -- acmakevars; do \ -+ acmakevars config.guess config.sub; do \ - $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ -@@ -161,3 +161,3 @@ - install-info: info installdirs -- if test -f autoconf.info; then \ -+ if test -f autoconf-2.13.info; then \ - for i in *.info*; do \ -@@ -176,3 +176,3 @@ - rm -fr $(acdatadir) -- cd $(infodir) && rm -f autoconf.info* -+ cd $(infodir) && rm -f autoconf-2.13.info* - if test -f standards.info || test -f $(srcdir)/standards.info; \ diff --git a/devel/autoconf213/files/patch-autoconf.texi b/devel/autoconf213/files/patch-autoconf.texi deleted file mode 100644 index 85f0dbb08b70..000000000000 --- a/devel/autoconf213/files/patch-autoconf.texi +++ /dev/null @@ -1,24 +0,0 @@ ---- autoconf.texi.orig Sun Feb 27 11:18:10 2000 -+++ autoconf.texi Mon Mar 18 21:30:10 2002 -@@ -1,9 +1,10 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header --@setfilename autoconf.info --@settitle Autoconf -+@setfilename autoconf-2.13.info -+@settitle Autoconf-2.13 - @c For double-sided printing, uncomment: - @c @setchapternewpage odd -+@dircategory Programming & development tools - @c %**end of header - - @set EDITION 2.13 -@@ -17,7 +18,7 @@ - @ifinfo - @format - START-INFO-DIR-ENTRY --* Autoconf: (autoconf). 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/autoconf213/pkg-plist b/devel/autoconf213/pkg-plist deleted file mode 100644 index 1c1015f6671b..000000000000 --- a/devel/autoconf213/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/autoconf-%%BUILD_VERSION%% -bin/autoheader-%%BUILD_VERSION%% -bin/autoreconf-%%BUILD_VERSION%% -bin/autoscan-%%BUILD_VERSION%% -bin/autoupdate-%%BUILD_VERSION%% -bin/ifnames-%%BUILD_VERSION%% -share/autoconf-%%BUILD_VERSION%%/acconfig.h -share/autoconf-%%BUILD_VERSION%%/acfunctions -share/autoconf-%%BUILD_VERSION%%/acgeneral.m4 -share/autoconf-%%BUILD_VERSION%%/acheaders -share/autoconf-%%BUILD_VERSION%%/acidentifiers -share/autoconf-%%BUILD_VERSION%%/acmakevars -share/autoconf-%%BUILD_VERSION%%/acoldnames.m4 -share/autoconf-%%BUILD_VERSION%%/acprograms -share/autoconf-%%BUILD_VERSION%%/acspecific.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf.m4 -share/autoconf-%%BUILD_VERSION%%/autoconf.m4f -share/autoconf-%%BUILD_VERSION%%/autoheader.m4 -share/autoconf-%%BUILD_VERSION%%/autoheader.m4f -share/autoconf-%%BUILD_VERSION%%/config.guess -share/autoconf-%%BUILD_VERSION%%/config.sub -share/autoconf-%%BUILD_VERSION%%/install-sh diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile index 7c80ee03489c..3828698dca55 100644 --- a/devel/autotools/Makefile +++ b/devel/autotools/Makefile @@ -1,14 +1,14 @@ # Created by: Ade Lovett <ade@FreeBSD.org> PORTNAME= autotools -PORTVERSION= 20220311 +PORTVERSION= 20220527 CATEGORIES= devel MAINTAINER= tijl@FreeBSD.org COMMENT= Autotools meta-port RUN_DEPENDS= libtoolize:devel/libtool \ - autoconf-2.13:devel/autoconf213 \ + autoconf2.13:devel/autoconf2.13 \ autoconf>=2.69:devel/autoconf \ automake>=1.15:devel/automake diff --git a/devel/util-linux/files/patch-configure.ac b/devel/util-linux/files/patch-configure.ac new file mode 100644 index 000000000000..cb4155f7831e --- /dev/null +++ b/devel/util-linux/files/patch-configure.ac @@ -0,0 +1,12 @@ +--- configure.ac.orig 2020-07-23 09:23:58 UTC ++++ configure.ac +@@ -204,7 +204,8 @@ PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig']) + PKG_PROG_PKG_CONFIG + PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig']) + +-GTK_DOC_CHECK([1.10]) ++AM_CONDITIONAL([ENABLE_GTK_DOC], false) ++AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], true) + AC_PATH_PROG([XSLTPROC], [xsltproc]) + + linux_os=no diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile index 898256bd1aa8..6165691be667 100644 --- a/lang/spidermonkey78/Makefile +++ b/lang/spidermonkey78/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ - autoconf-2.13:devel/autoconf213 \ + autoconf2.13:devel/autoconf2.13 \ rust-cbindgen>=0.8.7:devel/rust-cbindgen LIB_DEPENDS= libffi.so:devel/libffi \ libicudata.so:devel/icu \ diff --git a/lang/spidermonkey91/Makefile b/lang/spidermonkey91/Makefile index 568aaa7b873f..dbe746abf63d 100644 --- a/lang/spidermonkey91/Makefile +++ b/lang/spidermonkey91/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ - autoconf-2.13:devel/autoconf213 \ + autoconf2.13:devel/autoconf2.13 \ rust-cbindgen>=0.8.7:devel/rust-cbindgen LIB_DEPENDS= libffi.so:devel/libffi \ libicudata.so:devel/icu \ @@ -78,7 +78,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .endif pre-configure: - (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) + (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 72ba77aaa07a..ff9760568d91 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ - autoconf-2.13:devel/autoconf213 \ + autoconf2.13:devel/autoconf2.13 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip @@ -59,9 +59,9 @@ post-patch: ${WRKSRC}/comm/mail/app/nsMailApp.cpp pre-configure: - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) - (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) - (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) + (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13) + (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf2.13) + (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults diff --git a/sysutils/consolekit2/files/patch-configure.ac b/sysutils/consolekit2/files/patch-configure.ac index b2b800bbedc3..4a348e7597ea 100644 --- a/sysutils/consolekit2/files/patch-configure.ac +++ b/sysutils/consolekit2/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2020-12-07 11:27:30 UTC +--- configure.ac.orig 2021-06-03 10:22:08 UTC +++ configure.ac @@ -96,7 +96,11 @@ AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_40, @@ -13,7 +13,19 @@ # Check for Polkit/PolicyKit XDT_CHECK_OPTIONAL_PACKAGE([POLKIT], [polkit-gobject-1], [polkit_minimum_version], -@@ -553,7 +557,6 @@ doc/Makefile +@@ -439,11 +443,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc]) + + + # check for gtk-doc +-m4_ifdef([GTK_DOC_CHECK], [ +-GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) +-],[ + AM_CONDITIONAL([ENABLE_GTK_DOC], false) +-]) + + dnl --------------------------------------------------------------------------- + dnl check for inotify +@@ -553,7 +553,6 @@ doc/dbus/Makefile doc/console-kit-daemon.1m doc/dbus/ConsoleKit.xml doc/dbus/Makefile diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 927c278ac75c..8e9a670def17 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ - autoconf-2.13:devel/autoconf213 \ + autoconf2.13:devel/autoconf2.13 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip @@ -52,8 +52,8 @@ post-patch: ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) - (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) + (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13) + (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index a2d323dde97a..6e29694dc27f 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ libvpx>=1.11.0:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ - autoconf-2.13:devel/autoconf213 \ + autoconf2.13:devel/autoconf2.13 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip @@ -65,8 +65,8 @@ post-patch: ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) - (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) + (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13) + (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ diff --git a/x11-fm/librfm/files/patch-configure.ac b/x11-fm/librfm/files/patch-configure.ac new file mode 100644 index 000000000000..459b3f9229af --- /dev/null +++ b/x11-fm/librfm/files/patch-configure.ac @@ -0,0 +1,10 @@ +--- configure.ac.orig 2018-07-10 16:06:27 UTC ++++ configure.ac +@@ -417,7 +417,6 @@ AC_CHECK_PROG(cv_pkgconfig, pkg-config, yes, no) + fi + + AC_CHECK_PROG(cv_pkgconfig, pkg-config, yes, no) +-GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) + + + diff --git a/x11/keybinder-gtk3/Makefile b/x11/keybinder-gtk3/Makefile index 91c7f6b27421..15d268f81f8d 100644 --- a/x11/keybinder-gtk3/Makefile +++ b/x11/keybinder-gtk3/Makefile @@ -27,6 +27,8 @@ PLIST_SUB= VERSION=${VERSION} OPTIONS_DEFINE= EXAMPLES DOCS +DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc + post-patch-DOCS-off: @${REINPLACE_CMD} -E '/GTK_DOC_CHECK|docs/d' ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e '/^SUBDIRS/s, docs,,' ${WRKSRC}/Makefile.am |