Update to 1.0.6 and bristuff 0.2.0-RC7j.

Approved by:	MAINTAINER
Sponsored by:	LF.net

4 files changed, 15 insertions, 15 deletions

diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 1c9a5b8597da..6aef3e6708bc 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -26,7 +26,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql
 
 ONLY_FOR_ARCHS=	i386 sparc64
 
-BRIVER=		bristuff-0.2.0-RC7f
+BRIVER=		bristuff-0.2.0-RC7j
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo
index 8af7e7d777c9..4b14ce651b0d 100644
--- a/net/asterisk-bristuff/distinfo
+++ b/net/asterisk-bristuff/distinfo
@@ -1,4 +1,4 @@
-MD5 (asterisk-1.0.5.tar.gz) = efabd43ac70ada3bdc97a57027c670a3
-SIZE (asterisk-1.0.5.tar.gz) = 9586778
-MD5 (asterisk-1.0.5-bristuff-0.2.0-RC7f.patch.gz) = c4b3de9bffec5b474ce0881dda5825a2
-SIZE (asterisk-1.0.5-bristuff-0.2.0-RC7f.patch.gz) = 38556
+MD5 (asterisk-1.0.6.tar.gz) = c16efa9a64564763a0d9e3e1e9350c8d
+SIZE (asterisk-1.0.6.tar.gz) = 9589123
+MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9
+SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762
diff --git a/net/asterisk-bristuff/files/patch-formats::format_g729.c b/net/asterisk-bristuff/files/patch-formats::format_g729.c
index a144d1b0f6bf..78899a3e5d43 100644
--- a/net/asterisk-bristuff/files/patch-formats::format_g729.c
+++ b/net/asterisk-bristuff/files/patch-formats::format_g729.c
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- formats/format_g729.c.orig	Wed Jan 28 23:32:48 2004
-+++ formats/format_g729.c	Thu Feb 19 01:03:30 2004
-@@ -45,7 +45,7 @@
+--- formats/format_g729.c.orig	Mon Feb  7 10:29:19 2005
++++ formats/format_g729.c	Wed Mar  9 06:26:36 2005
+@@ -44,7 +44,7 @@
  	struct ast_frame fr;				/* Frame information */
  	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
  	char empty;							/* Empty character */
@@ -12,7 +9,7 @@ $FreeBSD$
  };
  
  
-@@ -126,11 +126,11 @@
+@@ -125,11 +125,11 @@
  	s->fr.frametype = AST_FRAME_VOICE;
  	s->fr.subclass = AST_FORMAT_G729A;
  	s->fr.offset = AST_FRIENDLY_OFFSET;
@@ -24,10 +21,10 @@ $FreeBSD$
  	s->fr.data = s->g729;
 -	if ((res = read(s->fd, s->g729, 20)) != 20) {
 +	if ((res = read(s->fd, s->g729, 10)) != 10) {
- 		if (res)
+ 		if (res && (res != 10))
  			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
  		return NULL;
-@@ -174,7 +174,7 @@
+@@ -173,7 +173,7 @@
  	cur = lseek(fs->fd, 0, SEEK_CUR);
  	max = lseek(fs->fd, 0, SEEK_END);
  	
diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist
index ecc2a5bf5f50..7cc3218bde84 100644
--- a/net/asterisk-bristuff/pkg-plist
+++ b/net/asterisk-bristuff/pkg-plist
@@ -189,6 +189,7 @@ lib/asterisk/modules/app_chanisavail.so
 lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
 lib/asterisk/modules/app_db.so
+lib/asterisk/modules/app_devstate.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
@@ -213,6 +214,7 @@ lib/asterisk/modules/app_milliwatt.so
 lib/asterisk/modules/app_mp3.so
 lib/asterisk/modules/app_nbscat.so
 lib/asterisk/modules/app_parkandannounce.so
+lib/asterisk/modules/app_pickup.so
 lib/asterisk/modules/app_playback.so
 lib/asterisk/modules/app_privacy.so
 lib/asterisk/modules/app_qcall.so
@@ -221,6 +223,7 @@ lib/asterisk/modules/app_random.so
 lib/asterisk/modules/app_read.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
+lib/asterisk/modules/app_segfault.so
 lib/asterisk/modules/app_senddtmf.so
 lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so