Bug 263970 - devel/autoconf*: Restructure to prepare for 2.71
Summary: devel/autoconf*: Restructure to prepare for 2.71
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Tijl Coosemans
URL:
Keywords:
Depends on:
Blocks: 258046
  Show dependency treegraph
 
Reported: 2022-05-14 13:13 UTC by Tijl Coosemans
Modified: 2022-06-02 18:54 UTC (History)
1 user (show)

See Also:
antoine: exp-run+


Attachments
patch (57.96 KB, patch)
2022-05-14 13:13 UTC, Tijl Coosemans
no flags Details | Diff
patch2 (65.18 KB, patch)
2022-05-20 16:37 UTC, Tijl Coosemans
no flags Details | Diff
patch3 (67.49 KB, patch)
2022-05-24 14:24 UTC, Tijl Coosemans
no flags Details | Diff
patch4 (67.80 KB, patch)
2022-05-26 10:05 UTC, Tijl Coosemans
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans freebsd_committer freebsd_triage 2022-05-14 13:13:51 UTC
Created attachment 233908 [details]
patch

Autoconf 2.70 isn't entirely backwards compatible to the point that I'd like to keep autoconf 2.69 around as devel/autoconf2.69.  Before making that copy and updating devel/autoconf, I wanted to address some issues first.  I made some changes to USES=autoreconf and devel/autoconf* that require an exp-run.

- 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*.

This patch also includes the patch for cairo from bug 263454.
Comment 2 Tijl Coosemans freebsd_committer freebsd_triage 2022-05-20 16:37:12 UTC
Created attachment 234059 [details]
patch2

devel/util-linux, sysutils/consolekit2, sysutils/flock, x11-fm/librfm, x11/keybinder-gtk3: deal with autoreconf running gtkdocize now

The following were unrelated but I've included fixes:

graphics/gnome-color-manager: remove libcanberra dependency
mail/dovecot-coi: fix build with recent dovecot
math/givaro: fix build with recent doxygen
Comment 4 Tijl Coosemans freebsd_committer freebsd_triage 2022-05-24 14:24:29 UTC
Created attachment 234175 [details]
patch3

spice-gtk: remove USES=autoreconf
xviewer: add patches to eliminate gtk-doc dependency

givaro: just remove DOCS option for now and let maintainer fix it
dovecot-coi: add another patch
Comment 5 Tijl Coosemans freebsd_committer freebsd_triage 2022-05-26 10:05:03 UTC
Created attachment 234227 [details]
patch4

I saw that givaro still fails because of pkg-plist problem.  This patch addresses that.
Comment 6 Antoine Brodin freebsd_committer freebsd_triage 2022-05-26 18:48:30 UTC
This should be fine.
Comment 7 commit-hook freebsd_committer freebsd_triage 2022-05-27 09:55:15 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=057adffc223b269e3dc8c220348b7ea1dcaec108

commit 057adffc223b269e3dc8c220348b7ea1dcaec108
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2022-05-24 13:04:01 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2022-05-27 09:11:03 +0000

    deskutils/spice-gtk: remove USES=autoreconf

    It was added in f249042a290d for an upstream patch that has since been
    removed.

    PR:             263970

 deskutils/spice-gtk/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 8 commit-hook freebsd_committer freebsd_triage 2022-05-27 09:55:17 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c374acbe89aa27a290d148151af9bfe32b72c591

commit c374acbe89aa27a290d148151af9bfe32b72c591
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2022-05-20 16:03:42 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2022-05-27 09:11:02 +0000

    sysutils/flock: remove unused NLS option

    PR:             263970

 sysutils/flock/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
Comment 9 commit-hook freebsd_committer freebsd_triage 2022-05-27 09:55:19 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dc1885926d4ab78d37303aac1d18f27058b7b313

commit dc1885926d4ab78d37303aac1d18f27058b7b313
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2022-05-24 13:51:52 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2022-05-27 09:11:04 +0000

    graphics/xviewer: eliminate gtk-doc dependency

    It was only needed for autoreconf.  The documentation was never
    installed.

    PR:             263970

 graphics/xviewer/Makefile                       |  6 ++----
 graphics/xviewer/files/patch-Makefile.am (new)  | 11 +++++++++++
 graphics/xviewer/files/patch-configure.ac (new) | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)
Comment 10 commit-hook freebsd_committer freebsd_triage 2022-05-27 09:55:20 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=847618cab6bae2720a3abc5c097a77730fb04192

commit 847618cab6bae2720a3abc5c097a77730fb04192
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2022-05-24 12:54:20 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2022-05-27 09:11:02 +0000

    math/givaro: remove DOCS option

    It is broken by a recent Doxygen update.

    PR:             263970

 math/givaro/Makefile  | 2 +-
 math/givaro/pkg-plist | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Comment 11 commit-hook freebsd_committer freebsd_triage 2022-05-27 09:56:22 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec2102597a4ed2e4c9075d3c4b6399e13c0956c2

commit ec2102597a4ed2e4c9075d3c4b6399e13c0956c2
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2022-05-02 08:55:28 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2022-05-27 09:51:04 +0000

    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

 MOVED                                              |   2 +
 Mk/Uses/autoreconf.mk                              |  30 ++++-
 databases/jlog/Makefile                            |   4 +-
 devel/Makefile                                     |   4 +-
 devel/autoconf-switch/Makefile (new)               |  22 ++++
 devel/autoconf-switch/files/autoconf (new)         |   4 +
 devel/autoconf-switch/pkg-descr (new)              |   4 +
 devel/autoconf-switch/pkg-plist (new)              |   7 ++
 devel/autoconf-wrapper/Makefile (gone)             |  43 --------
 .../files/autotools-wrapper.sh (gone)              |  89 ---------------
 devel/autoconf-wrapper/pkg-descr (gone)            |   3 -
 devel/autoconf/Makefile                            |  97 ++++++++++------
 devel/autoconf/files/patch-bin_autoreconf.in (new) |  10 ++
 ...patch-bin-autoscan.in => patch-bin_autoscan.in} |   0
 devel/autoconf/files/patch-bison (gone)            |  53 ---------
 ...patch-doc-Makefile.in => patch-doc_Makefile.in} |   9 +-
 devel/autoconf/files/patch-doc_autoconf.texi       |  47 ++------
 devel/autoconf/files/patch-texinfo (gone)          |  12 --
 devel/autoconf/pkg-descr                           |   6 +-
 devel/autoconf/pkg-plist                           | 122 ++++++++++-----------
 devel/autoconf2.13/Makefile (new)                  |  66 +++++++++++
 devel/{autoconf213 => autoconf2.13}/distinfo       |   1 +
 .../files/patch-acspecific.m4                      |   6 +-
 .../files/patch-autoconf.sh                        |  27 ++++-
 devel/autoconf2.13/files/patch-autoconf.texi (new) |  17 +++
 .../files/patch-autoheader.sh}                     |   6 +-
 .../files/patch-autoupdate.sh                      |   8 +-
 devel/{autoconf213 => autoconf2.13}/pkg-descr      |   9 +-
 devel/autoconf2.13/pkg-plist (new)                 |  19 ++++
 devel/autoconf213/Makefile (gone)                  |  45 --------
 devel/autoconf213/files/patch-Makefile.in (gone)   |  36 ------
 devel/autoconf213/files/patch-autoconf.texi (gone) |  24 ----
 devel/autoconf213/pkg-plist (gone)                 |  22 ----
 devel/autotools/Makefile                           |   4 +-
 devel/util-linux/files/patch-configure.ac (new)    |  12 ++
 lang/spidermonkey78/Makefile                       |   2 +-
 lang/spidermonkey91/Makefile                       |   4 +-
 mail/thunderbird/Makefile                          |   8 +-
 sysutils/consolekit2/files/patch-configure.ac      |  16 ++-
 www/firefox-esr/Makefile                           |   6 +-
 www/firefox/Makefile                               |   6 +-
 x11-fm/librfm/files/patch-configure.ac (new)       |  10 ++
 x11/keybinder-gtk3/Makefile                        |   2 +
 43 files changed, 405 insertions(+), 519 deletions(-)
Comment 12 commit-hook freebsd_committer freebsd_triage 2022-05-27 09:56:24 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ea52fdc7a8404532fccaf37223097602a8ab5dc4

commit ea52fdc7a8404532fccaf37223097602a8ab5dc4
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2022-05-20 15:51:52 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2022-05-27 09:11:01 +0000

    graphics/gnome-color-manager: eliminate canberra dependency

    PR:             263970

 graphics/gnome-color-manager/Makefile                          |  4 +---
 .../gnome-color-manager/files/patch-src_gcm-viewer.c (new)     | 10 ++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)
Comment 13 commit-hook freebsd_committer freebsd_triage 2022-05-27 09:56:31 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c5c7a990f192d993704ceae5a017c199acd2dead

commit c5c7a990f192d993704ceae5a017c199acd2dead
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2022-05-20 15:58:51 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2022-05-27 09:11:01 +0000

    mail/dovecot-coi: fix build with recent dovecot

    PR:             263970

 .../files/patch-src_lib-coi_coi-contact.c (new)    | 35 ++++++++++++++++++++++
 .../patch-src_webpush_test-webpush-message.c (new) | 10 +++++++
 2 files changed, 45 insertions(+)
Comment 14 Franco Fichtner 2022-06-02 08:42:09 UTC
I probably missed the memo, but what was the point of scrubbing NLS option in sysutils/flock as "unused"?  There is very little detail to come to a conclusion as a maintainer.  ;)


Cheers,
Franco
Comment 15 Tijl Coosemans freebsd_committer freebsd_triage 2022-06-02 18:54:10 UTC
(In reply to Franco Fichtner from comment #14)
The port doesn't install any translations in share/locale.