Skip to content

Commit ec21025

Browse files
committed
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
1 parent 6fd90bd commit ec21025

43 files changed

Lines changed: 405 additions & 519 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

MOVED

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17178,3 +17178,5 @@ java/openjdk16||2022-05-24|Has expired: EOLed since 30 September 2021
1717817178
sysutils/uefi-edk2-bhyve|sysutils/edk2@bhyve|2022-05-24|No more need for this port: please use sysutils/edk2 FLAVOR bhyve instead
1717917179
archivers/p7zip|archivers/7-zip|2022-05-25|Unmaintained for years and has known vulnerabilities. Use 7-Zip instead
1718017180
graphics/blender-lts28|graphics/blender-lts29|2022-05-26|Has expired: EOLed
17181+
devel/autoconf-wrapper|devel/autoconf-switch|2022-05-27|Autoconf restructuring
17182+
devel/autoconf213|devel/autoconf2.13|2022-05-27|Autoconf restructuring

Mk/Uses/autoreconf.mk

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,22 @@
3737
# gettext-tools is not optional. If the run dependency on
3838
# gettext is optional this can be specified with
3939
# NLS_USES=gettext-runtime.
40+
# gtkdocize Provided by textproc/gtk-doc. Updates gtk-doc related *.m4
41+
# files included with the source code and build scripts such as
42+
# gtk-doc.make. Run by autoreconf if configure.ac contains
43+
# GTK_DOC_CHECK. The build dependency can be made optional with
44+
# DOCS option and DOCS_BUILD_DEPENDS+=gtkdocize:textproc/gtk-doc
45+
# on condition that you remove GTK_DOC_CHECK from configure.ac,
46+
# for instance using a post-patch-DOCS-off target with the
47+
# following command:
48+
# @${REINPLACE_CMD} /^GTK_DOC_CHECK/d ${WRKSRC}/configure.ac
49+
# It is likely that more patching is needed to eliminate or avoid
50+
# use of gtk-doc.
51+
# intltoolize Provided by textproc/intltool. Updates intltool related *.m4
52+
# files included with the source code and build scripts such as
53+
# po/Makefile.in.in. Run by autoreconf if configure.ac contains
54+
# (AC|IT)_PROG_INTLTOOL. A build dependency on textproc/intltool
55+
# can be added with USES+=gnome and USE_GNOME+=intltool.
4056
# libtoolize Provided by devel/libtool. Updates libtool related *.m4 files
4157
# included with the source code and build scripts such as
4258
# ltmain.sh. Run by autoreconf if configure.ac (or one of the
@@ -76,14 +92,20 @@ do-autoreconf:
7692
# Don't modify time stamps if the files already exist
7793
@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
7894
. endfor
79-
. if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
8095
@(cd ${AUTORECONF_WRKSRC} && \
8196
if test -f configure.ac; then configure=configure.ac; \
8297
else configure=configure.in; fi && \
98+
if ${GREP} -q '^GTK_DOC_CHECK' $${configure}; \
99+
then if ! ${LOCALBASE}/bin/gtkdocize --copy; then \
100+
${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running gtkdocize'; \
101+
${FALSE}; fi; fi && \
83102
if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
84-
then ${LOCALBASE}/bin/intltoolize -f -c; fi)
85-
. endif
86-
@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
103+
then if ! ${LOCALBASE}/bin/intltoolize -f -c; then \
104+
${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running intltoolize'; \
105+
${FALSE}; fi; fi)
106+
@(cd ${AUTORECONF_WRKSRC} && if ! ${AUTORECONF} -f -i; then \
107+
${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running ${AUTORECONF}'; \
108+
${FALSE}; fi)
87109
. elif ! ${autoreconf_ARGS:Mbuild}
88110
IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
89111
. endif

databases/jlog/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COMMENT= Journaled log library
1010

1111
LICENSE= BSD3CLAUSE
1212

13-
BUILD_DEPENDS= autoconf-2.13:devel/autoconf213
13+
BUILD_DEPENDS= autoconf2.13:devel/autoconf2.13
1414

1515
USE_GITHUB= yes
1616
GH_ACCOUNT= omniti-labs
@@ -31,6 +31,6 @@ PERL_CONFIGURE_ON= --with-perl-lib=site
3131
PERL_CONFIGURE_WITH= perl
3232

3333
pre-configure:
34-
(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
34+
(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
3535

3636
.include <bsd.port.mk>

devel/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@
218218
SUBDIR += autobook
219219
SUBDIR += autoconf
220220
SUBDIR += autoconf-archive
221-
SUBDIR += autoconf-wrapper
222-
SUBDIR += autoconf213
221+
SUBDIR += autoconf-switch
222+
SUBDIR += autoconf2.13
223223
SUBDIR += autodia
224224
SUBDIR += autogen
225225
SUBDIR += automake

devel/autoconf-switch/Makefile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
PORTNAME= autoconf
2+
PORTVERSION= 20220527
3+
CATEGORIES= devel
4+
MASTER_SITES= # none
5+
PKGNAMESUFFIX= -switch
6+
DISTFILES= # none
7+
8+
MAINTAINER= tijl@FreeBSD.org
9+
COMMENT= Wrapper script to switch between autoconf versions
10+
11+
LICENSE= BSD2CLAUSE
12+
13+
NO_ARCH= yes
14+
NO_BUILD= yes
15+
16+
do-install:
17+
${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
18+
.for l in autoheader autom4te autoreconf autoscan autoupdate ifnames
19+
${LN} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${l}
20+
.endfor
21+
22+
.include <bsd.port.mk>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#! /bin/sh
2+
${DEFAULT_AUTOCONF:+exec "$0${DEFAULT_AUTOCONF}" "$@"}
3+
c=$(ls -d "$0"[0-9]* 2>/dev/null | sort -Vr | head -n1)
4+
exec "${c:?$0: not installed}" "$@"

devel/autoconf-switch/pkg-descr

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
This port installs a wrapper script for each tool included with autoconf.
2+
The script will run the version of autoconf specified in the environment
3+
variable DEFAULT_AUTOCONF. If DEFAULT_AUTOCONF is empty or unset it will run
4+
the most recent version of autoconf currently installed.

devel/autoconf-switch/pkg-plist

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
bin/autoconf
2+
bin/autoheader
3+
bin/autom4te
4+
bin/autoreconf
5+
bin/autoscan
6+
bin/autoupdate
7+
bin/ifnames

devel/autoconf-wrapper/Makefile

Lines changed: 0 additions & 43 deletions
This file was deleted.

devel/autoconf-wrapper/files/autotools-wrapper.sh

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)