From nobody Mon Apr 1 06:11:37 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7LHt1NPlz5FgXk; Mon, 1 Apr 2024 06:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7LHs70m4z4b5R; Mon, 1 Apr 2024 06:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711951898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPw4/fx83+oLZ4RCwGVgDtXv99tJJ85Yw3zoXQOQHXQ=; b=obUye36WaCPaFTv0LT8/l/eWyzsYKyiyinyKfMbASvSacW9zavSC9SrkJgtEtwxiKoJJlY v+F1l6TJ01qIQrcEKFKO9Qa2xnLkJFKCJbG2wMTc7qYLMEQiMLBD34Q4CPrFz928ENfV5A cp6Vh44SC/ZbysFkWC+claesG6OqooGgIZ8XY4BuNjqnqFfLhkwel9xmZTFneMqUCdsXV7 +8wCB4RnwDaZS2jZVPvO3+ISczkTwXbiKirPqCjpP1vB0v4F7iLNXnc0eU1z8RHd6VUmKt gDSF6DaX/G0WEGnSGyRF70WrvODyXMNRQhCaaf2DQyxPjRqNGkLR8/Jq9spoyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711951898; a=rsa-sha256; cv=none; b=A7AIfJ20yLECPOYnIWGDQRU0y6xQjEMTcvI0RJG1YM0Qkwp3KL/PEoz3Zc6Bw87z03paZe dZTFXyYpk+gWAfxNj/jv9wzgi06hu3qVXVpeo4hZs2hK2dZm/+4t8Tpn4GyVmjZNszmxD6 8nYw2hNI/mZ8cpSdYP4W2A5fYSx3L65Tei1EvjbPusfW7ncHR+hKF7oC1XZAigryU9DlnC jU7xhzjpd+qLuYe2POP4ZgjTTmW6n9Zp+dFS1VEOQV/l74l3lCU0QUZVGnrr1w1sQSPHEJ nglZec24zaOlOT9i1muU2MkfLWTmYA7rbg+T/PG2seqmPR4V0KyXMA71wOAkTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711951898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPw4/fx83+oLZ4RCwGVgDtXv99tJJ85Yw3zoXQOQHXQ=; b=TBc7DRF7Jbsp8BDycMb/J3Y1mmcsVhd2CZzGYqyL0jRDxc6wpmchGr8ob1rOCdGhq3ekR+ PNPjFvYlW/FS/m7bUu/YsrcKpmtZkvxpa4u4a/JmxXfWLzhHK7iIaYxfCO0YQD5d/bf2xU 02cvRvMAkHpvm8RVleJgQxYYnnyj2AHo8BdSHQjctV04L4nOmK8F+P7S/f1+O66cFRR8/x L94De0/l2v57P0Jrl5+ptcZZwLCfTV0vtvEc9tc7Rwwnc8OaysVQt8RERGtc852vzngch2 UzoPC/Or/7EqqUIYSwg2Y4pXY3TNUbFRDv6Ohb5ahcG9YuBZ96dwN6iKVya5EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7LHs6d9Nz19HB; Mon, 1 Apr 2024 06:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4316BbFf000531; Mon, 1 Apr 2024 06:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4316Bbu0000528; Mon, 1 Apr 2024 06:11:37 GMT (envelope-from git) Date: Mon, 1 Apr 2024 06:11:37 GMT Message-Id: <202404010611.4316Bbu0000528@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: e760c81810bf - main - net/guacamole-server: Fix disabling KUBERNETES/SSH List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e760c81810bf72c06194543cee14207911aaf988 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=e760c81810bf72c06194543cee14207911aaf988 commit e760c81810bf72c06194543cee14207911aaf988 Author: Felix Palmen AuthorDate: 2024-03-23 06:26:43 +0000 Commit: Felix Palmen 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 _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(-) diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index d7da49121b4a..0529938dcd6d 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -67,19 +67,16 @@ GUACENC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg GUACENC_CFLAGS= -Wno-error=deprecated GUACLOG_CONFIGURE_ENABLE= guaclog KUBERNETES_CONFIGURE_ENABLE= kubernetes -KUBERNETES_CONFIGURE_WITH= pango terminal KUBERNETES_LIB_DEPENDS= libwebsockets.so:net/libwebsockets \ libharfbuzz.so:print/harfbuzz -KUBERNETES_USE= GNOME=pango NLS_USES= gettext-runtime PULSEAUDIO_CONFIGURE_WITH= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio RDP_CONFIGURE_WITH= rdp RDP_LIB_DEPENDS= libfreerdp2.so:net/freerdp -SSH_CONFIGURE_WITH= pango ssh terminal +SSH_CONFIGURE_WITH= ssh SSH_IMPLIES= SSL SSH_LIB_DEPENDS= libssh2.so:security/libssh2 -SSH_USE= GNOME=pango SSL_CONFIGURE_WITH= ssl SSL_USES= ssl VNC_CONFIGURE_WITH= vnc @@ -90,7 +87,16 @@ VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -.include +.include + +.if ${PORT_OPTIONS:MKUBERNETES}${PORT_OPTIONS:MSSH} +CONFIGURE_ARGS+= --with-pango --with-terminal +PLIST_SUB+= TERMINAL="" +USE_GNOME+= pango +.else +CONFIGURE_ARGS+= --without-pango --without-terminal +PLIST_SUB+= TERMINAL="@comment " +.endif .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=strict-prototypes \ @@ -108,4 +114,4 @@ post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${GUACAMOLE_HOME} ${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR} -.include +.include diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist index 5cf72710b626..0303899e3170 100644 --- a/net/guacamole-server/pkg-plist +++ b/net/guacamole-server/pkg-plist @@ -41,7 +41,7 @@ include/guacamole/socket.h include/guacamole/stream-types.h include/guacamole/stream.h include/guacamole/string.h -include/guacamole/terminal/terminal.h +%%TERMINAL%%include/guacamole/terminal/terminal.h include/guacamole/timestamp-types.h include/guacamole/timestamp.h include/guacamole/unicode.h @@ -73,10 +73,10 @@ lib/libguac.a lib/libguac.so lib/libguac.so.23 lib/libguac.so.23.0.0 -lib/libguac-terminal.a -lib/libguac-terminal.so -lib/libguac-terminal.so.0 -lib/libguac-terminal.so.0.1.0 +%%TERMINAL%%lib/libguac-terminal.a +%%TERMINAL%%lib/libguac-terminal.so +%%TERMINAL%%lib/libguac-terminal.so.0 +%%TERMINAL%%lib/libguac-terminal.so.0.1.0 %%GUACENC%%share/man/man1/guacenc.1.gz %%GUACLOG%%share/man/man1/guaclog.1.gz share/man/man5/guacd.conf.5.gz