[pkgsrc/trunk]: pkgsrc/comms/asterisk Fixed the remaining pkglint -Wall warni...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/145460875be2
branches:  trunk
changeset: 507198:145460875be2
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jan 29 01:30:20 2006 +0000

description:
Fixed the remaining pkglint -Wall warnings.

diffstat:

 comms/asterisk/Makefile     |  24 +++++++++++++-----------
 comms/asterisk/PLIST.common |   4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diffs (89 lines):

diff -r e720d5aa7516 -r 145460875be2 comms/asterisk/Makefile
--- a/comms/asterisk/Makefile   Sun Jan 29 01:29:38 2006 +0000
+++ b/comms/asterisk/Makefile   Sun Jan 29 01:30:20 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/01/29 01:21:45 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/29 01:30:20 rillig Exp $
 
 DISTNAME=      asterisk-1.2.3
 PKGREVISION=   1
@@ -10,12 +10,14 @@
 HOMEPAGE=      http://www.asterisk.org/
 COMMENT=       The Asterisk Software PBX
 
-USE_TOOLS+=            bison gmake perl:run
+.include "../../mk/bsd.prefs.mk"
+
+USE_TOOLS+=            bison gmake perl:run
 REPLACE_PERL+=         agi/agi-test.agi
 
 # MANCOMPRESSED=               yes
 
-INSTALL_TARGET=        install samples
+INSTALL_TARGET=                install samples
 
 # Running as non-root will come later
 #ASTERISK_USER?=       asterisk
@@ -39,10 +41,10 @@
 ASTEXAMPLEDIR?=                ${PREFIX}/share/examples/asterisk
 
 # Override default paths in Makefile
-SUBST_CLASSES+=        asterisk
-SUBST_STAGE.asterisk=  pre-configure
+SUBST_CLASSES+=                asterisk
+SUBST_STAGE.asterisk=  pre-configure
 SUBST_FILES.asterisk=  Makefile configs/musiconhold.conf.sample
-SUBST_SED.asterisk=    \
+SUBST_SED.asterisk=    \
        -e 's|/var/lib/asterisk|${ASTVARLIBDIR}|'               \
        -e 's|^ *\(ASTLIBDIR\)=.*|\1 = ${ASTLIBDIR}|'           \
        -e 's|^ *\(ASTVARLIBDIR\)=.*|\1 = ${ASTVARLIBDIR}|'     \
@@ -59,9 +61,9 @@
 
 .include "options.mk"
 
-USE_PKGINSTALL=        yes
-RCD_SCRIPTS=           asterisk
-OWN_DIRS+=             ${ASTSPOOLDIR} ${ASTLOGDIR} ${ASTVARRUNDIR}
+USE_PKGINSTALL=                yes
+RCD_SCRIPTS=           asterisk
+OWN_DIRS+=             ${ASTSPOOLDIR} ${ASTLOGDIR} ${ASTVARRUNDIR}
 OWN_DIRS+=             ${ASTLOGDIR}/cdr-csv
 
 CONF_FILES=            # empty
@@ -83,14 +85,14 @@
        res_odbc.conf rpt.conf rtp.conf sip.conf                        \
        skinny.conf voicemail.conf vpb.conf zapata.conf asterisk.adsi   \
        telcordia-1.adsi
-CONF_FILES+=   ${ASTEXAMPLEDIR:Q}/${f:Q} ${ASTETCDIR:Q}/${f:Q}
+CONF_FILES+=           ${ASTEXAMPLEDIR:Q}/${f:Q} ${ASTETCDIR:Q}/${f:Q}
 .endfor
 
 PTHREAD_OPTS+= require native
 
 .if (${OPSYS} == "Darwin" && exists(/usr/include/sys/poll.h))
 post-patch:
-       ${ECHO} "#include <sys/poll.h>" > ${WRKSRC}/include/asterisk/poll-compat.h
+       ${ECHO} "#include <sys/poll.h>" > ${WRKSRC:Q}/include/asterisk/poll-compat.h
 .endif
 
 .include "../../devel/ncurses/buildlink3.mk"
diff -r e720d5aa7516 -r 145460875be2 comms/asterisk/PLIST.common
--- a/comms/asterisk/PLIST.common       Sun Jan 29 01:29:38 2006 +0000
+++ b/comms/asterisk/PLIST.common       Sun Jan 29 01:30:20 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2006/01/13 20:32:38 riz Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2006/01/29 01:30:20 rillig Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -564,8 +564,8 @@
 sbin/asterisk
 sbin/astgenkey
 sbin/autosupport
+sbin/rasterisk
 sbin/safe_asterisk
-sbin/rasterisk
 sbin/stereorize
 sbin/streamplayer
 share/examples/asterisk/adsi.conf