Update to 2.6.0.7.

- Convert to use bsd.pkg.options.mk.
- Fix PAM handling; the gdmaskpass binary seems to be only available when
  building with linux-pam, which resulted in broken PLISTs before.

Changes in this version:
- Now using CVS head of vicious-extensions, left out of previous release due
  to schedule freeze.
- Do not init the wm twice if gdm_wm_init is called twice. (George)
- Always destroy dialog widget in greeter to fix non-fatal error dialogs from
  hanging around. (George)
- Leak corrected in daemon/verify-pam.c. (George)
- Corrected g_strconcat call in gui/gdmsetup.c. (meissner@suse.de)
- Added Afrikaans, Northern Sotho, South African English, and Zulu to language
  translations. (Dwayne Baily)
- Updated build files so it can be built and distributed with new buildtools
  than 1.4.   makedist fixes, etc.

5 files changed, 42 insertions, 35 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 5143be4b20f..8deceefa3a6 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2005/01/14 05:15:40 jlam Exp $
+# $NetBSD: Makefile,v 1.74 2005/02/03 13:37:03 jmmv Exp $
 #
 
-DISTNAME=	gdm-2.6.0.6
+DISTNAME=	gdm-2.6.0.7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -27,6 +27,10 @@ GNU_CONFIGURE=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gdm
+PKG_SUPPORTED_OPTIONS=	inet6 PAM
+.include "../../mk/bsd.options.mk"
+
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
@@ -75,8 +79,6 @@ SUBST_SED.desktop+=	-e 's|^\#RebootCommand=.*$$|RebootCommand=/sbin/shutdown -r
 SUBST_SED.desktop+=	-e 's|^\#HaltCommand=.*$$|HaltCommand=/sbin/shutdown -p now|g'
 .endif
 
-BUILD_DEFS+=		USE_INET6
-
 .if ${OPSYS} == "SunOS"
 CFLAGS+=	-DSunOS
 GDMOWN=		daemon
@@ -86,7 +88,7 @@ GDMOWN=		daemon
 GDMGRP=		daemon
 .endif
 
-.if !empty(USE_INET6:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
@@ -94,11 +96,14 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	X_SERVER_ARGS="vt05"
 .endif
 
-BUILD_DEFS+=	USE_PAM
-.if defined(USE_PAM)
+.if !empty(PKG_OPTIONS:MPAM)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-authentication-scheme=pam
+.  if ${PAM_TYPE} == "linux-pam"
 PLIST_SUBST+=		PAM_MISC=""
+.  else
+PLIST_SUBST+=		PAM_MISC="@comment "
+.  endif
 .elif exists(/etc/shadow)
 CONFIGURE_ARGS+=	--enable-authentication-scheme=shadow
 PLIST_SUBST+=		PAM_MISC="@comment "
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 66a6f1ecd08..3b4c14dca3f 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/09/22 08:09:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/02/03 13:37:03 jmmv Exp $
 bin/gdm
 bin/gdm-binary
 bin/gdmXnest
@@ -146,6 +146,7 @@ ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/nso/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gdm.mo
@@ -166,6 +167,7 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gdm.mo
 share/omf/gdm/gdm-C.omf
 share/omf/gdm/gdm-de.omf
 share/omf/gdm/gdm-es.omf
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 02ebff25b9c..bde741551a0 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.19 2004/12/28 21:51:12 jmmv Exp $
+$NetBSD: distinfo,v 1.20 2005/02/03 13:37:03 jmmv Exp $
 
-SHA1 (gdm-2.6.0.6.tar.bz2) = 4fade91ee1ceb35901e0503555d3b8f4d1da9849
-Size (gdm-2.6.0.6.tar.bz2) = 3216098 bytes
+SHA1 (gdm-2.6.0.7.tar.bz2) = 55fd0a5fa69c66e34f2392e709a09f5f11e8ce26
+Size (gdm-2.6.0.7.tar.bz2) = 3345365 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (patch-aa) = d37a6b1a7fe1eec6d351b3f25015d1e901f8f3b4
-SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516
-SHA1 (patch-ae) = f05e3bffbcb1522ac6265869eef52655d35511c2
+SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
+SHA1 (patch-ae) = 358dc369e2bb7380b5c6bf7145c8822edba0330e
 SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
 SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
diff --git a/x11/gdm/patches/patch-ac b/x11/gdm/patches/patch-ac
index 8c8d4a2a0b9..4b7d6ef2c94 100644
--- a/x11/gdm/patches/patch-ac
+++ b/x11/gdm/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2004/01/20 13:41:06 xtraeme Exp $
+$NetBSD: patch-ac,v 1.4 2005/02/03 13:37:03 jmmv Exp $
 
---- gui/modules/Makefile.in.orig	2004-01-09 18:28:33.000000000 -0600
+--- gui/modules/Makefile.in.orig	2005-02-02 18:35:48.000000000 +0100
 +++ gui/modules/Makefile.in
-@@ -23,7 +23,7 @@ bindir = @bindir@
+@@ -269,7 +269,7 @@ prefix = @prefix@
+ program_transform_name = @program_transform_name@
  sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
+ sharedstatedir = @sharedstatedir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = @datadir@/examples
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
+ target_alias = @target_alias@
+ INCLUDES = \
+ 	-I.						\
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index 392195998e9..68e32d3d8d7 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
+$NetBSD: patch-ae,v 1.7 2005/02/03 13:37:03 jmmv Exp $
 
---- config/Makefile.in.orig	2004-06-11 18:41:00.000000000 +0200
+--- config/Makefile.in.orig	2005-02-02 18:35:44.000000000 +0100
 +++ config/Makefile.in
-@@ -23,7 +23,7 @@ bindir = @bindir@
+@@ -240,7 +240,7 @@ prefix = @prefix@
+ program_transform_name = @program_transform_name@
  sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
+ sharedstatedir = @sharedstatedir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = @datadir@/examples
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -301,11 +301,11 @@ gettextfoo.h: XKeepsCrashing Xsession.in
+ target_alias = @target_alias@
+ pixmapdir = $(datadir)/pixmaps
+ confdir = $(sysconfdir)/gdm
+@@ -478,11 +478,11 @@ uninstall-hook:
  install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Default PostSession PreSession
  	if test '!' -d $(DESTDIR)$(confdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(confdir); \
@@ -25,7 +25,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
  	fi
  	-if cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \
  		cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/gdm.conf.orig; \
-@@ -319,19 +319,16 @@ install-data-hook: gdm.conf Xsession gno
+@@ -496,19 +496,16 @@ install-data-hook: gdm.conf Xsession gno
  	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
  	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
  
@@ -48,7 +48,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
  	fi
  
  	-if test -f $(DESTDIR)$(bisessdir)/Default.desktop; then \
-@@ -362,7 +359,7 @@ install-data-hook: gdm.conf Xsession gno
+@@ -539,7 +536,7 @@ install-data-hook: gdm.conf Xsession gno
  
  	if test '!' -d $(DESTDIR)$(initdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(initdir); \
@@ -57,7 +57,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
  	fi
  	-if test -f $(DESTDIR)$(initdir)/Default; then \
  		cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
-@@ -371,13 +368,13 @@ install-data-hook: gdm.conf Xsession gno
+@@ -548,13 +545,13 @@ install-data-hook: gdm.conf Xsession gno
  
  	if test '!' -d $(DESTDIR)$(postlogindir); then \
  		$(mkinstalldirs) $(DESTDIR)$(postlogindir); \
@@ -73,7 +73,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
  	fi
  	-if test -f $(DESTDIR)$(predir)/Default; then \
  		cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
-@@ -386,7 +383,7 @@ install-data-hook: gdm.conf Xsession gno
+@@ -563,7 +560,7 @@ install-data-hook: gdm.conf Xsession gno
  
  	if test '!' -d $(DESTDIR)$(postdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(postdir); \
@@ -82,7 +82,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
  	fi
  	-if test -f $(DESTDIR)$(postdir)/Default; then \
  		cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
-@@ -395,26 +392,14 @@ install-data-hook: gdm.conf Xsession gno
+@@ -572,26 +569,14 @@ install-data-hook: gdm.conf Xsession gno
  
  	if test '!' -d $(DESTDIR)$(gnomercdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(gnomercdir); \