[pkgsrc/trunk]: pkgsrc/chat/bitlbee Make sure bitlbee honors VARBASE properly

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe82ef9c8283
branches:  trunk
changeset: 561803:fe82ef9c8283
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Thu Jul 16 19:19:18 2009 +0000

description:
Make sure bitlbee honors VARBASE properly

diffstat:

 chat/bitlbee/MESSAGE          |  8 ++++++--
 chat/bitlbee/Makefile         |  9 +++++++--
 chat/bitlbee/PLIST            |  4 ++--
 chat/bitlbee/files/bitlbee.sh |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diffs (85 lines):

diff -r c5ca48cbb6a4 -r fe82ef9c8283 chat/bitlbee/MESSAGE
--- a/chat/bitlbee/MESSAGE      Thu Jul 16 18:42:23 2009 +0000
+++ b/chat/bitlbee/MESSAGE      Thu Jul 16 19:19:18 2009 +0000
@@ -1,9 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/07/02 09:03:02 jmmv Exp $
+$NetBSD: MESSAGE,v 1.2 2009/07/16 19:19:18 tonio Exp $
 
-bitlbee needs to be started from inetd(8) for now.  Add the following line
+bitlbee can be to be started from inetd(8).  Add the following line
 to its configuration file (/etc/inetd.conf):
 
        6667 stream tcp nowait bitlbee ${PREFIX}/sbin/bitlbee bitlbee
 
+bitlbee can act as a system-wide daemon, using the start-up script installed by
+the package.
+
+       ${PREFIX}/share/examples/rc.d/bitlbee
 ===========================================================================
diff -r c5ca48cbb6a4 -r fe82ef9c8283 chat/bitlbee/Makefile
--- a/chat/bitlbee/Makefile     Thu Jul 16 18:42:23 2009 +0000
+++ b/chat/bitlbee/Makefile     Thu Jul 16 19:19:18 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2009/07/15 22:14:18 tonio Exp $
+# $NetBSD: Makefile,v 1.46 2009/07/16 19:19:18 tonio Exp $
 #
 
 DISTNAME=              bitlbee-1.2.3
 CATEGORIES=            chat
 MASTER_SITES=          http://get.bitlbee.org/src/
-PKGREVISION=           1
+PKGREVISION=           2
 
 MAINTAINER=            tonio%NetBSD.org@localhost
 HOMEPAGE=              http://www.bitlbee.org/
@@ -20,12 +20,17 @@
 CONFIGURE_ARGS+=       --etcdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --datadir=${DATADIR}
 CONFIGURE_ARGS+=       --config=${STATEDIR}
+CONFIGURE_ARGS+=       --pidfile=${VARBASE}/run/bitlbee/pid
+CONFIGURE_ARGS+=       --ipcsocket=${VARBASE}/run/bitlbee/sock
 CONFIGURE_ARGS+=       --flood=0
 CONFIGURE_ARGS+=       --ssl=gnutls
 
 PKG_SYSCONFSUBDIR=     bitlbee
 CONF_FILES=            ${DATADIR}/motd.txt ${PKG_SYSCONFDIR}/motd.txt
 CONF_FILES+=           ${EGDIR}/bitlbee.conf ${PKG_SYSCONFDIR}/bitlbee.conf
+OWN_DIRS+=             ${VARBASE}/run/bitlbee
+
+BUILD_DEFS+=           VARBASE
 
 EGDIR=                 ${PREFIX}/share/examples/bitlbee
 DATADIR=               ${PREFIX}/share/bitlbee
diff -r c5ca48cbb6a4 -r fe82ef9c8283 chat/bitlbee/PLIST
--- a/chat/bitlbee/PLIST        Thu Jul 16 18:42:23 2009 +0000
+++ b/chat/bitlbee/PLIST        Thu Jul 16 19:19:18 2009 +0000
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/07/15 22:14:18 tonio Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/07/16 19:19:18 tonio Exp $
 man/man5/bitlbee.conf.5
 man/man8/bitlbee.8
 sbin/bitlbee
 share/bitlbee/help.txt
 share/bitlbee/motd.txt
-share/examples/rc.d/bitlbee
 share/doc/bitlbee/AUTHORS
 share/doc/bitlbee/CREDITS
 share/doc/bitlbee/FAQ
@@ -12,3 +11,4 @@
 share/doc/bitlbee/user-guide.html
 share/doc/bitlbee/user-guide.txt
 share/examples/bitlbee/bitlbee.conf
+share/examples/rc.d/bitlbee
diff -r c5ca48cbb6a4 -r fe82ef9c8283 chat/bitlbee/files/bitlbee.sh
--- a/chat/bitlbee/files/bitlbee.sh     Thu Jul 16 18:42:23 2009 +0000
+++ b/chat/bitlbee/files/bitlbee.sh     Thu Jul 16 19:19:18 2009 +0000
@@ -8,7 +8,7 @@
 name="bitlbee"
 rcvar=$name
 command="@PREFIX@/sbin/bitlbee"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}/pid"
 command_args="-D"      # run as a daemon
 
 if [ -f /etc/rc.subr ]; then