Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/gdm/Makefile,v
retrieving revision 1.138
diff -u -r1.138 Makefile
--- Makefile	25 Jun 2011 14:52:18 -0000	1.138
+++ Makefile	2 Aug 2011 19:10:56 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	gdm
 PORTVERSION=	2.30.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
Index: files/gdm.in
===================================================================
RCS file: /home/pcvs/ports/x11/gdm/files/gdm.in,v
retrieving revision 1.20
diff -u -r1.20 gdm.in
--- files/gdm.in	25 Jul 2010 19:35:05 -0000	1.20
+++ files/gdm.in	2 Aug 2011 19:10:56 -0000
@@ -1,26 +1,30 @@
 #!/bin/sh
+
 # $FreeBSD: ports/x11/gdm/files/gdm.in,v 1.20 2010/07/25 19:35:05 kwm Exp $
 #    $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.5 2010/07/21 13:50:46 kwm Exp $
-
+#
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus
 #
 # Add the following to /etc/rc.conf to start GDM at boot time:
 #
 # gdm_enable="YES"
-#
 
 . /etc/rc.subr
 . %%GNOME_SUBR%%
 
-gdm_enable=${gdm_enable-${gnome_enable}}
-gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO}
-gdm_lang=${gdm_lang-${LANG}}
-
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
 
 name="gdm"
 rcvar=`set_rcvar`
+
+load_rc_config ${name}
+
+gnome_enable=${gnome_enable:-NO}
+gdm_enable=${gdm_enable-${gnome_enable}}
+gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO}
+gdm_lang=${gdm_lang-${LANG}}
+
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/sbin/gdm-binary"
@@ -28,15 +32,14 @@
 
 gdm_start()
 {
-    if ! checkyesno gdm_enable ; then
-	return 0
-    fi
+    local iter
+
     echo "Starting ${name}."
 
     # make sure there is no pam configuration for gdm service in base system
     if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then
 	cp -p /etc/pam.d/gdm /etc/pam.d/gdm_disabled
-    	rm -f /etc/pam.d/gdm
+	unlink /etc/pam.d/gdm
     fi
 
     ( iter=0
@@ -49,6 +52,9 @@
     done
     iter=0
     while ! %%LOCALBASE%%/bin/lshal >/dev/null 2>&1 ; do
+	if [ ! -x %%LOCALBASE%%/bin/lshal ]; then
+	    err 1 "%%LOCALBASE%%/bin/lshal is not installed"
+	fi
 	if [ ${iter} -eq 60 ]; then
 	    break
 	fi
@@ -58,5 +64,4 @@
     LANG=${gdm_lang} ${command} ${gdm_flags} ) &
 }
 
-load_rc_config ${name}
 run_rc_command "$1"