Thu Jul 16 19:19:18 2009 UTC ()
Make sure bitlbee honors VARBASE properly


(tonio)
diff -r1.1.1.1 -r1.2 pkgsrc/chat/bitlbee/MESSAGE
diff -r1.45 -r1.46 pkgsrc/chat/bitlbee/Makefile
diff -r1.6 -r1.7 pkgsrc/chat/bitlbee/PLIST
diff -r1.1 -r1.2 pkgsrc/chat/bitlbee/files/bitlbee.sh
cvs diff -r1.1.1.1 -r1.2 pkgsrc/chat/bitlbee/MESSAGE (expand / switch to unified diff)

--- pkgsrc/chat/bitlbee/MESSAGE 2003/07/02 09:03:02 1.1.1.1
+++ pkgsrc/chat/bitlbee/MESSAGE 2009/07/16 19:19:18 1.2
@@ -1,9 +1,13 @@ @@ -1,9 +1,13 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1.1.1 2003/07/02 09:03:02 jmmv Exp $ 2$NetBSD: MESSAGE,v 1.2 2009/07/16 19:19:18 tonio Exp $
3 3
4bitlbee needs to be started from inetd(8) for now. Add the following line 4bitlbee can be to be started from inetd(8). Add the following line
5to its configuration file (/etc/inetd.conf): 5to its configuration file (/etc/inetd.conf):
6 6
7 6667 stream tcp nowait bitlbee ${PREFIX}/sbin/bitlbee bitlbee 7 6667 stream tcp nowait bitlbee ${PREFIX}/sbin/bitlbee bitlbee
8 8
 9bitlbee can act as a system-wide daemon, using the start-up script installed by
 10the package.
 11
 12 ${PREFIX}/share/examples/rc.d/bitlbee
9=========================================================================== 13===========================================================================
cvs diff -r1.45 -r1.46 pkgsrc/chat/bitlbee/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/bitlbee/Makefile 2009/07/15 22:14:18 1.45
+++ pkgsrc/chat/bitlbee/Makefile 2009/07/16 19:19:18 1.46
@@ -1,41 +1,46 @@ @@ -1,41 +1,46 @@
1# $NetBSD: Makefile,v 1.45 2009/07/15 22:14:18 tonio Exp $ 1# $NetBSD: Makefile,v 1.46 2009/07/16 19:19:18 tonio Exp $
2# 2#
3 3
4DISTNAME= bitlbee-1.2.3 4DISTNAME= bitlbee-1.2.3
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= http://get.bitlbee.org/src/ 6MASTER_SITES= http://get.bitlbee.org/src/
7PKGREVISION= 1 7PKGREVISION= 2
8 8
9MAINTAINER= tonio@NetBSD.org 9MAINTAINER= tonio@NetBSD.org
10HOMEPAGE= http://www.bitlbee.org/ 10HOMEPAGE= http://www.bitlbee.org/
11COMMENT= IRC to other chat networks gateway 11COMMENT= IRC to other chat networks gateway
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17 17
18CONFIGURE_ARGS+= --prefix=${PREFIX} 18CONFIGURE_ARGS+= --prefix=${PREFIX}
19CONFIGURE_ARGS+= --bindir=${PREFIX}/sbin 19CONFIGURE_ARGS+= --bindir=${PREFIX}/sbin
20CONFIGURE_ARGS+= --etcdir=${PKG_SYSCONFDIR} 20CONFIGURE_ARGS+= --etcdir=${PKG_SYSCONFDIR}
21CONFIGURE_ARGS+= --datadir=${DATADIR} 21CONFIGURE_ARGS+= --datadir=${DATADIR}
22CONFIGURE_ARGS+= --config=${STATEDIR} 22CONFIGURE_ARGS+= --config=${STATEDIR}
 23CONFIGURE_ARGS+= --pidfile=${VARBASE}/run/bitlbee/pid
 24CONFIGURE_ARGS+= --ipcsocket=${VARBASE}/run/bitlbee/sock
23CONFIGURE_ARGS+= --flood=0 25CONFIGURE_ARGS+= --flood=0
24CONFIGURE_ARGS+= --ssl=gnutls 26CONFIGURE_ARGS+= --ssl=gnutls
25 27
26PKG_SYSCONFSUBDIR= bitlbee 28PKG_SYSCONFSUBDIR= bitlbee
27CONF_FILES= ${DATADIR}/motd.txt ${PKG_SYSCONFDIR}/motd.txt 29CONF_FILES= ${DATADIR}/motd.txt ${PKG_SYSCONFDIR}/motd.txt
28CONF_FILES+= ${EGDIR}/bitlbee.conf ${PKG_SYSCONFDIR}/bitlbee.conf 30CONF_FILES+= ${EGDIR}/bitlbee.conf ${PKG_SYSCONFDIR}/bitlbee.conf
 31OWN_DIRS+= ${VARBASE}/run/bitlbee
 32
 33BUILD_DEFS+= VARBASE
29 34
30EGDIR= ${PREFIX}/share/examples/bitlbee 35EGDIR= ${PREFIX}/share/examples/bitlbee
31DATADIR= ${PREFIX}/share/bitlbee 36DATADIR= ${PREFIX}/share/bitlbee
32DOCDIR= ${PREFIX}/share/doc/bitlbee 37DOCDIR= ${PREFIX}/share/doc/bitlbee
33STATEDIR= ${VARBASE}/db/bitlbee 38STATEDIR= ${VARBASE}/db/bitlbee
34 39
35OWN_DIRS_PERMS= ${STATEDIR} bitlbee nobody 700 40OWN_DIRS_PERMS= ${STATEDIR} bitlbee nobody 700
36 41
37PKG_USERS= bitlbee:nobody 42PKG_USERS= bitlbee:nobody
38PKG_HOME.bitlbee= ${VARBASE}/db/bitlbee 43PKG_HOME.bitlbee= ${VARBASE}/db/bitlbee
39 44
40INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin 45INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
41 46
cvs diff -r1.6 -r1.7 pkgsrc/chat/bitlbee/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/bitlbee/PLIST 2009/07/15 22:14:18 1.6
+++ pkgsrc/chat/bitlbee/PLIST 2009/07/16 19:19:18 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2009/07/15 22:14:18 tonio Exp $ 1@comment $NetBSD: PLIST,v 1.7 2009/07/16 19:19:18 tonio Exp $
2man/man5/bitlbee.conf.5 2man/man5/bitlbee.conf.5
3man/man8/bitlbee.8 3man/man8/bitlbee.8
4sbin/bitlbee 4sbin/bitlbee
5share/bitlbee/help.txt 5share/bitlbee/help.txt
6share/bitlbee/motd.txt 6share/bitlbee/motd.txt
7share/examples/rc.d/bitlbee 
8share/doc/bitlbee/AUTHORS 7share/doc/bitlbee/AUTHORS
9share/doc/bitlbee/CREDITS 8share/doc/bitlbee/CREDITS
10share/doc/bitlbee/FAQ 9share/doc/bitlbee/FAQ
11share/doc/bitlbee/README 10share/doc/bitlbee/README
12share/doc/bitlbee/user-guide.html 11share/doc/bitlbee/user-guide.html
13share/doc/bitlbee/user-guide.txt 12share/doc/bitlbee/user-guide.txt
14share/examples/bitlbee/bitlbee.conf 13share/examples/bitlbee/bitlbee.conf
 14share/examples/rc.d/bitlbee
cvs diff -r1.1 -r1.2 pkgsrc/chat/bitlbee/files/bitlbee.sh (expand / switch to unified diff)

--- pkgsrc/chat/bitlbee/files/bitlbee.sh 2009/07/15 22:14:18 1.1
+++ pkgsrc/chat/bitlbee/files/bitlbee.sh 2009/07/16 19:19:18 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# PROVIDE: bitlbee 3# PROVIDE: bitlbee
4# REQUIRE: DAEMON 4# REQUIRE: DAEMON
5 5
6. /etc/rc.subr 6. /etc/rc.subr
7 7
8name="bitlbee" 8name="bitlbee"
9rcvar=$name 9rcvar=$name
10command="@PREFIX@/sbin/bitlbee" 10command="@PREFIX@/sbin/bitlbee"
11pidfile="/var/run/${name}.pid" 11pidfile="@VARBASE@/run/${name}/pid"
12command_args="-D" # run as a daemon 12command_args="-D" # run as a daemon
13 13
14if [ -f /etc/rc.subr ]; then 14if [ -f /etc/rc.subr ]; then
15 load_rc_config $name 15 load_rc_config $name
16 run_rc_command "$1" 16 run_rc_command "$1"
17else 17else
18 echo -n "${name}" 18 echo -n "${name}"
19 ${command} ${bitlbee_flags} ${command_args} 19 ${command} ${bitlbee_flags} ${command_args}
20fi 20fi