4 files changed, 9 insertions, 26 deletions

diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 5548fed5863c..f6816dc37ab1 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -14,8 +14,6 @@ MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BROKEN=		"Does not compile"
-
 ONLY_FOR_ARCHS=	i386
 
 BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo
index 38db09d4734e..13e376bb0fae 100644
--- a/net/asterisk-bristuff/distinfo
+++ b/net/asterisk-bristuff/distinfo
@@ -1 +1,2 @@
-MD5 (asterisk-0.7.1.tar.gz) = 593e7154a2def54e70d8855434fd9e5c
+MD5 (asterisk-0.7.2.tar.gz) = a1f9485f5f85a4e4129782b6e642e236
+SIZE (asterisk-0.7.2.tar.gz) = 2779788
diff --git a/net/asterisk-bristuff/files/patch-channels::Makefile b/net/asterisk-bristuff/files/patch-channels::Makefile
index 57e7635206a8..d05ee2c13676 100644
--- a/net/asterisk-bristuff/files/patch-channels::Makefile
+++ b/net/asterisk-bristuff/files/patch-channels::Makefile
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Wed Dec 10 04:19:22 2003
-+++ channels/Makefile	Fri Jan 30 01:47:34 2004
+--- channels/Makefile.orig	Fri Jan 23 22:57:48 2004
++++ channels/Makefile	Thu Feb 19 01:48:41 2004
 @@ -26,12 +26,10 @@
  #
  #CHANNEL_LIBS+=chan_vofr
@@ -29,14 +29,14 @@ $FreeBSD$
  
  chan_iax2.so: chan_iax2.o iax2-parser.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -139,15 +135,17 @@
+@@ -146,15 +142,17 @@
  chan_vpb.so: chan_vpb.o
  	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
  
 -chan_h323.so: chan_h323.o h323/libchanh323.a
 -	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
++	$(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
diff --git a/net/asterisk-bristuff/files/patch-formats::format_g729.c b/net/asterisk-bristuff/files/patch-formats::format_g729.c
index a255fc351e71..a144d1b0f6bf 100644
--- a/net/asterisk-bristuff/files/patch-formats::format_g729.c
+++ b/net/asterisk-bristuff/files/patch-formats::format_g729.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- formats/format_g729.c.orig	Mon Sep  8 19:48:07 2003
-+++ formats/format_g729.c	Fri Jan 30 01:47:34 2004
+--- 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 @@
  	struct ast_frame fr;				/* Frame information */
  	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
@@ -27,22 +27,6 @@ $FreeBSD$
  		if (res)
  			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
  		return NULL;
-@@ -150,12 +150,12 @@
- 		ast_log(LOG_WARNING, "Asked to write non-G729 frame (%d)!\n", f->subclass);
- 		return -1;
- 	}
--	if (f->datalen % 20) {
--		ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 20\n", f->datalen);
-+	if (f->datalen % 10) {
-+		ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 10\n", f->datalen);
- 		return -1;
- 	}
- 	if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
--			ast_log(LOG_WARNING, "Bad write (%d/20): %s\n", res, strerror(errno));
-+			ast_log(LOG_WARNING, "Bad write (%d/10): %s\n", res, strerror(errno));
- 			return -1;
- 	}
- 	return 0;
 @@ -174,7 +174,7 @@
  	cur = lseek(fs->fd, 0, SEEK_CUR);
  	max = lseek(fs->fd, 0, SEEK_END);