Mon Nov 29 04:20:33 2010 UTC ()
The stop and reload commands require the core prefix now.


(jnemeth)
diff -r1.25 -r1.26 pkgsrc/comms/asterisk16/Makefile
diff -r1.4 -r1.5 pkgsrc/comms/asterisk16/files/asterisk.sh
cvs diff -r1.25 -r1.26 pkgsrc/comms/asterisk16/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk16/Makefile 2010/11/15 05:18:16 1.25
+++ pkgsrc/comms/asterisk16/Makefile 2010/11/29 04:20:32 1.26
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.25 2010/11/15 05:18:16 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.26 2010/11/29 04:20:32 jnemeth Exp $
2# 2#
3 3
4DISTNAME= asterisk-1.6.2.14 4DISTNAME= asterisk-1.6.2.14
5DIST_SUBDIR= ${PKGNAME_NOREV} 5DIST_SUBDIR= ${PKGNAME_NOREV}
6DISTFILES= ${DEFAULT_DISTFILES} 6DISTFILES= ${DEFAULT_DISTFILES}
7EXTRACT_ONLY= ${DISTNAME}.tar.gz 7EXTRACT_ONLY= ${DISTNAME}.tar.gz
8CATEGORIES= comms net audio 8CATEGORIES= comms net audio
9MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ 9MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
10 http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \ 10 http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
11 http://downloads.asterisk.org/pub/telephony/sounds/releases/ 11 http://downloads.asterisk.org/pub/telephony/sounds/releases/
 12PKGREVISION= 1
12 13
13OWNER= jnemeth@NetBSD.org 14OWNER= jnemeth@NetBSD.org
14HOMEPAGE= http://www.asterisk.org/ 15HOMEPAGE= http://www.asterisk.org/
15COMMENT= The Asterisk Software PBX 16COMMENT= The Asterisk Software PBX
16LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
17 18
18CONFLICTS+= asterisk-sounds-extra-[0-9]* 19CONFLICTS+= asterisk-sounds-extra-[0-9]*
19 20
20PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
21 22
22.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
23 24
24USE_TOOLS+= bison gmake perl:run pkg-config tar 25USE_TOOLS+= bison gmake perl:run pkg-config tar
cvs diff -r1.4 -r1.5 pkgsrc/comms/asterisk16/files/asterisk.sh (expand / switch to unified diff)

--- pkgsrc/comms/asterisk16/files/asterisk.sh 2010/11/10 09:29:13 1.4
+++ pkgsrc/comms/asterisk16/files/asterisk.sh 2010/11/29 04:20:33 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: asterisk.sh,v 1.4 2010/11/10 09:29:13 jnemeth Exp $ 3# $NetBSD: asterisk.sh,v 1.5 2010/11/29 04:20:33 jnemeth Exp $
4# 4#
5# PROVIDE: asterisk 5# PROVIDE: asterisk
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8# 8#
9# You will need to set some variables in /etc/rc.conf to start Asterisk: 9# You will need to set some variables in /etc/rc.conf to start Asterisk:
10# 10#
11# asterisk=YES 11# asterisk=YES
12 12
13if [ -f /etc/rc.subr ] 13if [ -f /etc/rc.subr ]
14then 14then
15 . /etc/rc.subr 15 . /etc/rc.subr
16fi 16fi
@@ -25,19 +25,19 @@ start_precmd=asterisk_prestart @@ -25,19 +25,19 @@ start_precmd=asterisk_prestart
25 25
26auser="@ASTERISK_USER@" 26auser="@ASTERISK_USER@"
27agroup="@ASTERISK_GROUP@" 27agroup="@ASTERISK_GROUP@"
28command_args="-U $auser -G $agroup -n" 28command_args="-U $auser -G $agroup -n"
29 29
30asterisk_prestart() { 30asterisk_prestart() {
31 if test ! -d @ASTVARRUNDIR@; then 31 if test ! -d @ASTVARRUNDIR@; then
32 mkdir @ASTVARRUNDIR@ 32 mkdir @ASTVARRUNDIR@
33 fi 33 fi
34 chown $auser:$agroup @ASTVARRUNDIR@ 34 chown $auser:$agroup @ASTVARRUNDIR@
35 chmod 0755 @ASTVARRUNDIR@ 35 chmod 0755 @ASTVARRUNDIR@
36} 36}
37 37
38stop_cmd="$command -nr -x 'stop gracefully' >/dev/null" 38stop_cmd="$command -nr -x 'core stop gracefully' >/dev/null"
39reload_cmd="$command -nr -x 'reload' >/dev/null" 39reload_cmd="$command -nr -x 'core reload' >/dev/null"
40asterisk_nice="-20" 40asterisk_nice="-20"
41 41
42load_rc_config $name 42load_rc_config $name
43run_rc_command "$1" 43run_rc_command "$1"