Bug 277976 - net/guacamole-server: Fails to build with KUBERNETES and/or SSH disabled
Summary: net/guacamole-server: Fails to build with KUBERNETES and/or SSH disabled
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: Richard Gallamore
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-03-26 14:55 UTC by Felix Palmen
Modified: 2024-04-01 06:14 UTC (History)
1 user (show)

See Also:
ultima: maintainer-feedback+


Attachments
Fix KUBERNETES/SSH option handling (3.52 KB, patch)
2024-03-26 14:55 UTC, Felix Palmen
ultima: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Felix Palmen freebsd_committer freebsd_triage 2024-03-26 14:55:54 UTC
Created attachment 249497 [details]
Fix KUBERNETES/SSH option handling

In a nutshell, there's

a) a conflict in configure args caused by having "<opt>_CONFIGURE_WITH= pango terminal" for both of these options and
b) pkg-plist unconditionally listing libterm-related files which are only built/installed when one of these options is selected

See attached patch for my proposed fix. No bump, just fixes non-default options without changing anything for what worked before.
Comment 1 Richard Gallamore freebsd_committer freebsd_triage 2024-04-01 02:34:31 UTC
Comment on attachment 249497 [details]
Fix KUBERNETES/SSH option handling

lgtm. Can't recall why those were added as deps. They were probably required at some point long ago.
Comment 2 commit-hook freebsd_committer freebsd_triage 2024-04-01 06:11:44 UTC
A commit in branch main references this bug:

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

commit e760c81810bf72c06194543cee14207911aaf988
Author:     Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2024-03-23 06:26:43 +0000
Commit:     Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2024-04-01 06:10:37 +0000

    net/guacamole-server: Fix disabling KUBERNETES/SSH

    Both options need --with-pango and --with-terminal configure args. The
    <opt>_CONFIGURE_WITH helper also adds --without-* args for disabled
    options, so it can't be used here, as this will lead to conflicting
    configure args.

    Solve this by explicitly handling these after including
    bsd.port.options.mk. Also fix pkg-plist when both KUBERNETES and SSH are
    disabled.

    PR:             277976
    Approved by:    ultima (maintainer)

 net/guacamole-server/Makefile  | 18 ++++++++++++------
 net/guacamole-server/pkg-plist | 10 +++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)
Comment 3 Felix Palmen freebsd_committer freebsd_triage 2024-04-01 06:14:41 UTC
Thanks, fix committed!