Sun Apr 29 08:04:56 2012 UTC ()
Put xdm's config files in ${PKG_SYSCONFBASE}/xdm, install them using
CONF_FILES, and adjust the rc.d script. (As requested in PR#41102).

Bump PKGREVISION.


(sbd)
diff -r1.18 -r1.19 pkgsrc/x11/xdm/Makefile
diff -r1.3 -r1.4 pkgsrc/x11/xdm/PLIST
diff -r1.2 -r1.3 pkgsrc/x11/xdm/files/xdm.sh
cvs diff -r1.18 -r1.19 pkgsrc/x11/xdm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xdm/Makefile 2012/04/29 07:48:34 1.18
+++ pkgsrc/x11/xdm/Makefile 2012/04/29 08:04:56 1.19
@@ -1,28 +1,40 @@ @@ -1,28 +1,40 @@
1# $NetBSD: Makefile,v 1.18 2012/04/29 07:48:34 sbd Exp $ 1# $NetBSD: Makefile,v 1.19 2012/04/29 08:04:56 sbd Exp $
2 2
3DISTNAME= xdm-1.1.11 3DISTNAME= xdm-1.1.11
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=app/} 6MASTER_SITES= ${MASTER_SITE_XORG:=app/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= blair.sadewitz@gmail.com 9MAINTAINER= blair.sadewitz@gmail.com
9HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= X Display Manager from modular X.org 11COMMENT= X Display Manager from modular X.org
11 12
12DEPENDS+= sessreg-[0-9]*:../../x11/sessreg 13DEPENDS+= sessreg-[0-9]*:../../x11/sessreg
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
 17PKG_SYSCONFSUBDIR= xdm
 18CONFIGURE_ARGS+= --with-xdmconfigdir=${PKG_SYSCONFDIR:Q}
 19
 20EGDIR= ${PREFIX}/share/examples/xdm
 21INSTALL_MAKE_FLAGS+= xdmconfigdir=${EGDIR:Q}
 22
 23CONF_FILES+= ${EGDIR}/xdm-config ${PKG_SYSCONFDIR}/xdm-config
 24CONF_FILES+= ${EGDIR}/Xaccess ${PKG_SYSCONFDIR}/Xaccess
 25CONF_FILES+= ${EGDIR}/Xresources ${PKG_SYSCONFDIR}/Xresources
 26CONF_FILES+= ${EGDIR}/Xservers ${PKG_SYSCONFDIR}/Xservers
 27
16CONFIGURE_ARGS+= --enable-dynamic-greeter 28CONFIGURE_ARGS+= --enable-dynamic-greeter
17CONFIGURE_ARGS+= --enable-tcp-transport 29CONFIGURE_ARGS+= --enable-tcp-transport
18CONFIGURE_ARGS+= --enable-unix-transport 30CONFIGURE_ARGS+= --enable-unix-transport
19CONFIGURE_ARGS+= --enable-xdmshell 31CONFIGURE_ARGS+= --enable-xdmshell
20CONFIGURE_ARGS+= --with-appdefaultdir=${PREFIX}/lib/X11/app-defaults 32CONFIGURE_ARGS+= --with-appdefaultdir=${PREFIX}/lib/X11/app-defaults
21 33
22USE_TOOLS+= pkg-config 34USE_TOOLS+= pkg-config
23GNU_CONFIGURE= yes 35GNU_CONFIGURE= yes
24USE_LIBTOOL= yes 36USE_LIBTOOL= yes
25 37
26RCD_SCRIPTS= xdm 38RCD_SCRIPTS= xdm
27 39
28BUILD_DEFS+= VARBASE 40BUILD_DEFS+= VARBASE
cvs diff -r1.3 -r1.4 pkgsrc/x11/xdm/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xdm/PLIST 2011/11/09 18:28:40 1.3
+++ pkgsrc/x11/xdm/PLIST 2012/04/29 08:04:56 1.4
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1@comment $NetBSD: PLIST,v 1.3 2011/11/09 18:28:40 cheusov Exp $ 1@comment $NetBSD: PLIST,v 1.4 2012/04/29 08:04:56 sbd Exp $
2bin/xdm 2bin/xdm
3bin/xdmshell 3bin/xdmshell
4lib/X11/app-defaults/Chooser 4lib/X11/app-defaults/Chooser
5lib/X11/xdm/GiveConsole 5lib/X11/xdm/GiveConsole
6lib/X11/xdm/TakeConsole 6lib/X11/xdm/TakeConsole
7lib/X11/xdm/Xaccess 
8lib/X11/xdm/Xreset 7lib/X11/xdm/Xreset
9lib/X11/xdm/Xresources 
10lib/X11/xdm/Xservers 
11lib/X11/xdm/Xsession 8lib/X11/xdm/Xsession
12lib/X11/xdm/Xsetup_0 9lib/X11/xdm/Xsetup_0
13lib/X11/xdm/Xstartup 10lib/X11/xdm/Xstartup
14lib/X11/xdm/Xwilling 11lib/X11/xdm/Xwilling
15lib/X11/xdm/chooser 12lib/X11/xdm/chooser
16lib/X11/xdm/libXdmGreet.la 13lib/X11/xdm/libXdmGreet.la
17lib/X11/xdm/pixmaps/xorg-bw.xpm 14lib/X11/xdm/pixmaps/xorg-bw.xpm
18lib/X11/xdm/pixmaps/xorg.xpm 15lib/X11/xdm/pixmaps/xorg.xpm
19lib/X11/xdm/xdm-config 
20man/man1/xdm.1 16man/man1/xdm.1
21man/man1/xdmshell.1 17man/man1/xdmshell.1
22share/examples/rc.d/xdm 18share/examples/rc.d/xdm
 19share/examples/xdm/Xaccess
 20share/examples/xdm/Xresources
 21share/examples/xdm/Xservers
 22share/examples/xdm/xdm-config
cvs diff -r1.2 -r1.3 pkgsrc/x11/xdm/files/xdm.sh (expand / switch to unified diff)

--- pkgsrc/x11/xdm/files/xdm.sh 2007/08/06 16:43:40 1.2
+++ pkgsrc/x11/xdm/files/xdm.sh 2012/04/29 08:04:56 1.3
@@ -1,22 +1,20 @@ @@ -1,22 +1,20 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: xdm.sh,v 1.2 2007/08/06 16:43:40 tron Exp $ 3# $NetBSD: xdm.sh,v 1.3 2012/04/29 08:04:56 sbd Exp $
4# 4#
5 5
6# PROVIDE: xdm 6# PROVIDE: xdm
7# REQUIRE: DAEMON LOGIN wscons 7# REQUIRE: DAEMON LOGIN wscons
8# KEYWORD: shutdown 8# KEYWORD: shutdown
9 9
10$_rc_subr_loaded . /etc/rc.subr 10$_rc_subr_loaded . /etc/rc.subr
11 11
12name="xdm" 12name="xdm"
13rcvar=$name 13rcvar=$name
14xdm_config="/etc/X11/${name}/${name}-config" 
15command="@PREFIX@/bin/${name}" 14command="@PREFIX@/bin/${name}"
16command_args="-config ${xdm_config}" 15pidfile="@VARBASE@/run/${name}.pid"
17pidfile="/var/run/${name}.pid" 16required_files="@PKG_SYSCONFDIR@/xdm-config"
18required_files="${xdm_config}" 
19extra_commands="reload" 17extra_commands="reload"
20 18
21load_rc_config $name 19load_rc_config $name
22run_rc_command "$1" 20run_rc_command "$1"