kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Put xdm's config files in ${PKG_SYSCONFBASE}/xdm, install them using

Browse source 
CONF_FILES, and adjust the rc.d script. (As requested in PR#41102).

Bump PKGREVISION.
This commit is contained in:
sbd 2012-04-29 08:04:56 +00:00
parent 425129a844
commit cfc2de31d5
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
x11/xdm/Makefile
View file

@ -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

10
x11/xdm/PLIST
View file

@ -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

8
x11/xdm/files/xdm.sh
View file

@ -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