update to 2.18.1

This moves this pkg to the new stable gnome branch, too much to list here.

pkgsrc notes:
-look for X server at ${X11BASE}/bin/X too, to make it work with
 modular-xorg out of the box
-improved paths to shutdown etc. for netbsd
-Use dbus-launch to start gnome-session on netbsd, to avoid the autostart
 which fails for me. At least Debian does so too.

6 files changed, 52 insertions, 44 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 93fcf3b2950..7a83a5126ef 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.123 2007/03/21 12:05:55 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2007/04/11 20:40:07 drochner Exp $
 #
 
-DISTNAME=	gdm-2.16.4
-PKGREVISION=	1
+DISTNAME=	gdm-2.18.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.16/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.18/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -67,7 +66,7 @@ SUBST_CLASSES+=		desktop
 SUBST_MESSAGE.desktop=	Configuring GDM settings.
 SUBST_STAGE.desktop=	pre-configure
 SUBST_FILES.desktop=	config/default.desktop.in
-SUBST_FILES.desktop+=	config/gnome.desktop.in
+#SUBST_FILES.desktop+=	config/gnome.desktop.in
 SUBST_FILES.desktop+=	config/gdm.conf.in
 SUBST_SED.desktop=	-e 's/^_//g'
 SUBST_SED.desktop+=	-e 's|^User=gdm$$|User=${GDMOWN}|g'
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index bda09929b78..84c257f709b 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2006/10/30 21:44:28 drochner Exp $
+@comment $NetBSD: PLIST,v 1.32 2007/04/11 20:40:07 drochner Exp $
 ${DMX}bin/gdm-dmx-reconnect-proxy
 bin/gdmXnest
 bin/gdmXnestchooser
@@ -100,6 +100,7 @@ share/icons/hicolor/32x32/apps/gdm-xnest.png
 share/locale/af/LC_MESSAGES/gdm.mo
 share/locale/am/LC_MESSAGES/gdm.mo
 share/locale/ar/LC_MESSAGES/gdm.mo
+share/locale/as/LC_MESSAGES/gdm.mo
 share/locale/az/LC_MESSAGES/gdm.mo
 share/locale/be/LC_MESSAGES/gdm.mo
 share/locale/bg/LC_MESSAGES/gdm.mo
@@ -158,7 +159,6 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo
 share/locale/ro/LC_MESSAGES/gdm.mo
 share/locale/ru/LC_MESSAGES/gdm.mo
 share/locale/rw/LC_MESSAGES/gdm.mo
-share/locale/si/LC_MESSAGES/gdm.mo
 share/locale/sk/LC_MESSAGES/gdm.mo
 share/locale/sl/LC_MESSAGES/gdm.mo
 share/locale/sq/LC_MESSAGES/gdm.mo
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 81173c45fad..b1ea52aa455 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.47 2007/03/27 22:14:50 wiz Exp $
+$NetBSD: distinfo,v 1.48 2007/04/11 20:40:07 drochner Exp $
 
-SHA1 (gdm-2.16.4.tar.bz2) = 61c9c2f5a29c99aaa85d2b76164540b949b2656b
-RMD160 (gdm-2.16.4.tar.bz2) = afccb19cb0e56af9a464fa538de4f59191705142
-Size (gdm-2.16.4.tar.bz2) = 3139838 bytes
-SHA1 (patch-aa) = fa8fa6ca6b5d984b170454a7832f6faa3966a95d
+SHA1 (gdm-2.18.1.tar.bz2) = 70b902ff810a69109746c135dd095db34982a9d0
+RMD160 (gdm-2.18.1.tar.bz2) = cb2296bc61eccd6dfa8df8ad071a14e58f8dd80d
+Size (gdm-2.18.1.tar.bz2) = 3460665 bytes
+SHA1 (patch-aa) = 56232879fbb5d885aa164e94baf3368e950c433f
 SHA1 (patch-ab) = b151843608e3418962dfcbfd454cf0ba8aac39e0
 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
-SHA1 (patch-ad) = 178af8c365ecdb1c9e49d6d9ef7e9bc2dd86a1d0
-SHA1 (patch-ae) = 9f159a277f9526ca3c2085b45b76d0449eeb2a69
+SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027
 SHA1 (patch-ak) = e3eaf2dfa1e393f9808d22fe4384710a46a83afc
 SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 943bd31d8f8..4b6558fb2c3 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.20 2006/09/26 16:17:04 drochner Exp $
+$NetBSD: patch-aa,v 1.21 2007/04/11 20:40:07 drochner Exp $
 
---- configure.orig	2006-09-04 23:27:10.000000000 +0200
+--- configure.orig	2007-04-09 07:16:44.000000000 +0200
 +++ configure
-@@ -28633,7 +28633,9 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28786,7 +28786,9 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <sys/statvfs.h>
@@ -12,7 +12,35 @@ $NetBSD: patch-aa,v 1.20 2006/09/26 16:17:04 drochner Exp $
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -33911,6 +33913,7 @@ else
+@@ -34136,6 +34138,15 @@ case "$host" in
+ 	SOUND_PROGRAM=
+         GDMGNOMESESSIONCMD=gnome-session
+ 	;;
++*netbsd*)
++	GDM_USER_PATH="/bin:/usr/bin"
++	HALT_COMMAND="/sbin/shutdown -p now"
++	REBOOT_COMMAND="/sbin/shutdown -r now"
++	SUSPEND_COMMAND="/usr/sbin/zzz"
++	XSESSION_SHELL=/bin/sh
++	SOUND_PROGRAM=/usr/bin/audioplay
++	GDMGNOMESESSIONCMD="dbus-launch --exit-with-session gnome-session"
++	;;
+ *)
+         GDM_USER_PATH="/bin:/usr/bin"
+         HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
+@@ -34199,6 +34210,11 @@ elif test -x /usr/bin/X; then
+    X_SERVER_PATH="/usr/bin"
+    X_SERVER="/usr/bin/X"
+    X_CONFIG_OPTIONS="-audit 0"
++elif test -x ${X11BASE}/bin/X; then
++   X_PATH="${X11BASE}/bin"
++   X_SERVER_PATH="${X11BASE}/bin"
++   X_SERVER="${X11BASE}/bin/X"
++   X_CONFIG_OPTIONS="-audit 0"
+ else
+    # what to do, what to do, this is wrong, but this just sets the
+    # defaults, perhaps this user is cross compiling or some such
+@@ -34208,6 +34224,7 @@ else
     GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
     X_CONFIG_OPTIONS="-audit 0"
  fi
diff --git a/x11/gdm/patches/patch-ad b/x11/gdm/patches/patch-ad
deleted file mode 100644
index c1963bff42d..00000000000
--- a/x11/gdm/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2007/03/27 22:14:50 wiz Exp $
-
---- docs/C/gdm.xml.orig	2006-12-13 18:43:36.000000000 +0000
-+++ docs/C/gdm.xml
-@@ -10,6 +10,13 @@
-   <articleinfo>
-     <title>Gnome Display Manager Reference Manual</title>
- 
-+    <revhistory>
-+      <revision>
-+        <revnumber>0.0</revnumber>
-+        <date>2007-01</date>
-+      </revision>
-+    </revhistory>
-+ 
-     <abstract role="description">
-       <para>
-         GDM is the GNOME Display Manager, a graphical login program.
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index e29e3c83f04..a165583b756 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.12 2006/07/26 12:36:12 drochner Exp $
+$NetBSD: patch-ae,v 1.13 2007/04/11 20:40:08 drochner Exp $
 
---- config/Makefile.in.orig	2006-05-23 21:33:18.000000000 +0200
+--- config/Makefile.in.orig	2007-03-11 22:48:34.000000000 +0100
 +++ config/Makefile.in
-@@ -565,10 +565,6 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -582,10 +582,6 @@ install-data-hook: gdm.conf gdm.conf-cus
  		$(mkinstalldirs) $(DESTDIR)$(confdir); \
  		chmod 755 $(DESTDIR)$(confdir); \
  	fi
@@ -13,19 +13,19 @@ $NetBSD: patch-ae,v 1.12 2006/07/26 12:36:12 drochner Exp $
  	if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \
  		$(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
  		chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
-@@ -597,10 +593,7 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -614,10 +610,7 @@ install-data-hook: gdm.conf gdm.conf-cus
  	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
  	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
  
--	-if test -f $(DESTDIR)$(localedir)/locale.alias; then \
--		cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
+-	-if test -f $(DESTDIR)$(gdmlocaledir)/locale.alias; then \
+-		cp -f $(DESTDIR)$(gdmlocaledir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias.orig; \
 -	fi
--	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias
+-	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias
 +	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(confdir)/locale.alias
  
  	if test '!' -d $(DESTDIR)$(bisessdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
-@@ -678,20 +671,8 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -695,20 +688,8 @@ install-data-hook: gdm.conf gdm.conf-cus
  		chmod 755 $(DESTDIR)$(gnomercdir); \
  	fi