From nobody Wed Oct 11 05:27:47 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 4S51W72ZK4z4wtr8; Wed, 11 Oct 2023 05:27:47 +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 4S51W723Ntz3QMw; Wed, 11 Oct 2023 05:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697002067; 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=51cWG8G23+AAaUo4VO2sWegUH3JpJenDRx/PtcSTD00=; b=idUSht+c2o//x/APQ5wXT0JwjeHkBmUfRjrLzNtvfF2g8x2sMb2Xi+wauTbmqUrB86A0wt tblv/bBz/9Bb14M60rAM24EmsLfOLM+D0pvonDM6azbPTkQD+SO6mhW5Z/IM1jpfr4jYOA IVaPegsEEdAPo7egHpUzWTSVMpxIooKP61SyKHLAcDQC8VlHwek5pgdi7cuV21Rp0YANw2 XO7USBiLUfmcLUGo7PxNe3btfo/szotoSbiNZZpYXjDtA6g+7ZcbeNrVDPI81t4vhdUU7L Ry8G/sk57H9xGmpfgzH9eAGxIPlEtDsXvjvJGjVNKLXUsVZzeoT2+hqXjjqCfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697002067; a=rsa-sha256; cv=none; b=kaCMQVsN03xehFGKgvgPwza7JfcCAdhawaEs0IolnS4+tjFj99A9jSDZJx0R5g/CvB9+cW o9z9xiliA3EFXrfWBwWEsIqDUC+3rUQwzEYYi+vkKGeNAp1KGRXCvh/GaqHtwZlsWGhB4X XEBaWlf7MC2aIi8DkDEaRda8U3H45QiL1tN8DebHnWJNSmFWNq1RiGZW3daP+esFFhLp0u rwIWsw/ECTjv4QvI6yQ7ec6eDV9SVK0UVUMVlEJHGAQXUsraRQm6Q1L0EjPVe2qAihmULt AOUwHAYeiYfKHcKSiUV7IQsLWFlqKzYhhjlBY7LQrTBSrS6isiYarrc7ClFSKw== 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=1697002067; 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=51cWG8G23+AAaUo4VO2sWegUH3JpJenDRx/PtcSTD00=; b=uQEmiOGzGmPlA6OjibsJEd3JoKq7d+wcdfz4xXIr/7PP//XH2gBNZckqpoAUW+NOrIR16p qzUlq2qk0aeuUMil2MabojI6A4jK8bWK0kx4XXlCpjKa3faZ/sI/VCJBjVlKJMVlhJtVQK 8PHA2jk61U0UxwqdKHsJ6K0pjk75txnK6uk6aOcduNBwMSLyYMsfNf0+igYvdQR3sNPY68 ffqH75Z/+sQF19Eu4luzTdJqbSkgM4VyoisKq35CJ7FopZzzmG+AsSzz0La5QJMyPxFNKm WUJLM5wypM3nwXynYt8AH7MY0NiBQOySIgYEowEs/L9ZaUu6QHKe1sjlr/sVRQ== 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 4S51W715l1z17kF; Wed, 11 Oct 2023 05:27:47 +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 39B5RllS086385; Wed, 11 Oct 2023 05:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39B5RltZ086382; Wed, 11 Oct 2023 05:27:47 GMT (envelope-from git) Date: Wed, 11 Oct 2023 05:27:47 GMT Message-Id: <202310110527.39B5RltZ086382@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 5752faaa0d6d - main - Revert "x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args" 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5752faaa0d6d78173acabb3b06d5916095ac4c02 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5752faaa0d6d78173acabb3b06d5916095ac4c02 commit 5752faaa0d6d78173acabb3b06d5916095ac4c02 Author: Cy Schubert AuthorDate: 2023-10-11 05:25:36 +0000 Commit: Cy Schubert CommitDate: 2023-10-11 05:25:36 +0000 Revert "x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args" The commit log message was incomplete. This reverts commit 2f6254b9fd6a29102968d64961ed86e445c50558. --- x11/xdm/Makefile | 2 +- x11/xdm/files/xdm.in | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 65ab112a321c..6dfb4290412b 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -1,6 +1,6 @@ PORTNAME= xdm PORTVERSION= 1.1.14 -PORTREVISION= 4 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdm/files/xdm.in b/x11/xdm/files/xdm.in index 4f46257a5da4..dae4a2a40039 100644 --- a/x11/xdm/files/xdm.in +++ b/x11/xdm/files/xdm.in @@ -38,11 +38,7 @@ xdm_set_vty() { # X views vt as starting at 01, not ttyv0 vtarg=`printf vt%02d $((${xdm_tty#ttyv} + 1))` - xserver_args=$(grep '^:0' %%LOCALBASE%%/etc/X11/xdm/Xservers) - if [ $? -ne 0 ]; then - xserver_args=":0 local %%LOCALBASE%%/bin/X :0" - fi - command_args="-server \"$xserver_args $vtarg\"" + command_args="-server \":0 local %%LOCALBASE%%/bin/X :0 $vtarg\"" } run_rc_command $1