diff options
| author | sbd <sbd@pkgsrc.org> | 2012-04-29 08:04:56 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-04-29 08:04:56 +0000 |
| commit | 03693335923e123d94ebad76a7450613d4881e88 (patch) | |
| tree | 6ae5247d0ccf3c55f11cd24b4f1cf6e9b1e11ffb /x11/xdm | |
| parent | ee9622f436a635769db44c9aed078b50802d2511 (diff) | |
| download | pkgsrc-03693335923e123d94ebad76a7450613d4881e88.tar.gz | |
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.
Diffstat (limited to 'x11/xdm')
| -rw-r--r-- | x11/xdm/Makefile | 14 | ||||
| -rw-r--r-- | x11/xdm/PLIST | 10 | ||||
| -rw-r--r-- | x11/xdm/files/xdm.sh | 8 |
3 files changed, 21 insertions, 11 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index ada241a3cf6..5546d071aa7 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2012/04/29 07:48:34 sbd Exp $ +# $NetBSD: Makefile,v 1.19 2012/04/29 08:04:56 sbd Exp $ DISTNAME= xdm-1.1.11 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -13,6 +14,17 @@ DEPENDS+= sessreg-[0-9]*:../../x11/sessreg PKG_DESTDIR_SUPPORT= user-destdir +PKG_SYSCONFSUBDIR= xdm +CONFIGURE_ARGS+= --with-xdmconfigdir=${PKG_SYSCONFDIR:Q} + +EGDIR= ${PREFIX}/share/examples/xdm +INSTALL_MAKE_FLAGS+= xdmconfigdir=${EGDIR:Q} + +CONF_FILES+= ${EGDIR}/xdm-config ${PKG_SYSCONFDIR}/xdm-config +CONF_FILES+= ${EGDIR}/Xaccess ${PKG_SYSCONFDIR}/Xaccess +CONF_FILES+= ${EGDIR}/Xresources ${PKG_SYSCONFDIR}/Xresources +CONF_FILES+= ${EGDIR}/Xservers ${PKG_SYSCONFDIR}/Xservers + CONFIGURE_ARGS+= --enable-dynamic-greeter CONFIGURE_ARGS+= --enable-tcp-transport CONFIGURE_ARGS+= --enable-unix-transport diff --git a/x11/xdm/PLIST b/x11/xdm/PLIST index 4547c67d727..9d6ae752b31 100644 --- a/x11/xdm/PLIST +++ b/x11/xdm/PLIST @@ -1,13 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2011/11/09 18:28:40 cheusov Exp $ +@comment $NetBSD: PLIST,v 1.4 2012/04/29 08:04:56 sbd Exp $ bin/xdm bin/xdmshell lib/X11/app-defaults/Chooser lib/X11/xdm/GiveConsole lib/X11/xdm/TakeConsole -lib/X11/xdm/Xaccess lib/X11/xdm/Xreset -lib/X11/xdm/Xresources -lib/X11/xdm/Xservers lib/X11/xdm/Xsession lib/X11/xdm/Xsetup_0 lib/X11/xdm/Xstartup @@ -16,7 +13,10 @@ lib/X11/xdm/chooser lib/X11/xdm/libXdmGreet.la lib/X11/xdm/pixmaps/xorg-bw.xpm lib/X11/xdm/pixmaps/xorg.xpm -lib/X11/xdm/xdm-config man/man1/xdm.1 man/man1/xdmshell.1 share/examples/rc.d/xdm +share/examples/xdm/Xaccess +share/examples/xdm/Xresources +share/examples/xdm/Xservers +share/examples/xdm/xdm-config diff --git a/x11/xdm/files/xdm.sh b/x11/xdm/files/xdm.sh index d2317ccef2c..2f813735b26 100644 --- a/x11/xdm/files/xdm.sh +++ b/x11/xdm/files/xdm.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: xdm.sh,v 1.2 2007/08/06 16:43:40 tron Exp $ +# $NetBSD: xdm.sh,v 1.3 2012/04/29 08:04:56 sbd Exp $ # # PROVIDE: xdm @@ -11,11 +11,9 @@ $_rc_subr_loaded . /etc/rc.subr name="xdm" rcvar=$name -xdm_config="/etc/X11/${name}/${name}-config" command="@PREFIX@/bin/${name}" -command_args="-config ${xdm_config}" -pidfile="/var/run/${name}.pid" -required_files="${xdm_config}" +pidfile="@VARBASE@/run/${name}.pid" +required_files="@PKG_SYSCONFDIR@/xdm-config" extra_commands="reload" load_rc_config $name |