aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpi <pi@FreeBSD.org>2016-08-26 23:32:16 +0800
committerpi <pi@FreeBSD.org>2016-08-26 23:32:16 +0800
commit1c06cd7f3091b4279a2a1e1973996c6138d10d79 (patch)
tree71d11b91873eab620b6c753a9a1cc8d2af29bde2
parent6b8de284946e483ce74d4068b13d87d6d15c1cbc (diff)
downloadfreebsd-ports-gnome-1c06cd7f3091b4279a2a1e1973996c6138d10d79.tar.gz
freebsd-ports-gnome-1c06cd7f3091b4279a2a1e1973996c6138d10d79.tar.zst
freebsd-ports-gnome-1c06cd7f3091b4279a2a1e1973996c6138d10d79.zip
x11/xdm: minimize the patch to config/xdm-config.cpp
PR: 211624 MFH: 2016Q3 Reported by: ak
-rw-r--r--x11/xdm/Makefile2
-rw-r--r--x11/xdm/files/patch-config_xdm-config.cpp38
2 files changed, 5 insertions, 35 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 8088a2677d10..17104d74dd73 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xdm
PORTVERSION= 1.1.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdm/files/patch-config_xdm-config.cpp b/x11/xdm/files/patch-config_xdm-config.cpp
index d126876334df..9042b8eb0e73 100644
--- a/x11/xdm/files/patch-config_xdm-config.cpp
+++ b/x11/xdm/files/patch-config_xdm-config.cpp
@@ -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