From 5752faaa0d6d78173acabb3b06d5916095ac4c02 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Tue, 10 Oct 2023 22:25:36 -0700 Subject: [PATCH] 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 65ab112a321c3..6dfb4290412bd 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 4f46257a5da42..dae4a2a400398 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