From nobody Sat Aug 12 20:20:12 2023 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 4RNX8X3q69z4TjcW; Sat, 12 Aug 2023 20:20:12 +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 4RNX8X3Jpwz4GD3; Sat, 12 Aug 2023 20:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691871612; 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=zBPN21my8hRf4w/Ol0i9/uMnGD1/aI0Ery/RHy5ib8Q=; b=ZdlTzSyyCWi6hVGkLWr7asZPRg58UHDz2CDmPLrkb+VvZ8P0x1tVZCP+zK9qgRvCVY6zUu yLyVJXvk+U5u7zXNhbyvJMx4CSDvKkW35/6tWnzK61C1ZOC4txhGpXY+xfzPL8rDsxPYm4 bUKfb0p5d3sA5fG9VHCY+Ea3OSHiBv7VfUFYlZ7xr9y+QKU0jngvv6PrLOZ41lWl0mSBVz D6zVrpUTlvFj3ODNzYwFQ+8DYdGGelZ0P4xZrnYGLB2XAEK4TU91jEgzMDsYDiOT/u9GkP AgPZKdXnk71hKE2EKFU8sXwloXGK2GLGfIkpS4b4+GRm30ilsWP5RRhVlF04pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691871612; 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=zBPN21my8hRf4w/Ol0i9/uMnGD1/aI0Ery/RHy5ib8Q=; b=Bkbo1AtqOvXxHiCqieDovDYA6YLIqGt8yAHxzxElJPOrFM88O4tTvjhHLbU00YRLB8zLDP iQ+okWxocBGBALPeEkEkRN8fcqYExWNMpRU6fkz3sogHUYsyZa8j+GoGHhlrrtud1E2pE7 mQOMQMps4laWn0VolRZNDPcnn9qNMAtRCMPJW2383kRIj6gbf7GLtNH2dO3YYku5bpFhun QDp4BUWqaespfUiv76hBbKThnExsNe4Zc7ANdqCmPZ6sPJS/dle02xDPSQjfP8b+xiltBM eAge7ca4m7jN6nQs03b8EXWqK91UWiOy7dOorXw9oOjSEMlCHprspptI9t0CYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691871612; a=rsa-sha256; cv=none; b=pLsLdV6lMWlK+OMEDz2PXTs2Wjeu4rtFKUoBYjxGCQ40ynUSEF9YUr/wdXMkAsuLCUOAwE pkEa040OTzYzYa+iWKj1mTjwD8iL62iIGrLB0sg8xmlUCSDexUCsEsuIOhvjL8LICTh1Df soa/rhj9P3/w44jdMuvhra1pWQURxKh8McZdtfmhNiUzEG6eLkEajwaejJjIuOiRiOsQQc 9BvglgZkwVYYJnVySr0hu0Rwzfi1SSJudIOcwz+CXk2jRVLEkrGVpenku9cIQYrj0D4fxd XVOAdEgqbpoPx1hN958aShYSsc7X92XzqYHFJQNseVoTHKRFDsVbZvOW6T7WxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNX8X2P3JzZS9; Sat, 12 Aug 2023 20:20:12 +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 37CKKCMJ011000; Sat, 12 Aug 2023 20:20:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CKKC42010992; Sat, 12 Aug 2023 20:20:12 GMT (envelope-from git) Date: Sat, 12 Aug 2023 20:20:12 GMT Message-Id: <202308122020.37CKKC42010992@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: ba250e03fd65 - main - x11/xdm: allow X server arguments to be set in Xservers 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: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba250e03fd652940d2da0e4d947dca35e26b5a4c Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba250e03fd652940d2da0e4d947dca35e26b5a4c commit ba250e03fd652940d2da0e4d947dca35e26b5a4c Author: Chris Mangin AuthorDate: 2023-08-12 20:18:07 +0000 Commit: Kevin Bowling CommitDate: 2023-08-12 20:19:38 +0000 x11/xdm: allow X server arguments to be set in Xservers This patch changes the rc.d script so that: 1- The xdm_tty variable is set to 'default'. This disable the override and allows xdm to be configured the normal way. xdm uses the ttyv8 terminal by default anyway. 2- The server arguments are only overridden if the user explicitly specify a value for xdm_tty. PR: 265578 --- x11/xdm/Makefile | 2 +- x11/xdm/files/xdm.in | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index f828df33c99b..2f86e3a665b0 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -1,6 +1,6 @@ PORTNAME= xdm PORTVERSION= 1.1.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdm/files/xdm.in b/x11/xdm/files/xdm.in index 182911e97848..dae4a2a40039 100644 --- a/x11/xdm/files/xdm.in +++ b/x11/xdm/files/xdm.in @@ -26,11 +26,13 @@ desc="X.org X display manager" load_rc_config $name : ${xdm_enable:=NO} -: ${xdm_tty:=ttyv8} +: ${xdm_tty:=default} command=%%PREFIX%%/bin/$name pidfile=/var/run/$name.pid -start_precmd=xdm_set_vty +if [ "${xdm_tty%%[0-9]*}" = "ttyv" ]; then + start_precmd=xdm_set_vty +fi xdm_set_vty() {