- Update to 1.2.13 and bristuff-0.3.0-1s

- Unbreak the build on amd64 (sparc64 should have been fixed too, but
can not test that because panther is down)
- Pull a number of fixes from main port (fix crash caused by the recent
BIND upgrade, make asterisk_pidfile actually working)

Sponsored by:	Ethon Technologies GmbH

12 files changed, 190 insertions, 211 deletions

diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index d14cac1fbe70..9ae81a11a1ff 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.2.7.1
-PORTREVISION=	1
+PORTVERSION=	1.2.13
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -17,7 +16,7 @@ PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
-BRIVER=		bristuff-0.3.0-PRE-1p
+BRIVER=		bristuff-0.3.0-PRE-1s
 CONFLICTS=	asterisk-[0-9]*
 
 MAINTAINER=	fjoe@FreeBSD.org
@@ -29,8 +28,6 @@ LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex \
 		curl.3:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
-FORBIDDEN=	http://www.vuxml.org/freebsd/1c0def84-5fb1-11db-b2e9-0008c79fa3d2.html
-
 ONLY_FOR_ARCHS=	i386 sparc64 amd64
 
 GNU_CONFIGURE=	yes
@@ -50,7 +47,6 @@ MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
-BROKEN=		Does not compile on !i386
 WITHOUT_H323=	1
 WITHOUT_ZAPTEL=	1
 .endif
diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo
index 4769f20a2a68..72d744575a40 100644
--- a/net/asterisk-bristuff/distinfo
+++ b/net/asterisk-bristuff/distinfo
@@ -1,6 +1,6 @@
-MD5 (asterisk-1.2.7.1.tar.gz) = 5c4b473eee2fbc2cb9e346f0564ef970
-SHA256 (asterisk-1.2.7.1.tar.gz) = c561ec886a779a59c78cbeffda457f2a07535ddceb371561c54adc6ee60d984a
-SIZE (asterisk-1.2.7.1.tar.gz) = 10554037
-MD5 (asterisk-1.2.7.1-bristuff-0.3.0-PRE-1p.patch.gz) = d6351c368f76cb8adf9ff2467f56b160
-SHA256 (asterisk-1.2.7.1-bristuff-0.3.0-PRE-1p.patch.gz) = 470c880cd2b856963871c40e2bbf7a52b2a2fa8c76dff03c9e40a3b282965cce
-SIZE (asterisk-1.2.7.1-bristuff-0.3.0-PRE-1p.patch.gz) = 101554
+MD5 (asterisk-1.2.13.tar.gz) = ad8fbe2198568f55c254045ecb3b7926
+SHA256 (asterisk-1.2.13.tar.gz) = 8d197b118d9ee25bc8793b37d1daa6b54fd6074e6738f462368361e5698d98f8
+SIZE (asterisk-1.2.13.tar.gz) = 10584113
+MD5 (asterisk-1.2.13-bristuff-0.3.0-PRE-1s.patch.gz) = ea2db8b5195e1eaf8274ba5aca8ef549
+SHA256 (asterisk-1.2.13-bristuff-0.3.0-PRE-1s.patch.gz) = 26a7306642f4589f909653d7aea15b026f9f155736f7ba08df0af3e0cd465e72
+SIZE (asterisk-1.2.13-bristuff-0.3.0-PRE-1s.patch.gz) = 110909
diff --git a/net/asterisk-bristuff/files/asterisk.sh.in b/net/asterisk-bristuff/files/asterisk.sh.in
index 0c9e1255c07e..3774209eefe1 100644
--- a/net/asterisk-bristuff/files/asterisk.sh.in
+++ b/net/asterisk-bristuff/files/asterisk.sh.in
@@ -16,9 +16,11 @@ name=asterisk
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/asterisk
-pidfile=/var/run/asterisk.pid
+
+load_rc_config $name
+
+pidfile=${asterisk_pidfile:-"/var/run/asterisk.pid"}
 
 asterisk_enable=${asterisk_enable:-"NO"}
 
-load_rc_config $name
 run_rc_command "$1"
diff --git a/net/asterisk-bristuff/files/patch-Makefile b/net/asterisk-bristuff/files/patch-Makefile
index 35e8dbc13c0e..28f02db2dc0a 100644
--- a/net/asterisk-bristuff/files/patch-Makefile
+++ b/net/asterisk-bristuff/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Jun  3 21:34:08 2006
-+++ Makefile	Sat Jun  3 21:38:40 2006
+--- Makefile.orig	Sun Oct 29 16:49:02 2006
++++ Makefile	Sun Oct 29 16:52:11 2006
 @@ -19,8 +19,8 @@
  # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
  # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
@@ -11,7 +11,7 @@
  # CROSS_ARCH=Linux
  # CROSS_PROC=arm
  # SUB_PROC=xscale # or maverick
-@@ -46,14 +46,14 @@
+@@ -47,14 +47,14 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the code
@@ -29,7 +29,7 @@
  
  #Set NOCRYPTO to yes if you do not want to have crypto support or 
  #dependencies
-@@ -85,7 +85,7 @@
+@@ -88,7 +88,7 @@
  
  # Where to install asterisk after compiling
  # Default -> leave empty
@@ -38,7 +38,7 @@
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -108,17 +108,17 @@
+@@ -111,17 +111,17 @@
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
  ifneq ($(OSARCH),SunOS)
@@ -65,13 +65,13 @@
    MODULES_DIR=$(ASTLIBDIR)/modules
    AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  else
-@@ -221,25 +221,25 @@
+@@ -226,25 +226,25 @@
  endif
  
  INCLUDE+=-Iinclude -I../include
 -ASTCFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
 -ASTCFLAGS+=$(OPTIMIZE)
-+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -DMAKE_VALGRIND_HAPPY
 +#ASTCFLAGS+=$(OPTIMIZE)
  ASTOBJ=-o asterisk
  
@@ -97,7 +97,7 @@
  else
    ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
      ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
-@@ -248,27 +248,24 @@
+@@ -253,27 +253,24 @@
  
  ifeq ($(OSARCH),FreeBSD)
    BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
@@ -139,16 +139,7 @@
  
  endif # FreeBSD
  
-@@ -284,7 +281,7 @@
- 
- ifeq ($(OSARCH),SunOS)
-   ASTCFLAGS+=-Wcast-align -DSOLARIS
--  INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
-+  INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/include
- endif
- 
- ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-@@ -299,7 +296,7 @@
+@@ -307,7 +304,7 @@
  
  ifndef WITHOUT_ZAPTEL
  
@@ -157,20 +148,7 @@
    ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
  endif
  
-@@ -391,10 +388,10 @@
- endif
- 
- ifeq ($(OSARCH),SunOS)
--  LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
-+  LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib
-   OBJS+=strcompat.o
-   ASTLINK=
--  SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
-+  SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib
- endif
- 
- ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-@@ -402,7 +399,7 @@
+@@ -414,7 +411,7 @@
  endif
  
  # This is used when generating the doxygen documentation
@@ -179,7 +157,7 @@
    HAVEDOT=yes
  else
    HAVEDOT=no
-@@ -421,7 +418,7 @@
+@@ -431,7 +428,7 @@
  	@echo " +               $(MAKE) install                +"  
  	@echo " +-------------------------------------------+"  
  
@@ -188,8 +166,8 @@
  
  #ifneq ($(wildcard tags),)
  ctags: tags
-@@ -440,13 +437,13 @@
- 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+@@ -450,13 +447,13 @@
+ 	cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
  	$(MAKE) -C editline libedit.a
  
 -db1-ast/libdb1.a: FORCE
@@ -209,7 +187,7 @@
  
  ifneq ($(wildcard .depend),)
    include .depend
-@@ -470,10 +467,10 @@
+@@ -480,10 +477,10 @@
  
  manpage: asterisk.8
  
@@ -224,7 +202,7 @@
  
  asterisk.pdf: asterisk.sgml
  	docbook2pdf asterisk.sgml
-@@ -513,14 +510,14 @@
+@@ -523,14 +520,14 @@
  cygwin_a:
  	$(MAKE) -C cygwin all
  
@@ -241,7 +219,7 @@
  
  muted: muted.o
  	$(CC) $(AUDIO_LIBS) -o muted muted.o
-@@ -542,38 +539,38 @@
+@@ -552,38 +549,38 @@
  
  datafiles: all
  	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -289,9 +267,9 @@
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -581,18 +578,18 @@
+@@ -591,18 +588,18 @@
  	done
- 	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
+ 	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \
  		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
 -			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 +			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
@@ -313,7 +291,7 @@
  
  update: 
  	@if [ -d .svn ]; then \
-@@ -621,73 +618,51 @@
+@@ -631,47 +628,45 @@
  OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
  
  bininstall: all
@@ -342,10 +320,8 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
-+	if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
-+	if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
-+	if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
- 	ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
++	if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
+ 	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
 -	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 -	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/	
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
@@ -354,7 +330,6 @@
  		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
  		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
  	fi
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
 -	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
 -	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
@@ -394,7 +369,15 @@
  	else \
  		echo "You need to do cvs update -d not just cvs update" ; \
  	fi 
--	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
+@@ -701,46 +696,28 @@
+ 		echo " WARNING WARNING WARNING" ;\
+ 	fi
+ 
+-install: all datafiles bininstall install-subdirs
++install: all datafiles bininstall install-subdirs samples
+ 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
+ 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ 	fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -418,17 +401,6 @@
 -	@echo " +-------------------------------------------+"
  	@$(MAKE) -s oldmodcheck
  
- NEWMODS=$(notdir $(wildcard */*.so))
-@@ -711,7 +686,7 @@
- 		echo " WARNING WARNING WARNING" ;\
- 	fi
- 
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
- 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
- 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
- 	fi
-@@ -719,16 +694,19 @@
  upgrade: all bininstall
  
  adsi:
@@ -451,7 +423,7 @@
  		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
-@@ -741,7 +719,7 @@
+@@ -753,7 +730,7 @@
  				continue; \
  			fi ;\
  		fi ; \
@@ -460,9 +432,9 @@
  	done
  	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
  		( \
-@@ -763,25 +741,25 @@
+@@ -775,25 +752,25 @@
  		echo "[options]" ; \
- 		echo "uniquename = asterisk" ;\
+ 		echo "uniquename = `hostname`" ;\
  		echo "silence_suppression = yes" ;\
 -		) > $(DESTDIR)$(ASTCONFPATH) ; \
 +		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
@@ -492,16 +464,19 @@
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
  		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -795,7 +773,7 @@
+@@ -807,9 +784,9 @@
  	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
  	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
 -	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
 +	$(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
  	for x in images/*.gif; do \
- 		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
+-		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
++		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
  	done
-@@ -824,10 +802,10 @@
+ 	@echo " +--------- Asterisk Web Voicemail ----------+"  
+ 	@echo " +                                           +"
+@@ -836,10 +813,10 @@
  
  __rpm: include/asterisk/version.h spec
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk-bristuff/files/patch-apps::Makefile b/net/asterisk-bristuff/files/patch-apps::Makefile
index 2b0de4d3381c..9881ae1f3831 100644
--- a/net/asterisk-bristuff/files/patch-apps::Makefile
+++ b/net/asterisk-bristuff/files/patch-apps::Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- apps/Makefile.orig
-+++ apps/Makefile
+--- apps/Makefile.orig	Sun Apr 30 16:38:22 2006
++++ apps/Makefile	Wed Jun 14 14:03:42 2006
 @@ -45,25 +45,27 @@
  #APPS+=app_rpt.so
  
@@ -40,7 +37,7 @@ $FreeBSD$
  
  ifeq (${OSARCH},CYGWIN)
  CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-@@ -95,24 +97,32 @@
+@@ -95,18 +97,26 @@
  	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone
  
  install: all
@@ -70,10 +67,3 @@ $FreeBSD$
  
  app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
- 
- look:	look.c
--	$(CC) -pipe -O6 -g look.c -o look -lncurses
-+	$(CC) look.c -o look -lncurses
- 
- ifeq (SunOS,$(shell uname))
- app_chanspy.so: app_chanspy.o
diff --git a/net/asterisk-bristuff/files/patch-apps::app_rxfax.c b/net/asterisk-bristuff/files/patch-apps::app_rxfax.c
index 820208e1943d..cabfb1a98604 100644
--- a/net/asterisk-bristuff/files/patch-apps::app_rxfax.c
+++ b/net/asterisk-bristuff/files/patch-apps::app_rxfax.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- /dev/null	Thu Jan 12 17:44:40 2006
-+++ apps/app_rxfax.c	Thu Jan 12 17:41:53 2006
-@@ -0,0 +1,373 @@
+--- apps/app_rxfax.c.orig
++++ apps/app_rxfax.c
+@@ -0,0 +1,393 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
 + *
@@ -17,31 +17,37 @@ $FreeBSD$
 + * the GNU General Public License
 + */
 + 
-+#include <stdio.h>
-+#include <asterisk/lock.h>
-+#include <asterisk/file.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <asterisk/pbx.h>
-+#include <asterisk/module.h>
-+#include <asterisk/translate.h>
-+#include <asterisk/dsp.h>
-+#include <asterisk/manager.h>
-+#include <asterisk/version.h>
 +#include <string.h>
 +#include <stdlib.h>
-+#if defined(__FreeBSD__) && __FreeBSD_version < 500028
++#include <stdio.h>
++#if !defined(__FreeBSD__) || __FreeBSD_version < 500028
 +#include <inttypes.h>
 +#else
 +#include <stdint.h>
 +#endif
 +#include <pthread.h>
 +#include <errno.h>
-+#include <math.h>
++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000
++#include <tgmath.h>
++#endif
 +#include <tiffio.h>
 +
 +#include <spandsp.h>
 +
++#include "asterisk.h"
++
++ASTERISK_FILE_VERSION(__FILE__, "$Revision:$")
++
++#include "asterisk/lock.h"
++#include "asterisk/file.h"
++#include "asterisk/logger.h"
++#include "asterisk/channel.h"
++#include "asterisk/pbx.h"
++#include "asterisk/module.h"
++#include "asterisk/translate.h"
++#include "asterisk/dsp.h"
++#include "asterisk/manager.h"
++
 +static char *tdesc = "Trivial FAX Receive Application";
 +
 +static char *app = "RxFAX";
@@ -70,6 +76,20 @@ $FreeBSD$
 +
 +#define MAX_BLOCK_SIZE 240
 +
++static void span_message(int level, const char *msg)
++{
++    int ast_level;
++    
++    if (level == SPAN_LOG_WARNING)
++        ast_level = __LOG_WARNING;
++    else if (level == SPAN_LOG_WARNING)
++        ast_level = __LOG_WARNING;
++    else
++        ast_level = __LOG_DEBUG;
++    ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg);
++}
++/*- End of function --------------------------------------------------------*/
++
 +static void t30_flush(t30_state_t *s, int which)
 +{
 +    //TODO:
@@ -85,11 +105,11 @@ $FreeBSD$
 +    char buf[11];
 +    
 +    chan = (struct ast_channel *) user_data;
-+    if (result)
++    if (result == T30_ERR_OK)
 +    {
-+        fax_get_transfer_statistics(s, &t);
-+        fax_get_far_ident(s, far_ident);
-+        fax_get_local_ident(s, local_ident);
++        t30_get_transfer_statistics(s, &t);
++        t30_get_far_ident(s, far_ident);
++        t30_get_local_ident(s, local_ident);
 +        ast_log(LOG_DEBUG, "==============================================================================\n");
 +        ast_log(LOG_DEBUG, "Fax successfully received.\n");
 +        ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident);
@@ -102,11 +122,7 @@ $FreeBSD$
 +                      "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n",
 +                      chan->name,
 +                      chan->exten,
-+#if ASTERISK_VERSION_NUM <= 010010
-+                      chan->callerid,
-+#else
 +                      (chan->cid.cid_num)  ?  chan->cid.cid_num  :  "",
-+#endif
 +                      far_ident,
 +                      local_ident,
 +                      t.pages_transferred,
@@ -124,7 +140,7 @@ $FreeBSD$
 +    else
 +    {
 +        ast_log(LOG_DEBUG, "==============================================================================\n");
-+        ast_log(LOG_DEBUG, "Fax receive not successful.\n");
++        ast_log(LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result));
 +        ast_log(LOG_DEBUG, "==============================================================================\n");
 +    }
 +}
@@ -138,7 +154,7 @@ $FreeBSD$
 +    chan = (struct ast_channel *) user_data;
 +    if (result)
 +    {
-+        fax_get_transfer_statistics(s, &t);
++        t30_get_transfer_statistics(s, &t);
 +        ast_log(LOG_DEBUG, "==============================================================================\n");
 +        ast_log(LOG_DEBUG, "Pages transferred:  %i\n", t.pages_transferred);
 +        ast_log(LOG_DEBUG, "Image size:         %i x %i\n", t.columns, t.rows);
@@ -186,6 +202,8 @@ $FreeBSD$
 +        return -1;
 +    }
 +
++    span_set_message_handler(span_message);
++
 +    /* The next few lines of code parse out the filename and header from the input string */
 +    if (data == NULL)
 +    {
@@ -203,7 +221,7 @@ $FreeBSD$
 +        t = s;
 +        v = strchr(s, '|');
 +        s = (v)  ?  v  :  s + strlen(s);
-+        strncpy(buf, t, s - t);
++        strncpy((char *) buf, t, s - t);
 +        buf[s - t] = '\0';
 +        if (option == 0)
 +        {
@@ -274,17 +292,18 @@ $FreeBSD$
 +            }
 +        }
 +        fax_init(&fax, calling_party, NULL);
-+        fax.verbose = verbose;
++        if (verbose)
++            fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW;
 +        x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
 +        if (x  &&  x[0])
-+            fax_set_local_ident(&fax, x);
++            t30_set_local_ident(&fax, x);
 +        x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO");
 +        if (x  &&  x[0])
-+            fax_set_header_info(&fax, x);
-+        fax_set_rx_file(&fax, target_file);
-+        //fax_set_phase_b_handler(&fax, phase_b_handler, chan);
-+        fax_set_phase_d_handler(&fax, phase_d_handler, chan);
-+        fax_set_phase_e_handler(&fax, phase_e_handler, chan);
++            t30_set_header_info(&fax, x);
++        t30_set_rx_file(&fax, target_file, -1);
++        //t30_set_phase_b_handler(&fax, phase_b_handler, chan);
++        t30_set_phase_d_handler(&fax, phase_d_handler, chan);
++        t30_set_phase_e_handler(&fax, phase_e_handler, chan);
 +        while (ast_waitfor(chan, -1) > -1)
 +        {
 +            inf = ast_read(chan);
@@ -295,10 +314,10 @@ $FreeBSD$
 +            }
 +            if (inf->frametype == AST_FRAME_VOICE)
 +            {
-+                if (fax_rx_process(&fax, inf->data, inf->samples))
++                if (fax_rx(&fax, inf->data, inf->samples))
 +                    break;
 +                samples = (inf->samples <= MAX_BLOCK_SIZE)  ?  inf->samples  :  MAX_BLOCK_SIZE;
-+                len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples);
++                len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples);
 +                if (len)
 +                {
 +                    memset(&outf, 0, sizeof(outf));
@@ -335,6 +354,7 @@ $FreeBSD$
 +            if (res)
 +                ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name);
 +        }
++        fax_release(&fax);
 +    }
 +    else
 +    {
diff --git a/net/asterisk-bristuff/files/patch-apps::app_txfax.c b/net/asterisk-bristuff/files/patch-apps::app_txfax.c
index 15ad6674788e..8d81a55ae13c 100644
--- a/net/asterisk-bristuff/files/patch-apps::app_txfax.c
+++ b/net/asterisk-bristuff/files/patch-apps::app_txfax.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- /dev/null	Thu Jan 12 17:48:54 2006
-+++ apps/app_txfax.c	Thu Jan 12 17:48:36 2006
-@@ -0,0 +1,295 @@
+--- apps/app_txfax.c.orig
++++ apps/app_txfax.c
+@@ -0,0 +1,320 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
 + *
@@ -17,28 +17,35 @@ $FreeBSD$
 + * the GNU General Public License
 + */
 + 
-+#include <stdio.h>
-+#include <asterisk/lock.h>
-+#include <asterisk/file.h>
-+#include <asterisk/logger.h>
-+#include <asterisk/channel.h>
-+#include <asterisk/pbx.h>
-+#include <asterisk/module.h>
-+#include <asterisk/translate.h>
 +#include <string.h>
 +#include <stdlib.h>
-+#include <math.h>
-+#if defined(__FreeBSD__) && __FreeBSD_version < 500028
++#include <stdio.h>
++#if !defined(__FreeBSD__) || __FreeBSD_version < 500028
 +#include <inttypes.h>
 +#else
 +#include <stdint.h>
 +#endif
 +#include <pthread.h>
 +#include <errno.h>
++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000
++#include <tgmath.h>
++#endif
 +#include <tiffio.h>
 +
 +#include <spandsp.h>
 +
++#include "asterisk.h"
++
++ASTERISK_FILE_VERSION(__FILE__, "$Revision:$")
++
++#include "asterisk/lock.h"
++#include "asterisk/file.h"
++#include "asterisk/logger.h"
++#include "asterisk/channel.h"
++#include "asterisk/pbx.h"
++#include "asterisk/module.h"
++#include "asterisk/translate.h"
++
 +static char *tdesc = "Trivial FAX Transmit Application";
 +
 +static char *app = "TxFAX";
@@ -62,6 +69,20 @@ $FreeBSD$
 +
 +#define MAX_BLOCK_SIZE 240
 +
++static void span_message(int level, const char *msg)
++{
++    int ast_level;
++    
++    if (level == SPAN_LOG_WARNING)
++        ast_level = __LOG_WARNING;
++    else if (level == SPAN_LOG_WARNING)
++        ast_level = __LOG_WARNING;
++    else
++        ast_level = __LOG_DEBUG;
++    ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg);
++}
++/*- End of function --------------------------------------------------------*/
++
 +static void t30_flush(t30_state_t *s, int which)
 +{
 +    //TODO:
@@ -74,15 +95,15 @@ $FreeBSD$
 +    char far_ident[21];
 +    
 +    chan = (struct ast_channel *) user_data;
-+    if (result)
++    if (result == T30_ERR_OK)
 +    {
-+        fax_get_far_ident(s, far_ident);
++        t30_get_far_ident(s, far_ident);
 +        pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident);
 +    }
 +    else
 +    {
 +        ast_log(LOG_DEBUG, "==============================================================================\n");
-+        ast_log(LOG_DEBUG, "Fax send not successful.\n");
++        ast_log(LOG_DEBUG, "Fax send not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result));
 +        ast_log(LOG_DEBUG, "==============================================================================\n");
 +    }
 +}
@@ -119,6 +140,8 @@ $FreeBSD$
 +        return -1;
 +    }
 +
++    span_set_message_handler(span_message);
++
 +    /* The next few lines of code parse out the filename and header from the input string */
 +    if (data == NULL)
 +    {
@@ -136,7 +159,7 @@ $FreeBSD$
 +        t = s;
 +        v = strchr(s, '|');
 +        s = (v)  ?  v  :  s + strlen(s);
-+        strncpy(buf, t, s - t);
++        strncpy((char *) buf, t, s - t);
 +        buf[s - t] = '\0';
 +        if (option == 0)
 +        {
@@ -194,18 +217,19 @@ $FreeBSD$
 +            }
 +        }
 +        fax_init(&fax, calling_party, NULL);
-+        fax.verbose = verbose;
++        if (verbose)
++	    fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW;
 +
 +        x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
 +        if (x  &&  x[0])
-+            fax_set_local_ident(&fax, x);
++            t30_set_local_ident(&fax, x);
 +        x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO");
 +        if (x  &&  x[0])
-+            fax_set_header_info(&fax, x);
-+        fax_set_tx_file(&fax, source_file);
-+        //fax_set_phase_b_handler(&fax, phase_b_handler, chan);
-+        //fax_set_phase_d_handler(&fax, phase_d_handler, chan);
-+        fax_set_phase_e_handler(&fax, phase_e_handler, chan);
++            t30_set_header_info(&fax, x);
++        t30_set_tx_file(&fax, source_file, -1, -1);
++        //t30_set_phase_b_handler(&fax, phase_b_handler, chan);
++        //t30_set_phase_d_handler(&fax, phase_d_handler, chan);
++        t30_set_phase_e_handler(&fax, phase_e_handler, chan);
 +        while (ast_waitfor(chan, -1) > -1)
 +        {
 +            inf = ast_read(chan);
@@ -216,10 +240,10 @@ $FreeBSD$
 +            }
 +            if (inf->frametype == AST_FRAME_VOICE)
 +            {
-+                if (fax_rx_process(&fax, inf->data, inf->samples))
++                if (fax_rx(&fax, inf->data, inf->samples))
 +                    break;
 +                samples = (inf->samples <= MAX_BLOCK_SIZE)  ?  inf->samples  :  MAX_BLOCK_SIZE;
-+                len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples);
++                len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples);
 +                if (len)
 +                {
 +                    memset(&outf, 0, sizeof(outf));
@@ -255,6 +279,7 @@ $FreeBSD$
 +            if (res)
 +                ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name);
 +        }
++        fax_release(&fax);
 +    }
 +    else
 +    {
diff --git a/net/asterisk-bristuff/files/patch-cdr::Makefile b/net/asterisk-bristuff/files/patch-cdr::Makefile
index 506db2fedcf9..ff9bae81cfd4 100644
--- a/net/asterisk-bristuff/files/patch-cdr::Makefile
+++ b/net/asterisk-bristuff/files/patch-cdr::Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- cdr/Makefile.orig	Tue Nov 29 20:24:39 2005
-+++ cdr/Makefile	Thu Jan 12 17:56:23 2006
+--- cdr/Makefile.orig	Thu Sep 21 17:18:19 2006
++++ cdr/Makefile	Thu Oct 19 10:52:51 2006
 @@ -21,8 +21,8 @@
  endif
  
@@ -14,7 +11,7 @@ $FreeBSD$
  endif
  
  #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
-@@ -38,18 +38,18 @@
+@@ -38,21 +38,21 @@
  #
  # unixODBC stuff...
  #
@@ -27,17 +24,21 @@ $FreeBSD$
  # FreeTDS stuff...
  #
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
--  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
+-  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1)
 +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
-+  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
-     CFLAGS += -DFREETDS_0_63
++  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1)
+     CFLAGS += -DFREETDS_0_64
    else
--	ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
-+	ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
-       CFLAGS += -DFREETDS_0_62
+-    ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
++    ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
+     CFLAGS += -DFREETDS_0_63
      else
-       CFLAGS += -DFREETDS_PRE_0_62
-@@ -61,7 +61,7 @@
+-	  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
++	  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
+         CFLAGS += -DFREETDS_0_62
+       else
+         CFLAGS += -DFREETDS_PRE_0_62
+@@ -65,7 +65,7 @@
  #
  # PGSQL stuff...  Autoconf anyone??
  #
@@ -46,7 +47,7 @@ $FreeBSD$
    MODS+=cdr_pgsql.so
  endif
  
-@@ -82,9 +82,9 @@
+@@ -86,9 +86,9 @@
    MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql
  endif
  
@@ -59,7 +60,7 @@ $FreeBSD$
  endif
  
  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)
-@@ -110,7 +110,7 @@
+@@ -114,7 +114,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile b/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile
index 7256eeae5692..756d43ca6fcd 100644
--- a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile
+++ b/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile
@@ -1,16 +1,11 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig
-+++ codecs/gsm/Makefile
-@@ -49,7 +49,9 @@
- ifneq (${PROC},arm)
- ifneq (${PROC},ppc)
- ifneq (${PROC},ppc64)
+--- codecs/gsm/Makefile.orig	Tue May 30 22:18:30 2006
++++ codecs/gsm/Makefile	Wed Jun 14 14:07:42 2006
+@@ -51,7 +51,7 @@
+            ifneq (${PROC},ppc)
+             ifneq (${PROC},ppc64)
+              ifneq (${PROC},s390)
 -OPTIMIZE+=-march=$(PROC)
-+ifneq (${PROC},amd64)
 +#OPTIMIZE+=-march=$(PROC)
-+endif
- endif
- endif
- endif
+              endif
+             endif
+            endif
diff --git a/net/asterisk-bristuff/files/patch-editline::configure b/net/asterisk-bristuff/files/patch-editline::configure
deleted file mode 100644
index f6b9c5b76eee..000000000000
--- a/net/asterisk-bristuff/files/patch-editline::configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- editline/configure.orig	Sun Apr 27 21:13:11 2003
-+++ editline/configure	Fri Jan 30 01:47:34 2004
-@@ -1906,7 +1906,7 @@
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
- else
--  CFLAGS="$CFLAGS -O"
-+  CFLAGS="$CFLAGS"
- fi
- 
- 
diff --git a/net/asterisk-bristuff/files/patch-editline::makelist b/net/asterisk-bristuff/files/patch-editline::makelist
deleted file mode 100644
index cff9b3ae29e0..000000000000
--- a/net/asterisk-bristuff/files/patch-editline::makelist
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- editline/makelist
-+++ editline/makelist
-@@ -145,7 +145,7 @@
- #
- -fh)
-     cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
--    sort | tr '[a-z]' '[A-Z]' | $AWK '
-+    sort | tr '[:lower:]' '[:upper:]' | $AWK '
- 	BEGIN {
- 	    printf("/* Automatically generated file, do not edit */\n");
- 	    printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist
index e1617d15ce60..b50ac4c43495 100644
--- a/net/asterisk-bristuff/pkg-plist
+++ b/net/asterisk-bristuff/pkg-plist
@@ -532,6 +532,7 @@ sbin/streamplayer
 %%DATADIR%%/sounds/dir-nomatch.gsm
 %%DATADIR%%/sounds/dir-nomore.gsm
 %%DATADIR%%/sounds/hello-world.gsm
+%%DATADIR%%/sounds/hours.gsm
 %%DATADIR%%/sounds/invalid.gsm
 %%DATADIR%%/sounds/letters/a.gsm
 %%DATADIR%%/sounds/letters/at.gsm
@@ -569,6 +570,7 @@ sbin/streamplayer
 %%DATADIR%%/sounds/letters/y.gsm
 %%DATADIR%%/sounds/letters/z.gsm
 %%DATADIR%%/sounds/letters/zed.gsm
+%%DATADIR%%/sounds/minutes.gsm
 %%DATADIR%%/sounds/pbx-invalid.gsm
 %%DATADIR%%/sounds/pbx-invalidpark.gsm
 %%DATADIR%%/sounds/pbx-transfer.gsm
@@ -618,6 +620,7 @@ sbin/streamplayer
 %%DATADIR%%/sounds/queue-thereare.gsm
 %%DATADIR%%/sounds/queue-youarenext.gsm
 %%DATADIR%%/sounds/screen-callee-options.gsm
+%%DATADIR%%/sounds/seconds.gsm
 %%DATADIR%%/sounds/spy-agent.gsm
 %%DATADIR%%/sounds/spy-h323.gsm
 %%DATADIR%%/sounds/spy-iax.gsm