- Create /var/gdm and /var/log/gdm directories during installation. These

  are *REQUIRED* (in fact, only the former) to get gdm working.
- Manually set 'procname' in the rc.d script so that 'gdm stop' works.
- Allow the rc.d script to work w/o rc.subr.
- Use PAM's buildlink2.mk file instead of a simple DEPENDS.
- Remove useless stuff from PLIST.
- Simplify Makefile a bit.
- As a result, bump PKGREVISION to 1.

3 files changed, 23 insertions, 26 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 891ede1a66a..9ed2c445ffc 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2004/01/20 13:41:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.43 2004/01/22 09:16:59 jmmv Exp $
 #
 
 DISTNAME=	gdm-2.4.4.7
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.4/} \
 		${MASTER_SITE_LOCAL}
@@ -19,23 +20,20 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-LOCALSTATEDIR=		/var
-
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
+CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 CONFIGURE_ENV+=		X11BASE=${X11BASE} GDMOWN=${GDMOWN} GDMGRP=${GDMGRP}
 MAKE_ENV+=		ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
 MAKE_ENV+=		CHMOD=${CHMOD} CHOWN=${CHOWN}
-PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-PLIST_SUBST+=		LOCALSTATEDIR="${LOCALSTATEDIR}"
-FILES_SUBST+=		LOCALSTATEDIR="${LOCALSTATEDIR}"
 
 OWN_DIRS=		${PKG_SYSCONFDIR}/dm/Sessions
 OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/Init
 OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/PostSession
 OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/PreSession
 OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/modules
+OWN_DIRS+=		/var/gdm
+OWN_DIRS+=		/var/log/gdm
 
 EGDIR=			${PREFIX}/share/examples
 CONF_FILES=		${EGDIR}/dm/Sessions/default.desktop \
@@ -75,7 +73,7 @@ GDMGRP=		daemon
 BUILD_DEFS+=	USE_PAM
 
 .if defined(USE_PAM)
-DEPENDS+=		PAM-[0-9]*:../../security/PAM
+.include "../../security/PAM/buildlink2.mk"
 PLIST_SUBST+=		PAM_MISC=""
 .else
 PLIST_SUBST+=		PAM_MISC="@comment "
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 41bf79725a2..b1614b7be7a 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/20 13:41:06 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/01/22 09:16:59 jmmv Exp $
 bin/gdm
 bin/gdm-binary
 bin/gdmXnest
@@ -158,14 +158,5 @@ share/xsessions/gnome.desktop
 @dirrm share/examples/dm/Sessions
 @dirrm share/examples/dm
 @dirrm share/doc/gdm
-@comment @dirrm share/doc
-@comment @dirrm share/applications
-@comment @dirrm lib/gtk-2.0/modules
-@unexec ${RM} -rf ${LOCALSTATEDIR}/gdm
-@comment unexec ${RMDIR} ${PKG_SYSCONFDIR}/gdm/modules 2>/dev/null || ${TRUE}
-@comment unexec ${RMDIR} ${PKG_SYSCONFDIR}/gdm/PreSession 2>/dev/null || ${TRUE}
-@comment unexec ${RMDIR} ${PKG_SYSCONFDIR}/gdm/PostSession 2>/dev/null || ${TRUE}
-@comment unexec ${RMDIR} ${PKG_SYSCONFDIR}/gdm/Init 2>/dev/null || ${TRUE}
-@comment unexec ${RMDIR} ${PKG_SYSCONFDIR}/gdm 2>/dev/null || ${TRUE}
-@comment unexec ${RMDIR} ${PKG_SYSCONFDIR}/dm/Session 2>/dev/null || ${TRUE}
-@comment unexec ${RMDIR} ${PKG_SYSCONFDIR}/dm 2>/dev/null || ${TRUE}
+@comment in gnome2-dirs: @dirrm share/applications
+@comment in gtk2: @dirrm lib/gtk-2.0/modules
diff --git a/x11/gdm/files/gdm.sh b/x11/gdm/files/gdm.sh
index 20a4aa0338e..1e9976f1a4d 100755
--- a/x11/gdm/files/gdm.sh
+++ b/x11/gdm/files/gdm.sh
@@ -1,20 +1,28 @@
 #!/bin/sh
 #
-# $NetBSD: gdm.sh,v 1.1 2004/01/20 13:41:06 xtraeme Exp $
+# $NetBSD: gdm.sh,v 1.2 2004/01/22 09:16:59 jmmv Exp $
 #
 
 # PROVIDE: gdm
 # REQUIRE: DAEMON LOGIN wscons
 # KEYWORD: shutdown
 
-. /etc/rc.subr
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
 
 name="gdm"
-rcvar=$name
+rcvar=${name}
 command="@PREFIX@/bin/${name}"
-pidfile="@LOCALSTATEDIR@/run/${name}.pid"
+pidfile="/var/run/${name}.pid"
+procname="@PREFIX@/bin/gdm-binary"
 required_files="@PKG_SYSCONFDIR@/gdm/gdm.conf"
 extra_commands="reload"
 
-load_rc_config $name
-run_rc_command "$1"
+if [ -f /etc/rc.subr ]; then
+	load_rc_config ${name}
+	run_rc_command "$1"
+else
+	echo -n " ${name}"
+	${command} ${gdm_flags} ${command_args}
+fi