Upgrade to Asterisk 11.5.0: this is a general bug fix release

pkgsrc changes:
  - add dependency on libuuid
  - work around NetBSD's incompatible implementation of IP_PKTINFO

The Asterisk Development Team has announced the release of Asterisk 11.5.0.

The release of Asterisk 11.5.0 resolves several issues reported by the
community and would have not been possible without your participation.
Thank you!

The following is a sample of the issues resolved in this release:

* --- Fix Segfault In app_queue When "persistentmembers" Is Enabled
      And Using Realtime

* --- IAX2: fix race condition with nativebridge transfers.

* --- Fix The Payload Being Set On CN Packets And Do Not Set Marker
      Bit

* --- Fix One-Way Audio With auto_* NAT Settings When SIP Calls
      Initiated By PBX

* --- chan_sip: NOTIFYs for BLF start queuing up and fail to be sent
      out after retries fail

For a full list of changes in this release, please see the ChangeLog:

http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-11.5.0

Thank you for your continued support of Asterisk!

3 files changed, 23 insertions, 17 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 53faf9f38e3..7b1a0ce0ee3 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.95 2013/07/12 10:44:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.96 2013/07/21 06:55:53 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-11.4.0
+DISTNAME=	asterisk-11.5.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	6
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -134,12 +133,18 @@ SUBST_SED.configs+=	-e "s|/usr/local/man|${ASTMANDIR}|"
 SUBST_SED.configs+=	-e "s|/usr/local|${PREFIX}|"
 SUBST_SED.configs+=	-e "s|/var|${VARBASE}|"
 
-# XXX gross hack, remove when atomics properly implemented
 .if (${OPSYS} == "NetBSD")
+# XXX gross hack, remove when atomics properly implemented
 SUBST_CLASSES+=		atomics
 SUBST_STAGE.atomics=	post-configure
 SUBST_FILES.atomics=	include/asterisk/autoconfig.h
 SUBST_SED.atomics=	-e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|"
+
+# XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with Linux
+SUBST_CLASSES+=		pktinfo
+SUBST_STAGE.pktinfo=	post-configure
+SUBST_FILES.pktinfo=	include/asterisk/autoconfig.h
+SUBST_SED.pktinfo=	-e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|"
 .endif
 
 RCD_SCRIPTS=		asterisk
@@ -206,7 +211,7 @@ post-patch:
 
 post-install:
 # check sounds directory for current versions when upgrading package
-	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.23.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.24.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
 	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
@@ -232,6 +237,7 @@ post-install:
 	cp -r ${WRKSRC}/doc/Asterisk-Admin-Guide ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/Asterisk-Admin-Guide
 
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/comms/asterisk/PLIST b/comms/asterisk/PLIST
index 609f3a1191b..f0cd94e7f72 100644
--- a/comms/asterisk/PLIST
+++ b/comms/asterisk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/06/14 04:26:55 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/07/21 06:55:53 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -377,14 +377,14 @@ libdata/asterisk/phoneprov/000000000000.cfg
 libdata/asterisk/phoneprov/polycom.xml
 libdata/asterisk/phoneprov/polycom_line.xml
 libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.24
 libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.24
 libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24
 libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24
 libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
 libdata/asterisk/sounds/en/OfficeSpace.gsm
 libdata/asterisk/sounds/en/Randulo-allison.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index 15649cf28e8..27fa4a5cec5 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.57 2013/06/14 04:26:55 jnemeth Exp $
+$NetBSD: distinfo,v 1.58 2013/07/21 06:55:53 jnemeth Exp $
 
-SHA1 (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 8ec0d10834c87a2bff58f23d961c67f16a26d01a
-RMD160 (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 00f44e59e3c4258b52594787b30da6a81c662aa8
-Size (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 30651949 bytes
-SHA1 (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
-RMD160 (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
-Size (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
+SHA1 (asterisk-11.5.0/asterisk-11.5.0.tar.gz) = def6629cb8716bf6fa2d1f267f7c2a44882fca46
+RMD160 (asterisk-11.5.0/asterisk-11.5.0.tar.gz) = a450f82bb66469222275b16143b2c45f6097d759
+Size (asterisk-11.5.0/asterisk-11.5.0.tar.gz) = 30590657 bytes
+SHA1 (asterisk-11.5.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
+RMD160 (asterisk-11.5.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
+Size (asterisk-11.5.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
 SHA1 (patch-Makefile) = ed581d46026e8e89ed8be374c7085efca19911d2
 SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
 SHA1 (patch-apps_app__followme.c) = a54e08d0dd0b6ff12281d4b7b8447707c1cbe20a