Update to 2.13.0.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5345 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 40 insertions, 29 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 85724d04d..77cc4fe15 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/Makefile,v 1.7 2005/12/14 19:42:17 marcus Exp $
+#    $MCom: ports/x11/gdm/Makefile,v 1.8 2005/12/31 20:00:50 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.13.0.3
-PORTREVISION=	1
+PORTVERSION=	2.13.0.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.13
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index dc42f26af..de754d9f9 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.13.0.3.tar.bz2) = 8e568e0ad436470b91010dc19d505e44
-SHA256 (gnome2/gdm-2.13.0.3.tar.bz2) = e4aa57b8c29ceb43c3887cd0d3a2d0793678338fc94ac32d6a2ab173186e24af
-SIZE (gnome2/gdm-2.13.0.3.tar.bz2) = 2861747
+MD5 (gnome2/gdm-2.13.0.4.tar.bz2) = 91dc905826a5ec78774df1cf0f1f8173
+SHA256 (gnome2/gdm-2.13.0.4.tar.bz2) = 13a5f47075a1e2ba74c9b8a0b394e3eff09ae7fd0a6585fc637644afdcb6f993
+SIZE (gnome2/gdm-2.13.0.4.tar.bz2) = 2881959
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index a4086b4b9..83db19d0f 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -1,35 +1,26 @@
---- config/gdm.conf.in.orig	Thu Nov  3 20:07:52 2005
-+++ config/gdm.conf.in	Mon Dec  5 16:56:51 2005
-@@ -81,7 +81,7 @@
- # To try to kill all clients started at greeter time or in the Init script.
- # doesn't always work, only if those clients have a window of their own
- #KillInitClients=true
--LogDir=@EXPANDED_LOGDIR@
-+LogDir=/var/log
- # You should probably never change this value unless you have a weird setup
- PidFile=/var/run/gdm.pid
- # Note that a post login script is run before a PreSession script.
-@@ -136,11 +136,11 @@
+--- config/gdm.conf.in.orig	Tue Dec 20 21:22:36 2005
++++ config/gdm.conf.in	Thu Jan  5 16:54:11 2006
+@@ -154,11 +154,11 @@
  #FlexiReapDelayMinutes=5
- # the X nest command
+ # The X nest command.
  Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
--# Automatic VT allocation.  Right now only works on Linux.  This way
+-# Automatic VT allocation.  Right now only works on Linux.  This way we force
 +# Automatic VT allocation.  This way
- # we force X to use specific vts.  turn VTAllocation to false if this
- # is causing problems.
+ # X to use specific vts.  turn VTAllocation to false if this is causing
+ # problems.
 -#FirstVT=7
 -#VTAllocation=true
 +FirstVT=9
 +VTAllocation=true
- # Should double login be treated with a warning (and possibility to change
- # vts on linux and freebsd systems for console logins)
+ # Should double login be treated with a warning (and possibility to change VT's
+ # on Linux and FreeBSD systems for console logins)
  #DoubleLoginWarning=true
-@@ -264,7 +264,7 @@
- # The specific gtkrc file we use.  It should be the full path to the gtkrc
- # that we need.  Unless you need a specific gtkrc that doesn't correspond to
- # a specific theme, then just use the GtkTheme key
+@@ -277,7 +277,7 @@
+ # The specific gtkrc file we use.  It should be the full path to the gtkrc that
+ # we need.  Unless you need a specific gtkrc that doesn't correspond to a
+ # specific theme, then just use the GtkTheme key.
 -#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
 +#GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
  
- # The GTK+ theme to use for the gui
+ # The GTK+ theme to use for the GUI.
  #GtkTheme=Default
diff --git a/x11/gdm/files/patch-daemon_gdmconfig.c b/x11/gdm/files/patch-daemon_gdmconfig.c
new file mode 100644
index 000000000..9ebf10c99
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdmconfig.c
@@ -0,0 +1,10 @@
+--- daemon/gdmconfig.c.orig	Thu Jan  5 16:57:06 2006
++++ daemon/gdmconfig.c	Thu Jan  5 16:57:44 2006
+@@ -39,6 +39,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/resource.h>
+ #include <signal.h>
+ #include <pwd.h>
+ #include <grp.h>
diff --git a/x11/gdm/files/patch-daemon_server.c b/x11/gdm/files/patch-daemon_server.c
new file mode 100644
index 000000000..57f028bfd
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_server.c
@@ -0,0 +1,10 @@
+--- daemon/server.c.orig	Thu Jan  5 16:58:37 2006
++++ daemon/server.c	Thu Jan  5 16:58:46 2006
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#include <sys/resource.h>
+ #include <strings.h>
+ #include <signal.h>
+ #include <syslog.h>
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 24f09355a..04ea38af7 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -14,6 +14,7 @@ etc/gdm/Xsession
 @unexec if cmp -s %D/etc/gdm/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi
 etc/gdm/factory-gdm.conf
 @exec [ -f %B/gdm.conf ] || cp %B/%f %B/gdm.conf
+etc/gdm/gdm.conf-custom
 etc/gdm/locale.alias
 @unexec if cmp -s %D/etc/gdm/modules/AccessDwellMouseEvents %D/etc/gdm/modules/factory-AccessDwellMouseEvents; then rm -f %D/etc/gdm/modules/AccessDwellMouseEvents; fi
 etc/gdm/modules/factory-AccessDwellMouseEvents