Revert "x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver …

…args" The commit log message was incomplete. This reverts commit 2f6254b.
freebsd · Oct 11, 2023 · 5752faa · 5752faa
1 parent 6c3f086
commit 5752faa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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