Update to 2.14.2. Based on patch provided by drochner@.

2.14.2 stuff:

- Now include gui/gdmthemetester.in in the distribution.  It being missing
  was causing the module to fail to compile.  (Brian Cameron)

- Fix to the BROADCAST key in gdmchooser so it should now work.  (Brian
  Cameron, kudos to Tiago Vignatti)

- Further cleanups to Addresses CVE-2006-1057.  (Hans Petter Jansson,
  Ray Strode)

- Path and RootPath now do not contain /usr/bin or /bin more than once.
  (Brian Cameron)

- Translation updates (Takeshi AIHANA, \305\275ygimantas Beru\304\215ka,
  Laurent Dhima, Pema Geyleg, Lukas Novotny)

2.14.1 stuff:

- The sockets connection between the slaves and the GDM daemon is now
  better managed to better ensure that sockets are never left open.
  This work also makes gdmsetup start faster.  (Brian Cameron)

- Corrected bug that causes a core dump when you click on gdmgreeter
  fields that have an id.  (Brian Cameron)

- Add new GdmXserverTimeout configuration setting so that the length of
  time GDM waits for the Xserver to start can be tuned, so GDM better
  works with Xservers that require more than 10 seconds to start.
  (Emilie)

- The happygnome and happygnome-list gdmgreeter themes now use the
  official logo.  (Brian Cameron)

- Now GDM configure supports --with-sysconfsubdir so that GDM's
  configuration directory can be configured to not have "/gdm" appended
  to the end.  (Julio M. Merino Vidal)

- Fix for ensuring .ICEauthority file has proper ownership/permissions.
  Addresses CVE-2006-1057.  (Hans Petter Jansson)

- Fix "Show Actions Menu" section in gdmsetup so it appears when both
  "Plain" and "Themed" style is chosen.  (Brian Cameron, Dennis
  Cranston)

- Now use LINGUAS procedure for defining languages.  (Michiel Sikkes)

- Now Xsession script uses "$@" instead of "$1" so it is possible to
  pass arguments with the command to run.  (Brian Cameron)

- Add Trusted Solraris support.  (Niall Power)

- One line fix to Solaris auditing logic that fixes a bug causing
  authentication to fail when auditing is turned on.  (Brian Cameron)

- Fixes to compile with C99 and fixes to compile under NetBSD.
  Remove EXPANDED_* variables from the configure.  (Julio M. Merino
  Vidal)

- Translation updates (\305\275ygimantas Beru\304\215ka, Beno\303\256t
  Dejean, Laurent Dhima, Maxim Dziumanenko, Alessio Frusciante, Rhys
  Jones, Raphael Higino, Theppitak Karoonboonyanan, Gabor Kelmen,
  Priit Laes, Jordi Mallach, Kjartan Maraas, Daniel Nylander, Kostas
  Papdimas, Guilherme de S. Pastore, Ankit Patel, Ignacio Casal
  Quinteiro, Hendrik Richter, Jens Seidel, Francisco Javier F. Serrador,
  Alexander Shopov, Clytie Siddall, Ilkka Tuohela, Vincent van Adrighem,
  Tommi Vainikaninen)

1 files changed, 16 insertions, 16 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 15d1aea3261..fa106513cdf 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2006/04/22 09:22:17 rillig Exp $
+# $NetBSD: Makefile,v 1.110 2006/05/01 09:50:25 jmmv Exp $
 #
 
-DISTNAME=	gdm-2.14.0
-PKGREVISION=	2
+DISTNAME=	gdm-2.14.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -27,35 +26,36 @@ PKG_SUPPORTED_OPTIONS=	inet6 pam
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-dmconfdir=${PKG_SYSCONFDIR:Q}/dm
+CONFIGURE_ARGS+=	--with-sysconfsubdir=
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
 CONFIGURE_ENV+=		X11BASE=${X11BASE:Q}
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
-INSTALL_MAKE_FLAGS+=	GDM_CUSTOM_CONF=${EGDIR}/gdm/custom.conf
-INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+INSTALL_MAKE_FLAGS+=	GDM_CUSTOM_CONF=${EGDIR:Q}/custom.conf
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
 MAKE_ENV+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
 
-OWN_DIRS=		${PKG_SYSCONFDIR}/dm
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/Init
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/PostLogin
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/PostSession
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/PreSession
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/modules
+OWN_DIRS=		${PKG_SYSCONFDIR}/Init
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PostLogin
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PostSession
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PreSession
+OWN_DIRS+=		${PKG_SYSCONFDIR}/dm
+OWN_DIRS+=		${PKG_SYSCONFDIR}/modules
 OWN_DIRS+=		${VARBASE}/gdm
 OWN_DIRS+=		${VARBASE}/log/gdm
 
-EGDIR=			${PREFIX}/share/examples
+PKG_SYSCONFSUBDIR=	gdm
+EGDIR=			${PREFIX}/share/examples/gdm
 CONF_FILES=
 .for f in custom.conf locale.alias \
 	modules/AccessDwellMouseEvents modules/AccessKeyMouseEvents \
 	modules/factory-AccessDwellMouseEvents \
 	modules/factory-AccessKeyMouseEvents
-CONF_FILES+=		${EGDIR}/gdm/${f} \
-			${PKG_SYSCONFDIR}/gdm/${f}
+CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 .for f in Init/Default PostLogin/Default.sample PostSession/Default \
 	PreSession/Default XKeepsCrashing Xsession
-CONF_FILES_PERMS+=	${EGDIR}/gdm/${f} \
-			${PKG_SYSCONFDIR}/gdm/${f} \
+CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
 			${ROOT_USER} ${ROOT_GROUP} 0755
 .endfor
 RCD_SCRIPTS=		gdm