diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-10-16 03:25:08 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-10-16 03:25:08 +0800 |
| commit | fd6f761106b94bf7768a20b511e31bc4b8ae83c6 (patch) | |
| tree | 259b7e1dfeb13b3d13b8df3e40832590f0fc4d19 | |
| parent | 054ac01de6ad34d19370d879b501796b477cf839 (diff) | |
| download | marcuscom-ports-fd6f761106b94bf7768a20b511e31bc4b8ae83c6.tar marcuscom-ports-fd6f761106b94bf7768a20b511e31bc4b8ae83c6.tar.gz marcuscom-ports-fd6f761106b94bf7768a20b511e31bc4b8ae83c6.tar.bz2 marcuscom-ports-fd6f761106b94bf7768a20b511e31bc4b8ae83c6.tar.lz marcuscom-ports-fd6f761106b94bf7768a20b511e31bc4b8ae83c6.tar.xz marcuscom-ports-fd6f761106b94bf7768a20b511e31bc4b8ae83c6.tar.zst marcuscom-ports-fd6f761106b94bf7768a20b511e31bc4b8ae83c6.zip | |
* Do not do auto VTY allocation
* Use shutdown -p to shutdown a machine
Obtained from: FreeBSD CVS
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@87 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm2/Makefile | 2 | ||||
| -rw-r--r-- | x11/gdm2/files/patch-ab | 23 |
2 files changed, 20 insertions, 5 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index bdc0a3e87..799d8e95b 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdm2 PORTVERSION= 2.4.0.11 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index db8711ef3..10b04a198 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,5 +1,5 @@ ---- config/gdm.conf.in.orig Fri Aug 23 13:59:57 2002 -+++ config/gdm.conf.in Sun Aug 25 13:57:05 2002 +--- config/gdm.conf.in.orig Fri Aug 23 18:53:53 2002 ++++ config/gdm.conf.in Sun Oct 13 17:57:14 2002 @@ -33,14 +33,14 @@ # The gdm configuration program that is run from the login screen, you should # probably leave this alone @@ -26,7 +26,16 @@ # You should probably never change this value unless you have a weird setup PidFile=/var/run/gdm.pid PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ -@@ -84,11 +84,11 @@ +@@ -72,7 +72,7 @@ + # Reboot, Halt and suspend commands, you can add different commands + # separated by a semicolon and gdm will use the first one it can find + RebootCommand=/sbin/shutdown -r now;/usr/sbin/shutdown -r now +-HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now ++HaltCommand=/sbin/shutdown -p now;/usr/sbin/shutdown -p now + SuspendCommand= + # Probably should not touch the below this is the standard setup + ServAuthDir=@EXPANDED_AUTHDIR@ +@@ -84,16 +84,16 @@ UserAuthFBDir=/tmp UserAuthFile=.Xauthority # The X server to use if we can't figure out what else to run. @@ -40,6 +49,12 @@ # Automatic VT allocation. Right now only works on Linux. This way # we force X to use specific vts. turn VTAllocation to false if this # is causing problems. + FirstVT=7 +-VTAllocation=true ++VTAllocation=false + + [security] + # If any distributions ship with this one off, they should be shot @@ -153,7 +153,7 @@ # The 'theme'. By default we're using the default gtk theme # Of course assuming that gtk got installed in the same prefix, @@ -54,7 +69,7 @@ [server-Standard] name=Standard server -command=/usr/X11R6/bin/X -+command=@EXPANDED_BINDIR@/X ++command=@EXPANDED_BINDIR@/X vt9 flexible=true # To use this server type you should add -query host or -indirect host |