Digium in its infinite wisdom changed the Music-On-Hold sound files in all

release tarballs.  Update for that change.

While here, do some pkglint cleanup and add LICENSE=gplv2.

3 files changed, 17 insertions, 14 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index f2727b46cf6..6cc1ad367bf 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2009/06/05 23:07:11 jnemeth Exp $
+# $NetBSD: Makefile,v 1.64 2009/08/20 22:31:41 jnemeth Exp $
 
 DISTNAME=	asterisk-1.2.33
 CATEGORIES=	comms net audio
@@ -8,6 +8,7 @@ MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/releases/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.asterisk.org/
 COMMENT=	The Asterisk Software PBX
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -73,11 +74,11 @@ OWN_DIRS+=		${ASTVARLIBDIR}/sounds/priv-callerintros
 
 CONF_FILES=		# empty
 .for f in asterisk.conf extensions.conf
-CONF_FILES+=	${ASTEXAMPLEDIR:Q}/${f:Q} ${ASTETCDIR:Q}/${f:Q}
+CONF_FILES+=	${ASTEXAMPLEDIR}/${f:Q} ${ASTETCDIR}/${f:Q}
 .endfor
 
-MAKE_ENV+=		VARBASE=${VARBASE:Q}
-MAKE_FLAGS+=		INSTALL_PREFIX=${PREFIX:Q}
+MAKE_ENV+=		VARBASE=${VARBASE}
+MAKE_FLAGS+=		INSTALL_PREFIX=${PREFIX}
 
 # if we put all the files in $CONF_FILES, the message is _way_ too long.
 .for f in adsi.conf adtranvofr.conf agents.conf alarmreceiver.conf	\
@@ -90,14 +91,14 @@ MAKE_FLAGS+=		INSTALL_PREFIX=${PREFIX:Q}
 	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}/${f:Q} ${ASTETCDIR}/${f:Q}
 .endfor
 
 PTHREAD_OPTS+=	require native
 
 .if (${OPSYS} == "Darwin" && exists(/usr/include/sys/poll.h))
 post-patch:
-	${ECHO} "#include <sys/poll.h>" > ${WRKSRC:Q}/include/asterisk/poll-compat.h
+	${ECHO} "#include <sys/poll.h>" > ${WRKSRC}/include/asterisk/poll-compat.h
 .endif
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/comms/asterisk/PLIST.common b/comms/asterisk/PLIST.common
index 1c099c4e974..dd09fa15f34 100644
--- a/comms/asterisk/PLIST.common
+++ b/comms/asterisk/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.15 2009/01/26 13:15:49 jnemeth Exp $
+@comment $NetBSD: PLIST.common,v 1.16 2009/08/20 22:31:41 jnemeth Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -208,9 +208,11 @@ 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/macroform-cold_day.mp3
+libdata/asterisk/mohmp3/macroform-robot_dity.mp3
+libdata/asterisk/mohmp3/macroform-the_simplicity.mp3
+libdata/asterisk/mohmp3/manolo_camp-morning_coffee.mp3
+libdata/asterisk/mohmp3/reno_project-system.mp3
 libdata/asterisk/sounds/agent-alreadyon.gsm
 libdata/asterisk/sounds/agent-incorrect.gsm
 libdata/asterisk/sounds/agent-loggedoff.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index 9bd78b15315..9eedb169fd2 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2009/06/05 23:07:11 jnemeth Exp $
+$NetBSD: distinfo,v 1.41 2009/08/20 22:31:41 jnemeth Exp $
 
-SHA1 (asterisk-1.2.33.tar.gz) = e660940ddc330d484fe3c450eded637624b31cec
-RMD160 (asterisk-1.2.33.tar.gz) = 529fc724fc9e3f4ba6951a39b9e1164ba03a5475
-Size (asterisk-1.2.33.tar.gz) = 10638312 bytes
+SHA1 (asterisk-1.2.33.tar.gz) = 4b3653dcecc1c16f4ff4220082e521455e886c9a
+RMD160 (asterisk-1.2.33.tar.gz) = f1cec3f3fde1dbabc9215a78a1f7c8743944e0db
+Size (asterisk-1.2.33.tar.gz) = 29527576 bytes
 SHA1 (patch-aa) = 0070d874445d5bad7eb5a4cbd023a8f698e1f938
 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127