[pkgsrc/trunk]: pkgsrc/comms/asterisk - make sure rc.d script can find asteri...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24ab6927e642
branches:  trunk
changeset: 550568:24ab6927e642
user:      jnemeth <jnemeth%pkgsrc.org@localhost>
date:      Mon Nov 24 09:27:29 2008 +0000

description:
- make sure rc.d script can find asterisk when it isn't in the path
- pkglint

diffstat:

 comms/asterisk/Makefile          |   7 +++++--
 comms/asterisk/PLIST.common      |  24 ++++++++++++------------
 comms/asterisk/PLIST.common_end  |   3 +--
 comms/asterisk/files/asterisk.sh |   6 +++---
 4 files changed, 21 insertions(+), 19 deletions(-)

diffs (111 lines):

diff -r 27add09ec9f4 -r 24ab6927e642 comms/asterisk/Makefile
--- a/comms/asterisk/Makefile   Mon Nov 24 09:21:22 2008 +0000
+++ b/comms/asterisk/Makefile   Mon Nov 24 09:27:29 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2008/07/24 00:10:50 tonnerre Exp $
+# $NetBSD: Makefile,v 1.58 2008/11/24 09:27:29 jnemeth Exp $
 
 DISTNAME=      asterisk-1.2.30
+PKGREVISION=   1
 CATEGORIES=    comms net audio
 MASTER_SITES=  http://ftp.digium.com/pub/asterisk/ \
                http://ftp.digium.com/pub/asterisk/old-releases/
@@ -20,6 +21,8 @@
 INSTALL_TARGET=                install samples
 INSTALLATION_DIRS=     lib/pkgconfig
 
+BUILD_DEFS+=           VARBASE
+
 # Running as non-root will come later
 #ASTERISK_USER?=       asterisk
 #ASTERISK_GROUP?=      asterisk
@@ -54,7 +57,7 @@
 SUBST_SED.asterisk+=   -e 's|^ *\(ASTSPOOLDIR\)=.*|\1 = ${ASTSPOOLDIR}|'
 SUBST_SED.asterisk+=   -e 's|^ *\(ASTLOGDIR\)=.*|\1 = ${ASTLOGDIR}|'
 SUBST_SED.asterisk+=   -e 's|^ *\(ASTHEADERDIR\)=.*|\1 = ${ASTHEADERDIR}|'
-SUBST_SED.asterisk+=   -e 's|^ *\(ASTCONFPATH\)=.*|\1 = ${ASTCONFPATH}|'
+SUBST_SED.asterisk+=   -e 's|^ *\(ASTCONFPATH\)=.*|\1 = ${ASTCONFPATH:Q}|'
 SUBST_SED.asterisk+=   -e 's|^ *\(ASTBINDIR\)=.*|\1 = ${ASTBINDIR}|'
 SUBST_SED.asterisk+=   -e 's|^ *\(ASTSBINDIR\)=.*|\1 = ${ASTSBINDIR}|'
 SUBST_SED.asterisk+=   -e 's|^ *\(ASTVARRUNDIR\)=.*|\1 = ${ASTVARRUNDIR}|'
diff -r 27add09ec9f4 -r 24ab6927e642 comms/asterisk/PLIST.common
--- a/comms/asterisk/PLIST.common       Mon Nov 24 09:21:22 2008 +0000
+++ b/comms/asterisk/PLIST.common       Mon Nov 24 09:27:29 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.13 2008/06/19 08:14:29 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.14 2008/11/24 09:27:29 jnemeth Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -206,20 +206,10 @@
 libdata/asterisk/images/asterisk-intro.jpg
 libdata/asterisk/keys/freeworlddialup.pub
 libdata/asterisk/keys/iaxtel.pub
+libdata/asterisk/mohmp3/LICENSE
 libdata/asterisk/mohmp3/fpm-calm-river.mp3
 libdata/asterisk/mohmp3/fpm-sunshine.mp3
 libdata/asterisk/mohmp3/fpm-world-mix.mp3
-libdata/asterisk/mohmp3/LICENSE
-libdata/asterisk/sounds/silence/1.gsm
-libdata/asterisk/sounds/silence/10.gsm
-libdata/asterisk/sounds/silence/2.gsm
-libdata/asterisk/sounds/silence/3.gsm
-libdata/asterisk/sounds/silence/4.gsm
-libdata/asterisk/sounds/silence/5.gsm
-libdata/asterisk/sounds/silence/6.gsm
-libdata/asterisk/sounds/silence/7.gsm
-libdata/asterisk/sounds/silence/8.gsm
-libdata/asterisk/sounds/silence/9.gsm
 libdata/asterisk/sounds/agent-alreadyon.gsm
 libdata/asterisk/sounds/agent-incorrect.gsm
 libdata/asterisk/sounds/agent-loggedoff.gsm
@@ -458,6 +448,16 @@
 libdata/asterisk/sounds/queue-youarenext.gsm
 libdata/asterisk/sounds/screen-callee-options.gsm
 libdata/asterisk/sounds/seconds.gsm
+libdata/asterisk/sounds/silence/1.gsm
+libdata/asterisk/sounds/silence/10.gsm
+libdata/asterisk/sounds/silence/2.gsm
+libdata/asterisk/sounds/silence/3.gsm
+libdata/asterisk/sounds/silence/4.gsm
+libdata/asterisk/sounds/silence/5.gsm
+libdata/asterisk/sounds/silence/6.gsm
+libdata/asterisk/sounds/silence/7.gsm
+libdata/asterisk/sounds/silence/8.gsm
+libdata/asterisk/sounds/silence/9.gsm
 libdata/asterisk/sounds/spy-agent.gsm
 libdata/asterisk/sounds/spy-h323.gsm
 libdata/asterisk/sounds/spy-iax.gsm
diff -r 27add09ec9f4 -r 24ab6927e642 comms/asterisk/PLIST.common_end
--- a/comms/asterisk/PLIST.common_end   Mon Nov 24 09:21:22 2008 +0000
+++ b/comms/asterisk/PLIST.common_end   Mon Nov 24 09:27:29 2008 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST.common_end,v 1.4 2006/12/20 11:34:55 mjl Exp $
+@comment $NetBSD: PLIST.common_end,v 1.5 2008/11/24 09:27:29 jnemeth Exp $
 @dirrm share/examples/asterisk
-@dirrm libdata/asterisk/sounds/priv-callerintros
 @dirrm libdata/asterisk/sounds/phonetic
 @dirrm libdata/asterisk/sounds/letters
 @dirrm libdata/asterisk/sounds/digits
diff -r 27add09ec9f4 -r 24ab6927e642 comms/asterisk/files/asterisk.sh
--- a/comms/asterisk/files/asterisk.sh  Mon Nov 24 09:21:22 2008 +0000
+++ b/comms/asterisk/files/asterisk.sh  Mon Nov 24 09:27:29 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: asterisk.sh,v 1.3 2008/07/10 08:23:20 sborrill Exp $
+# $NetBSD: asterisk.sh,v 1.4 2008/11/24 09:27:29 jnemeth Exp $
 #
 # PROVIDE: asterisk
 # REQUIRE: DAEMON
@@ -21,8 +21,8 @@
 required_files="@PKG_SYSCONFDIR@/asterisk.conf"
 extra_commands="reload"
 
-stop_cmd="asterisk -r -x 'stop gracefully' >/dev/null"
-reload_cmd="asterisk -r -x 'reload' >/dev/null"
+stop_cmd="$command -r -x 'stop gracefully' >/dev/null"
+reload_cmd="$command -r -x 'reload' >/dev/null"
 asterisk_nice="-20"
 
 load_rc_config $name