summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comms/asterisk18/Makefile19
-rw-r--r--comms/asterisk18/PLIST20
-rw-r--r--comms/asterisk18/distinfo16
-rw-r--r--comms/asterisk18/patches/patch-ak8
4 files changed, 32 insertions, 31 deletions
diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index ff4c177e50e..fa4d95b0dc8 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.83 2014/05/29 23:35:20 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2014/07/02 03:20:43 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-1.8.25.0
+DISTNAME= asterisk-1.8.28.2
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
-PKGREVISION= 4
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -114,7 +113,7 @@ PLIST.mgcp= yes
.include "options.mk"
# check sounds/Makefile for current version when upgrading package
-DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.13.tar.gz
+DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.14.tar.gz
# Override default paths in config files
SUBST_CLASSES+= configs
@@ -138,10 +137,10 @@ 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 anything else
-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|"
+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
@@ -205,9 +204,9 @@ post-patch:
post-install:
# check sounds directory for current versions when upgrading package
- ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.24.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.25.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
+ ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index c31c06eb5d9..272475a148b 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2014/03/11 14:04:59 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.24 2014/07/02 03:20:43 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -356,15 +356,15 @@ 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.24
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.25
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.24
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
-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.24
-libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.25
+libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.14
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.25
+libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.14
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.25
+libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.14
libdata/asterisk/sounds/en/OfficeSpace.gsm
libdata/asterisk/sounds/en/Randulo-allison.gsm
libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -422,7 +422,6 @@ libdata/asterisk/sounds/en/all-reps-busy.gsm
libdata/asterisk/sounds/en/all-your-base.gsm
libdata/asterisk/sounds/en/altitude.gsm
libdata/asterisk/sounds/en/ampersand.gsm
-libdata/asterisk/sounds/en/an-error-has-occured.gsm
libdata/asterisk/sounds/en/an-error-has-occurred.gsm
libdata/asterisk/sounds/en/and-area-code.gsm
libdata/asterisk/sounds/en/and-or.gsm
@@ -1341,6 +1340,7 @@ libdata/asterisk/sounds/en/loss.gsm
libdata/asterisk/sounds/en/lots-o-monkeys.gsm
libdata/asterisk/sounds/en/louisiana.gsm
libdata/asterisk/sounds/en/low.gsm
+libdata/asterisk/sounds/en/lowercase.gsm
libdata/asterisk/sounds/en/lunch.gsm
libdata/asterisk/sounds/en/lyrics-louie-louie.gsm
libdata/asterisk/sounds/en/machine.gsm
@@ -2036,6 +2036,7 @@ libdata/asterisk/sounds/en/units.gsm
libdata/asterisk/sounds/en/unix.gsm
libdata/asterisk/sounds/en/unwelcomecall.gsm
libdata/asterisk/sounds/en/up.gsm
+libdata/asterisk/sounds/en/uppercase.gsm
libdata/asterisk/sounds/en/uptime.gsm
libdata/asterisk/sounds/en/user.gsm
libdata/asterisk/sounds/en/users.gsm
@@ -2095,6 +2096,7 @@ libdata/asterisk/sounds/en/vm-message.gsm
libdata/asterisk/sounds/en/vm-messages.gsm
libdata/asterisk/sounds/en/vm-minutes.gsm
libdata/asterisk/sounds/en/vm-mismatch.gsm
+libdata/asterisk/sounds/en/vm-msgforwarded.gsm
libdata/asterisk/sounds/en/vm-msginstruct.gsm
libdata/asterisk/sounds/en/vm-msgsaved.gsm
libdata/asterisk/sounds/en/vm-newpassword.gsm
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 658303f3960..d9b444aeb5a 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.52 2014/01/07 23:33:28 jnemeth Exp $
+$NetBSD: distinfo,v 1.53 2014/07/02 03:20:43 jnemeth Exp $
-SHA1 (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = c8783a72d4e5ede1c67faea8d744924a97f686a9
-RMD160 (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = 0be84b6618a7d996bd4b0b38f8dc3016cad08677
-Size (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = 29473304 bytes
-SHA1 (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
-RMD160 (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
-Size (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
+SHA1 (asterisk-1.8.28.2/asterisk-1.8.28.2.tar.gz) = 880230919996fa4168c1baa7246d71065642f92f
+RMD160 (asterisk-1.8.28.2/asterisk-1.8.28.2.tar.gz) = b3cabf829b21350b771bf029db85830749628e7c
+Size (asterisk-1.8.28.2/asterisk-1.8.28.2.tar.gz) = 29521616 bytes
+SHA1 (asterisk-1.8.28.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 14403cd023e812565085c8232210b8b439274ecf
+RMD160 (asterisk-1.8.28.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 675fc1f3cedd0e17b62a8285f9f0527783cfb1d3
+Size (asterisk-1.8.28.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 4386590 bytes
SHA1 (patch-aa) = 832f1c043b15198e0a286094dd0cc1a251bcfed0
SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
-SHA1 (patch-ak) = f8d5de733807bc6c0701886a3095901d6815a8bd
+SHA1 (patch-ak) = 7cbc0e6e757e5d39cd7a92b76e266623b9fbe680
SHA1 (patch-al) = b2a1134786d7c3b118ee8c47892f91dd2a4c783a
SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
diff --git a/comms/asterisk18/patches/patch-ak b/comms/asterisk18/patches/patch-ak
index e4ecdd54b8a..226650a6d37 100644
--- a/comms/asterisk18/patches/patch-ak
+++ b/comms/asterisk18/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.2 2012/02/16 16:33:36 hans Exp $
+$NetBSD: patch-ak,v 1.3 2014/07/02 03:20:43 jnemeth Exp $
---- channels/chan_oss.c.orig 2008-11-02 16:39:04.000000000 -0800
+--- channels/chan_oss.c.orig 2014-04-17 20:23:01.000000000 +0000
+++ channels/chan_oss.c
@@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#ifdef __linux
#include <linux/soundcard.h>
--#elif defined(__FreeBSD__) || defined(__CYGWIN__)
-+#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) || defined(__sun)
+-#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)
++#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun) || defined(__DragonFly__)
#include <sys/soundcard.h>
#else
#include <soundcard.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 04:34:28 +0000