- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

5 files changed, 70 insertions, 0 deletions

diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
new file mode 100644
index 000000000000..21228ae93803
--- /dev/null
+++ b/x11/xdm/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	xdm
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xdm
+PORTVERSION=	1.1.4
+PORTREVISION=	1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org X display manager
+
+XORG_CAT=	app
+USE_XORG=	xmu x11 xau xinerama xpm xdmcp xt xext xaw
+
+MAN1=		xdm.1
+
+.include <bsd.port.mk>
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
new file mode 100644
index 000000000000..422010e75603
--- /dev/null
+++ b/x11/xdm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdm-1.1.4.tar.bz2) = a2b4c280f3e324d081a0d9ed76a8a123
+SHA256 (xorg/app/xdm-1.1.4.tar.bz2) = 928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073
+SIZE (xorg/app/xdm-1.1.4.tar.bz2) = 386272
diff --git a/x11/xdm/files/patch-greeter-greet.c b/x11/xdm/files/patch-greeter-greet.c
new file mode 100644
index 000000000000..b8a221de6e37
--- /dev/null
+++ b/x11/xdm/files/patch-greeter-greet.c
@@ -0,0 +1,19 @@
+--- greeter/greet.c.orig	Sat Feb  3 01:25:25 2007
++++ greeter/greet.c	Wed Apr  4 14:03:31 2007
+@@ -612,6 +617,7 @@ greet_user_rtn GreetUser(
+     }
+     DeleteXloginResources (d, *dpy);
+     CloseGreet (d);
++    login = NULL;
+     Debug ("Greet loop finished\n");
+     /*
+      * Run system-wide initialization file
+@@ -697,6 +704,8 @@ static int pamconv(int num_msg,
+     m = *msg;
+     r = *response;
+ 
++    if (login == NULL) goto pam_error;
++
+     for (i = 0; i < num_msg; i++ , m++ , r++) {
+ 	char *username;
+ 	int promptId = 0;
diff --git a/x11/xdm/pkg-descr b/x11/xdm/pkg-descr
new file mode 100644
index 000000000000..83b0099172ed
--- /dev/null
+++ b/x11/xdm/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xdm, the X.Org X Display manager.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
new file mode 100644
index 000000000000..d25049043c4f
--- /dev/null
+++ b/x11/xdm/pkg-plist
@@ -0,0 +1,23 @@
+bin/xdm
+bin/xdmshell
+lib/X11/xdm/pixmaps/xorg-bw.xpm
+lib/X11/xdm/pixmaps/xorg.xpm
+lib/X11/xdm/Xaccess
+lib/X11/xdm/GiveConsole
+lib/X11/xdm/TakeConsole
+lib/X11/xdm/Xsetup_0
+lib/X11/xdm/Xstartup
+lib/X11/xdm/Xreset
+lib/X11/xdm/Xwilling
+lib/X11/xdm/xdm-config
+lib/X11/xdm/Xresources
+lib/X11/xdm/Xservers
+lib/X11/xdm/Xsession
+lib/X11/xdm/libXdmGreet.so
+lib/X11/xdm/libXdmGreet.la
+lib/X11/xdm/libXdmGreet.a
+lib/X11/xdm/chooser
+share/X11/app-defaults/Chooser
+@dirrmtry share/X11/app-defaults
+@dirrm lib/X11/xdm/pixmaps
+@dirrm lib/X11/xdm