Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Aug 2016 15:32:16 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r420926 - in head/x11/xdm: . files
Message-ID:  <201608261532.u7QFWGuj071620@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Fri Aug 26 15:32:16 2016
New Revision: 420926
URL: https://svnweb.freebsd.org/changeset/ports/420926

Log:
  x11/xdm: minimize the patch to config/xdm-config.cpp
  
  PR:		211624
  MFH:		2016Q3
  Reported by:	ak

Modified:
  head/x11/xdm/Makefile
  head/x11/xdm/files/patch-config_xdm-config.cpp

Modified: head/x11/xdm/Makefile
==============================================================================
--- head/x11/xdm/Makefile	Fri Aug 26 15:30:54 2016	(r420925)
+++ head/x11/xdm/Makefile	Fri Aug 26 15:32:16 2016	(r420926)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xdm
 PORTVERSION=	1.1.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11/xdm/files/patch-config_xdm-config.cpp
==============================================================================
--- head/x11/xdm/files/patch-config_xdm-config.cpp	Fri Aug 26 15:30:54 2016	(r420925)
+++ head/x11/xdm/files/patch-config_xdm-config.cpp	Fri Aug 26 15:32:16 2016	(r420926)
@@ -1,39 +1,9 @@
 --- config/xdm-config.cpp.orig	2011-09-25 07:35:47 UTC
 +++ config/xdm-config.cpp
-@@ -12,25 +12,26 @@
- DisplayManager.authDir:	XDMXAUTHDIR
- DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
- DisplayManager.pidFile:		XDMPIDDIR/xdm.pid
--DisplayManager.keyFile:		XDMCONFIGDIR/xdm-keys
--DisplayManager.servers:		XDMCONFIGDIR/Xservers
--DisplayManager.accessFile:	XDMCONFIGDIR/Xaccess
--DisplayManager*resources:	XDMCONFIGDIR/Xresources
--DisplayManager.willing:		SU nobody -s /bin/sh -c XDMSCRIPTDIR/Xwilling
-+DisplayManager.keyFile:		/usr/local/lib/X11/xdm/xdm-keys
-+DisplayManager.servers:		/usr/local/lib/X11/xdm/Xservers
-+DisplayManager.accessFile:	/usr/local/lib/X11/xdm/Xaccess
-+DisplayManager*resources:	/usr/local/lib/X11/xdm/Xresources
-+DisplayManager.willing:		SU nobody -s /bin/sh -c /usr/local/lib/X11/xdm/Xwilling
- ! All displays should use authorization, but we cannot be sure
- ! X terminals may not be configured that way, so they will require
- ! individual resource settings.
- DisplayManager*authorize:	true
- !
- DisplayManager*chooser:		CHOOSERPATH
--DisplayManager*startup:		XDMSCRIPTDIR/Xstartup
--DisplayManager*session:		XDMSCRIPTDIR/Xsession
--DisplayManager*reset:		XDMSCRIPTDIR/Xreset
-+DisplayManager*startup:		/usr/local/lib/X11/xdm/Xstartup
-+DisplayManager*session:		/usr/local/lib/X11/xdm/Xsession
-+DisplayManager*reset:		/usr/local/lib/X11/xdm/Xreset
- DisplayManager*authComplain:	true
- ! The following three resources set up display :0 as the console.
--DisplayManager._0.setup:	XDMSCRIPTDIR/Xsetup_0
--DisplayManager._0.startup:	XDMSCRIPTDIR/GiveConsole
--DisplayManager._0.reset:	XDMSCRIPTDIR/TakeConsole
-+DisplayManager._0.setup:	/usr/local/lib/X11/xdm/Xsetup_0
-+DisplayManager._0.startup:	/usr/local/lib/X11/xdm/GiveConsole
-+DisplayManager._0.reset:	/usr/local/lib/X11/xdm/TakeConsole
+@@ -31,6 +31,7 @@ DisplayManager*authComplain:	true
+ DisplayManager._0.setup:	XDMSCRIPTDIR/Xsetup_0
+ DisplayManager._0.startup:	XDMSCRIPTDIR/GiveConsole
+ DisplayManager._0.reset:	XDMSCRIPTDIR/TakeConsole
 +DisplayManager.*.authName:     MIT-MAGIC-COOKIE-1
  #ifdef XPM
  DisplayManager*loginmoveInterval:	10



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608261532.u7QFWGuj071620>