diff options
| author | tonio <tonio@pkgsrc.org> | 2009-07-16 19:19:18 +0000 |
|---|---|---|
| committer | tonio <tonio@pkgsrc.org> | 2009-07-16 19:19:18 +0000 |
| commit | f92e5f03269f152520d1b5ba26a0d88f1abc625a (patch) | |
| tree | 4b224d96b28ac7e44616e5bdb9010317a4a894d6 /chat/bitlbee | |
| parent | 444bcf9989cc3a399e2a980b397c5f0918ef67de (diff) | |
| download | pkgsrc-f92e5f03269f152520d1b5ba26a0d88f1abc625a.tar.gz | |
Make sure bitlbee honors VARBASE properly
Diffstat (limited to 'chat/bitlbee')
| -rw-r--r-- | chat/bitlbee/MESSAGE | 8 | ||||
| -rw-r--r-- | chat/bitlbee/Makefile | 9 | ||||
| -rw-r--r-- | chat/bitlbee/PLIST | 4 | ||||
| -rwxr-xr-x | chat/bitlbee/files/bitlbee.sh | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/chat/bitlbee/MESSAGE b/chat/bitlbee/MESSAGE index a4836b0e191..507b23fe23d 100644 --- a/chat/bitlbee/MESSAGE +++ b/chat/bitlbee/MESSAGE @@ -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 --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index 01c79dc6958..6e45167592a 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -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 HOMEPAGE= http://www.bitlbee.org/ @@ -20,12 +20,17 @@ CONFIGURE_ARGS+= --bindir=${PREFIX}/sbin 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 --git a/chat/bitlbee/PLIST b/chat/bitlbee/PLIST index 06f4e44b6e7..8c9c4f29462 100644 --- a/chat/bitlbee/PLIST +++ b/chat/bitlbee/PLIST @@ -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/README share/doc/bitlbee/user-guide.html share/doc/bitlbee/user-guide.txt share/examples/bitlbee/bitlbee.conf +share/examples/rc.d/bitlbee diff --git a/chat/bitlbee/files/bitlbee.sh b/chat/bitlbee/files/bitlbee.sh index 2b47870678e..62f8f95e605 100755 --- a/chat/bitlbee/files/bitlbee.sh +++ b/chat/bitlbee/files/bitlbee.sh @@ -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 |