Update to 2.21.7.

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

4 files changed, 21 insertions, 12 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a7c2e76ff..22f283607 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.105 2008/02/05 05:54:21 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.106 2008/02/09 00:22:14 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.21.6
-PORTREVISION=	5
+PORTVERSION=	2.21.7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -35,7 +34,7 @@ USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
 		gnomeprefix
-GCONF_SCHEMAS=	gdm-simple-greeter.schemas
+GCONF_SCHEMAS=	gdm-simple-greeter.schemas gdm-user-switch-applet.schemas
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 51fc747f4..0bd36d560 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.21.6.tar.bz2) = 4925de50d3c56b992254c75bee9e08f2
-SHA256 (gnome2/gdm-2.21.6.tar.bz2) = cb8cb9436147ab7b892be65da9f23afa5df5492104318788d3ce2e0dba89109b
-SIZE (gnome2/gdm-2.21.6.tar.bz2) = 2175987
+MD5 (gnome2/gdm-2.21.7.tar.bz2) = d79229d9d293e85c04edb7047605211f
+SHA256 (gnome2/gdm-2.21.7.tar.bz2) = 66739c1401a7f6ef1738a2d3f6093e737088d32f731866cfcc9a9233352decdd
+SIZE (gnome2/gdm-2.21.7.tar.bz2) = 2213396
diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c
index 47ab2b297..994bdf404 100644
--- a/x11/gdm/files/patch-common_gdm-address.c
+++ b/x11/gdm/files/patch-common_gdm-address.c
@@ -1,21 +1,25 @@
---- common/gdm-address.c.orig	2008-01-31 03:07:58.000000000 -0500
-+++ common/gdm-address.c	2008-01-31 03:11:17.000000000 -0500
-@@ -26,12 +26,13 @@
+--- common/gdm-address.c.orig	2008-02-03 11:52:26.000000000 -0500
++++ common/gdm-address.c	2008-02-13 01:23:07.000000000 -0500
+@@ -25,8 +25,9 @@
+ #include <stdio.h>
  #include <fcntl.h>
  #include <unistd.h>
+-#include <stropts.h>
  #include <string.h>
 +#include <sys/types.h>
 +#include <sys/param.h>
- #ifdef HAS_SYS_SOCKET
+ #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
+@@ -35,7 +36,6 @@
+ #endif
  #include <netdb.h>
  #include <sys/ioctl.h>
 -#include <net/if.h>
  
  #ifndef G_OS_WIN32
  #include <sys/socket.h>
-@@ -42,6 +43,7 @@
+@@ -46,6 +46,7 @@
  #include <winsock2.h>
  #include <ws2tcpip.h>
  #endif
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 9c88dc1ab..c82691685 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -9,12 +9,14 @@ etc/gdm/Xsession
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
 etc/gdm/gdm.schemas
+libdata/bonobo/servers/GNOME_GdmUserSwitchApplet.server
 libexec/gdm-factory-slave
 libexec/gdm-product-slave
 libexec/gdm-session-worker
 libexec/gdm-simple-chooser
 libexec/gdm-simple-greeter
 libexec/gdm-simple-slave
+libexec/gdm-user-switch-applet
 libexec/gdm-xdmcp-chooser-slave
 %%PAM_MISC%%libexec/gdmaskpass
 sbin/gdm
@@ -22,7 +24,10 @@ sbin/gdm-binary
 sbin/gdm-restart
 sbin/gdm-safe-restart
 sbin/gdm-stop
+%%DATADIR%%/gdm-a11y-preferences-dialog.glade
 %%DATADIR%%/gdm-greeter-login-window.glade
+%%DATADIR%%/gdm-user-switch-applet.glade
+share/gnome-2.0/ui/GNOME_GdmUserSwitchApplet.xml
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
 share/icons/hicolor/32x32/apps/gdm-xnest.png
@@ -64,6 +69,7 @@ share/locale/is/LC_MESSAGES/gdm.mo
 share/locale/it/LC_MESSAGES/gdm.mo
 share/locale/ja/LC_MESSAGES/gdm.mo
 share/locale/ka/LC_MESSAGES/gdm.mo
+share/locale/kn/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo