Update to version 1.1.6. The newly added patch corrects the 800x600

section in Xresources.cpp.  In addition, this release brings the following
changes:



    - Debian Bug #376391: xdm manpage refers to non-existent section
      'Typical Usage'

    - Debian Bug #437961: loading Xresources fails because bindir/xrdb
      does not exist

    - Update AC_DEFINE_DIR to autoconf-2.60-compatible version

    - Add AM_PROG_CC_C_O to clear automake-1.10 warning

    - Makefile.am:149: compiling `chooser.c' with per-target flags
      requires `AM_PROG_CC_C_O' in `configure.ac'

    - Bug #10530: xdm's path to xrdb could be configurable at compile time

    - Set default cursor for entire root window, not just greeter

    - Make #ifdef XPM only control whether XPM pixmap logo is shown

    - Make 3D look-and-feel independent of XPM

    - Set Xcursor theme to whiteglass in default login screen resources

    - X.Org Bug #10992: xlogin crashes if window size is too small

    - Add --enable-xdm-auth/--disable-xdm-auth to configure options

    - X.Org Bug 10632 / Debian Bug 256299: race condition in
      policy.c:Willing()

    - Document more of the greeter resources in xdm man page

    - Bug #11096: xdm(1) manpage should document Xft-related properties

    - Bug #11020: xdm doesn't set SSH_AUTH_SOCK even though using
      with pam_ssh

    - Wasn't calling pam_setcred()/pam_getenvlist() if setusercontext()
      was present

    - X.Org Bugzilla #11020:
      <https://bugs.freedesktop.org/show_bug.cgi?id=11020>

3 files changed, 28 insertions, 7 deletions

diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 7d144840f99..720f386d246 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2007/11/07 17:17:55 abs Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/18 02:54:15 bjs Exp $
 
-DISTNAME=	xdm-1.1.4
-PKGREVISION=	4
+DISTNAME=	xdm-1.1.6
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/app/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
index 1cbaf1cc058..92676cacb1f 100644
--- a/x11/xdm/distinfo
+++ b/x11/xdm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/08/06 14:56:33 tron Exp $
+$NetBSD: distinfo,v 1.2 2008/01/18 02:54:15 bjs Exp $
 
-SHA1 (xdm-1.1.4.tar.bz2) = facf81071a4308c63f3dfd897d7f4a755da5b1bd
-RMD160 (xdm-1.1.4.tar.bz2) = 40a13574822349e030310de0729eb0b37c95847a
-Size (xdm-1.1.4.tar.bz2) = 386272 bytes
+SHA1 (xdm-1.1.6.tar.bz2) = 9b5642407f01bbdaa8ad699e2d2417bd26372c53
+RMD160 (xdm-1.1.6.tar.bz2) = 24f5d5fef2e608b7a0a0f7efd174e4d536663c90
+Size (xdm-1.1.6.tar.bz2) = 394175 bytes
+SHA1 (patch-aa) = f2308286759f5af228fea0e0dfe4934b56a4b591
diff --git a/x11/xdm/patches/patch-aa b/x11/xdm/patches/patch-aa
new file mode 100644
index 00000000000..df99320247d
--- /dev/null
+++ b/x11/xdm/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2008/01/18 02:54:15 bjs Exp $
+
+--- config/Xresources.cpp.orig	2008-01-17 21:46:07.000000000 -0500
++++ config/Xresources.cpp
+@@ -36,6 +36,16 @@ xlogin*greetFace:	Serif-24:bold:italic
+ xlogin*face: 		Helvetica-18
+ xlogin*promptFace: 	Helvetica-18:bold
+ xlogin*failFace: 	Helvetica-18:bold
++XHASHelse
++xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
++xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
++xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
++xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
++xlogin*greetFace:	Serif-18:bold:italic
++xlogin*face:		Helvetica-12
++xlogin*promptFace:	Helvetica-12:bold
++xlogin*failFace:	Helvetica-14:bold
++XHASHendif
+ 
+ XHASHifdef COLOR
+ xlogin*borderWidth: 1