Update to 1.0.1.

author: sobomax <sobomax@FreeBSD.org> 2004-10-18 02:00:02 +0800
committer: sobomax <sobomax@FreeBSD.org> 2004-10-18 02:00:02 +0800
commit: 7ff2f405ce157c058154a45ecdaca5a63315aff7 (patch)
tree: 49c5befe7ad728e927609cb504b3f10285bd7b52 /net
parent: 5afb7d5be8fcbc46177741e082bc45849839f973 (diff)
download: freebsd-ports-gnome-7ff2f405ce157c058154a45ecdaca5a63315aff7.tar.gz
freebsd-ports-gnome-7ff2f405ce157c058154a45ecdaca5a63315aff7.tar.zst
freebsd-ports-gnome-7ff2f405ce157c058154a45ecdaca5a63315aff7.zip
182 files changed, 3878 insertions, 2660 deletions
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 420c2dcfe4e7..3f24e2ef57a9 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -17,11 +16,13 @@ COMMENT=	An Open Source PBX and telephony toolkit
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
 		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
@@ -35,14 +36,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
-.include <bsd.port.pre.mk>
+MAN8=		asterisk.8
 
-.if defined(WITH_ZAPTEL) || exists(${LOCALBASE}/include/zaptel.h)
-BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-PLIST_SUB=	ZAPTEL=""
-.else
-PLIST_SUB=	ZAPTEL="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo
index a12f4a79e431..d7661cced0c6 100644
--- a/net/asterisk-bristuff/distinfo
+++ b/net/asterisk-bristuff/distinfo
@@ -1,2 +1,2 @@
-MD5 (asterisk-0.9.0.tar.gz) = cb0fbb5185fdf2356ee30bdcf4ad9b9c
-SIZE (asterisk-0.9.0.tar.gz) = 2787458
+MD5 (asterisk-1.0.1.tar.gz) = cb55b1a0be8ff6e94179db0cdc7e074d
+SIZE (asterisk-1.0.1.tar.gz) = 9558497
diff --git a/net/asterisk-bristuff/files/patch-Makefile b/net/asterisk-bristuff/files/patch-Makefile
index 94155a666be0..43bf910fe669 100644
--- a/net/asterisk-bristuff/files/patch-Makefile
+++ b/net/asterisk-bristuff/files/patch-Makefile
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- Makefile.orig	Thu Apr  1 01:43:10 2004
-+++ Makefile	Wed Apr 14 22:08:43 2004
-@@ -43,10 +43,10 @@
+--- Makefile.orig	Tue Sep 28 20:11:30 2004
++++ Makefile	Thu Oct 14 19:48:30 2004
+@@ -62,10 +62,10 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
  
  #Include debug symbols in the executables (-g) and profiling info (-pg)
 -DEBUG=-g #-pg
 +#DEBUG=-g #-pg
  
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
+ # If you are running a radio application, define RADIO_RELAX so that the DTMF
+ # will be received more reliably
+@@ -90,7 +90,7 @@
  
  # Where to install asterisk after compiling
  # Default -> leave empty
@@ -25,7 +25,7 @@ $FreeBSD$
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -88,28 +88,27 @@
+@@ -110,23 +110,23 @@
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
@@ -44,36 +44,45 @@ $FreeBSD$
 -ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
 -ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
 -ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+-ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 +ASTBINDIR=$(INSTALL_PREFIX)/bin
 +ASTSBINDIR=$(INSTALL_PREFIX)/sbin
 +ASTVARRUNDIR=/var/run
++ASTMANDIR=$(INSTALL_PREFIX)/man
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
- INCLUDE=-Iinclude -I../include 
+ INCLUDE=-Iinclude -I../include
 -CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
- CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ 
+ ifneq ($(PROC),ultrasparc)
+@@ -137,11 +137,8 @@
+ CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
+ 
  ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
+-OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 -INCLUDE+=-I/usr/local/include
+-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 +CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +150,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +178,7 @@
++LIBS+=$(PTHREAD_LIBS)
+ endif # FreeBSD
+ 
+ ifeq (${OSARCH},NetBSD)
+@@ -157,7 +154,7 @@
+ #CFLAGS+=-DOLD_DSP_ROUTINES
+ 
+ CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
++CFLAGS+=-I$(LOCALBASE)/include -DZAPTEL_OPTIMIZATIONS
+ 
+ LIBEDIT=editline/libedit.a
+ 
+@@ -219,7 +216,7 @@
  SOLINK=-shared -Xlinker -x
  endif
  
@@ -82,7 +91,16 @@ $FreeBSD$
  INSTALL=install
  
  _all: all
-@@ -200,13 +199,13 @@
+@@ -231,7 +228,7 @@
+ 	@echo " +               $(MAKE) install                +"  
+ 	@echo " +-------------------------------------------+"  
+ 
+-all: depend asterisk subdirs 
++all: depend asterisk subdirs manpage
+ 
+ editline/config.h:
+ 	cd editline && unset CFLAGS LIBS && ./configure ; \
+@@ -240,13 +237,13 @@
  	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  	$(MAKE) -C editline libedit.a
  
@@ -103,18 +121,35 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
  include .depend
-@@ -244,8 +243,8 @@
+@@ -268,13 +265,10 @@
+ 
+ asterisk.o: asterisk.c build.h
+ 
+-manpage: asterisk.8.gz
++manpage: asterisk.8
+ 
+-asterisk.8.gz: asterisk.sgml
+-	rm -f asterisk.8
+-	docbook2man asterisk.sgml
+-	mv ./*.8 asterisk.8
+-	gzip asterisk.8
++asterisk.8: asterisk.8.gz
++	gzcat asterisk.8.gz > asterisk.8
+ 
+ ifneq ($(strip $(ASTERISKVERSION)),)
+ build.h: .version
+@@ -292,8 +286,8 @@
  		exit 1; \
  	fi
  
 -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+-	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
 +asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
++	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS)
  
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +259,10 @@
+ muted: muted.o
+ 	$(CC) -o muted muted.o
+@@ -312,28 +306,28 @@
  	$(MAKE) -C stdtime clean
  
  datafiles: all
@@ -127,9 +162,31 @@ $FreeBSD$
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -271,18 +270,18 @@
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ 	for x in sounds/letters/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ 	for x in sounds/phonetic/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+@@ -341,18 +335,18 @@
  	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
+ 	for x in 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-*; do \
  		if grep -q "^%`basename $$x`%" sounds.txt; then \
 -			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 +			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
@@ -151,7 +208,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -294,105 +293,74 @@
+@@ -364,111 +358,86 @@
  	fi
  
  bininstall: all
@@ -162,6 +219,7 @@ $FreeBSD$
 -	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
@@ -171,6 +229,7 @@ $FreeBSD$
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
@@ -191,19 +250,34 @@ $FreeBSD$
 -		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
 -	fi
 -	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 -	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
++	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	if [ -d contrib/firmware/iax ]; then \
+-		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ 	else \
+ 		echo "You need to do cvs update -d not just cvs update" ; \
+ 	fi 
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
+-	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -225,13 +299,8 @@ $FreeBSD$
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
@@ -294,8 +363,31 @@ $FreeBSD$
 -		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
  	done
+ 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	:> $(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 ; \
+@@ -483,7 +452,7 @@
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
+ 	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
+-	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk
++	$(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk
+ 	for x in images/*.gif; do \
+ 		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
+ 	done
+@@ -503,10 +472,10 @@
+ 
+ __rpm: _version
+ 	rm -rf /tmp/asterisk ; \
+-	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++	$(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
+-	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++	$(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+ 	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
+ 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
diff --git a/net/asterisk-bristuff/files/patch-agi::Makefile b/net/asterisk-bristuff/files/patch-agi::Makefile
index 567c30f5624e..32efb5d2b101 100644
--- a/net/asterisk-bristuff/files/patch-agi::Makefile
+++ b/net/asterisk-bristuff/files/patch-agi::Makefile
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
+--- agi/Makefile.orig	Tue Jun 22 20:42:13 2004
++++ agi/Makefile	Tue Oct  5 21:03:40 2004
+@@ -11,15 +11,18 @@
  # the GNU General Public License
  #
  
@@ -24,12 +24,4 @@ $FreeBSD$
 +	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
  
  eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
+ 	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
diff --git a/net/asterisk-bristuff/files/patch-apps::Makefile b/net/asterisk-bristuff/files/patch-apps::Makefile
index 901ba694c33a..00b77dfe2434 100644
--- a/net/asterisk-bristuff/files/patch-apps::Makefile
+++ b/net/asterisk-bristuff/files/patch-apps::Makefile
@@ -1,22 +1,24 @@
 
 $FreeBSD$
 
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
+--- apps/Makefile.orig	Sat Sep 25 00:32:56 2004
++++ apps/Makefile	Sun Oct 10 16:20:06 2004
+@@ -40,7 +40,7 @@
+ #APPS+=app_rpt.so
+ 
+ APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+-APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
++APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+ APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+ 
+ CFLAGS+=-fPIC
+@@ -65,12 +65,12 @@
  	$(CC) $(SOLINK) -o $@ $< -ltonezone
  
  install: all
 -	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
  
  app_voicemail.so : app_voicemail.o
  ifeq ($(USE_MYSQL_VM_INTERFACE),1)
@@ -25,11 +27,22 @@ $FreeBSD$
  else
  ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
  	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
+@@ -80,16 +80,16 @@
+ endif
+ 
+ app_sql_postgres.o: app_sql_postgres.c
+-	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
++	$(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ 
+ app_sql_postgres.so: app_sql_postgres.o
+-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/pgsql/lib -lpq
++	$(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq
+ 
+ app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ $< -lodbc
  
  look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
+-	$(CC) -pipe -O6 -g look.c -o look -lncurses
 +	$(CC) $(CFLAGS) look.c -o look -lncurses
  
  ifneq ($(wildcard .depend),)
diff --git a/net/asterisk-bristuff/files/patch-apps::app_intercom.c b/net/asterisk-bristuff/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk-bristuff/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk-bristuff/files/patch-astman::Makefile b/net/asterisk-bristuff/files/patch-astman::Makefile
index cf31005257cf..2745860cdd36 100644
--- a/net/asterisk-bristuff/files/patch-astman::Makefile
+++ b/net/asterisk-bristuff/files/patch-astman::Makefile
@@ -1,9 +1,20 @@
 
 $FreeBSD$
 
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
+--- astman/Makefile.orig	Sat Jun 26 22:25:39 2004
++++ astman/Makefile	Thu Oct 14 19:14:22 2004
+@@ -5,16 +5,16 @@
+ 
+ OSARCH=$(shell uname -s)
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS+=-I/usr/local/include -L/usr/local/lib
++CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib
+ endif
+ 
+-TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi)
++TARGET=astman
+ all: depend $(TARGET)
+ 
  install:
  	if [ "$(TARGET)" != "none" ]; then \
  		for x in $(TARGET); do \
diff --git a/net/asterisk-bristuff/files/patch-cdr::Makefile b/net/asterisk-bristuff/files/patch-cdr::Makefile
index 2ede608f9019..f646d2c9a3dc 100644
--- a/net/asterisk-bristuff/files/patch-cdr::Makefile
+++ b/net/asterisk-bristuff/files/patch-cdr::Makefile
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
+--- cdr/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ cdr/Makefile	Thu Oct 14 19:13:38 2004
+@@ -21,7 +21,7 @@
+ OSARCH=$(shell uname -s)
+ 
+ ifeq (${OSARCH},FreeBSD)
+-SOLINK+=-L/usr/local/lib
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+@@ -71,7 +71,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk-bristuff/files/patch-channels::Makefile b/net/asterisk-bristuff/files/patch-channels::Makefile
index fd855e7a2710..98caab3a33d6 100644
--- a/net/asterisk-bristuff/files/patch-channels::Makefile
+++ b/net/asterisk-bristuff/files/patch-channels::Makefile
@@ -1,53 +1,62 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Thu Mar 25 11:43:36 2004
-+++ channels/Makefile	Thu Apr 29 14:36:36 2004
-@@ -33,12 +33,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
+--- channels/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ channels/Makefile	Sun Oct 10 16:18:05 2004
+@@ -57,10 +57,10 @@
+ 
+ endif
+ ifeq (${OSARCH},FreeBSD)
+-PTLIB=-lpt_FreeBSD_x86_r
+-H323LIB=-lh323_FreeBSD_x86_r
+-CHANH323LIB=-pthread
+-SOLINK+=-L/usr/local/lib
++PTLIB=-lpt_FreeBSD_x86_r_s
++H323LIB=-lh323_FreeBSD_x86_r_s
++CHANH323LIB=
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ ifeq (${OSARCH},NetBSD)
+ PTLIB=-lpt_NetBSD_x86_r
+@@ -72,8 +72,8 @@
+ endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so)
 +CHANNEL_LIBS+=chan_h323.so
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -48,7 +46,7 @@
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+@@ -84,7 +84,7 @@
  ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 +CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
  CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
  
-@@ -69,7 +67,7 @@
- 
+@@ -107,7 +107,7 @@
  ZAPDIR=/usr/lib
  
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so")
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
  
-@@ -110,10 +108,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
+@@ -156,6 +156,8 @@
  chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
+ 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+ endif
++chan_oss.so: chan_oss.o
 +	$(CC) $(SOLINK) -o $@ chan_oss.o
  
- chan_iax2.so: chan_iax2.o iax2-parser.o
+ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -133,7 +129,7 @@
+@@ -175,7 +177,7 @@
  	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
  
  chan_zap.so: chan_zap.o
@@ -55,15 +64,15 @@ $FreeBSD$
 +	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone
  
  chan_sip.so: chan_sip.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -157,16 +153,17 @@
+ ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+@@ -199,15 +201,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
+-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(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
++	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
@@ -73,8 +82,7 @@ $FreeBSD$
  
  install: all
 -	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 +	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
+ 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
  
  depend: .depend
- 
diff --git a/net/asterisk-bristuff/files/patch-channels::chan_h323.c b/net/asterisk-bristuff/files/patch-channels::chan_h323.c
index e413bd8ecec8..de2ed3978663 100644
--- a/net/asterisk-bristuff/files/patch-channels::chan_h323.c
+++ b/net/asterisk-bristuff/files/patch-channels::chan_h323.c
@@ -1,13 +1,14 @@
 
 $FreeBSD$
 
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
+--- channels/chan_h323.c	2004/10/10 13:00:17	1.1
++++ channels/chan_h323.c	2004/10/10 13:00:39
+@@ -26,7 +26,7 @@
+  * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $
+  */
  
+-
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
diff --git a/net/asterisk-bristuff/files/patch-channels::chan_iax2.c b/net/asterisk-bristuff/files/patch-channels::chan_iax2.c
deleted file mode 100644
index 9127bee41cb6..000000000000
--- a/net/asterisk-bristuff/files/patch-channels::chan_iax2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_iax2.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_iax2.c	2004/04/29 21:37:10
-@@ -52,7 +52,7 @@
- #include <sys/stat.h>
- #ifdef IAX_TRUNKING
- #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #endif
- #ifdef MYSQL_FRIENDS
- #include <mysql/mysql.h>
diff --git a/net/asterisk-bristuff/files/patch-channels::chan_oss.c b/net/asterisk-bristuff/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk-bristuff/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk-bristuff/files/patch-channels::chan_sip.c b/net/asterisk-bristuff/files/patch-channels::chan_sip.c
index b98f9d185009..521d6a46d256 100644
--- a/net/asterisk-bristuff/files/patch-channels::chan_sip.c
+++ b/net/asterisk-bristuff/files/patch-channels::chan_sip.c
@@ -1,26 +1,26 @@
 
 $FreeBSD$
 
---- channels/chan_sip.c.orig	Wed Jan 14 08:10:53 2004
-+++ channels/chan_sip.c	Fri Jan 30 01:47:34 2004
-@@ -124,7 +124,7 @@
- static int restart_monitor(void);
+--- channels/chan_sip.c.orig
++++ channels/chan_sip.c
+@@ -139,7 +139,7 @@
  
- /* Codecs that we support by default: */
--static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
-+static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263 | AST_FORMAT_G723_1 | AST_FORMAT_G729A;
- static int noncodeccapability = AST_RTP_DTMF;
+ static char default_language[MAX_LANGUAGE] = "";
  
- static char ourhost[256];
-@@ -176,6 +176,7 @@
+-static char default_callerid[AST_MAX_EXTENSION] = "asterisk";
++static char default_callerid[AST_MAX_EXTENSION] = "Unknown";
+ 
+ static char default_fromdomain[AST_MAX_EXTENSION] = "";
+ 
+@@ -244,6 +244,7 @@
  struct sip_route {
  	struct sip_route *next;
  	char hop[0];
 +	int lr;
  };
  
- static struct sip_pvt {
-@@ -3417,6 +3418,10 @@
+ struct sip_history {
+@@ -4573,6 +4574,10 @@
  			/* Make a struct route */
  			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
  			if (thishop) {
@@ -28,17 +28,17 @@ $FreeBSD$
 +					thishop->lr = 1;
 +				else
 +					thishop->lr = 0;
- 				strncpy(thishop->hop, rr, len);
+ 				strncpy(thishop->hop, rr, len); /* safe */
  				thishop->hop[len] = '\0';
  				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
-@@ -3440,31 +3445,41 @@
+@@ -4596,31 +4601,41 @@
  			rr += len+1;
  		}
  	}
 -	/* 2nd append the Contact: if there is one */
 -	/* Can be multiple Contact headers, comma separated values - we just take the first */
 -	contact = get_header(req, "Contact");
--	if (strlen(contact)) {
+-	if (!ast_strlen_zero(contact)) {
 -		ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 -		/* Look for <: delimited address */
 -		c = strchr(contact, '<');
@@ -55,7 +55,7 @@ $FreeBSD$
 +	if (head && head->lr) {
 +		thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1);
  		if (thishop) {
--			strncpy(thishop->hop, c, len);
+-			strncpy(thishop->hop, c, len); /* safe */
 -			thishop->hop[len] = '\0';
 -			thishop->next = NULL;
 -			/* Goes at the end */
@@ -71,7 +71,7 @@ $FreeBSD$
 +		/* Append the Contact: if there is one and first route is w/o `lr' param */
 +		/* Can be multiple Contact headers, comma separated values - we just take the first */
 +		contact = get_header(req, "Contact");
-+		if (strlen(contact)) {
++		if (!ast_strlen_zero(contact)) {
 +			ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 +			/* Look for <: delimited address */
 +			c = strchr(contact, '<');
@@ -85,7 +85,7 @@ $FreeBSD$
 +			}
 +			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
 +			if (thishop) {
-+				strncpy(thishop->hop, c, len);
++				strncpy(thishop->hop, c, len); /* safe */
 +				thishop->hop[len] = '\0';
 +				thishop->next = NULL;
 +				/* Goes at the end */
@@ -97,7 +97,7 @@ $FreeBSD$
  		}
  	}
  	/* Store as new route */
-@@ -5143,7 +5158,11 @@
+@@ -7197,7 +7212,11 @@
  			/* Get destination right away */
  			gotdest = get_destination(p, NULL);
  			get_rdnis(p, NULL);
@@ -110,8 +110,8 @@ $FreeBSD$
  			build_contact(p);
  
  			if (gotdest) {
-@@ -5165,7 +5184,6 @@
- 				c = sip_new(p, AST_STATE_DOWN, strlen(p->username) ? p->username : NULL);
+@@ -7225,7 +7244,6 @@
+ 				c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
  				*recount = 1;
  				/* Save Record-Route for any later requests we make on this dialogue */
 -				build_route(p, req, 0);
diff --git a/net/asterisk-bristuff/files/patch-channels::chan_zap.c b/net/asterisk-bristuff/files/patch-channels::chan_zap.c
index e5a3ffc6afec..965a643bb687 100644
--- a/net/asterisk-bristuff/files/patch-channels::chan_zap.c
+++ b/net/asterisk-bristuff/files/patch-channels::chan_zap.c
@@ -1,14 +1,15 @@
 
 $FreeBSD$
 
---- channels/chan_zap.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_zap.c	2004/04/29 21:37:17
-@@ -45,7 +45,7 @@
+--- channels/chan_zap.c
++++ channels/chan_zap.c
+@@ -42,7 +42,9 @@
+ #include <sys/signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifndef __FreeBSD__
  #include <stdint.h>
++#endif
  #include <unistd.h>
  #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #include <math.h>
- #include <tonezone.h>
- #include <ctype.h>
+ #ifdef __linux__
diff --git a/net/asterisk-bristuff/files/patch-channels::h323::Makefile b/net/asterisk-bristuff/files/patch-channels::h323::Makefile
index a9159b4441c1..bc34083e2ff3 100644
--- a/net/asterisk-bristuff/files/patch-channels::h323::Makefile
+++ b/net/asterisk-bristuff/files/patch-channels::h323::Makefile
@@ -1,64 +1,38 @@
 
 $FreeBSD$
 
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+--- channels/h323/Makefile.orig	Tue Aug 31 16:32:11 2004
++++ channels/h323/Makefile	Sun Oct 10 15:25:42 2004
+@@ -53,7 +53,7 @@
+ LIBS+=-lpthread
+ endif
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS += -pthread
++CFLAGS += $(PTHREAD_LIBS)
+ endif
+ CFLAGS += -D_REENTRANT -D_GNU_SOURCE
  CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
+@@ -74,19 +74,19 @@
   
  
  ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
+-	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
++	$(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $<
  
  libchanh323.a:	ast_h323.o
  	ar cr libchanh323.a ast_h323.o
  
  chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB)
  
  chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)     -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB)
  
  chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
+-	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB)
  clean:
  	rm -f *.o *.so core.* libchanh323.a
  
diff --git a/net/asterisk-bristuff/files/patch-codecs::Makefile b/net/asterisk-bristuff/files/patch-codecs::Makefile
index b802dc1233e8..de9aff4c34fe 100644
--- a/net/asterisk-bristuff/files/patch-codecs::Makefile
+++ b/net/asterisk-bristuff/files/patch-codecs::Makefile
@@ -1,22 +1,23 @@
 
 $FreeBSD$
 
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
+--- codecs/Makefile.orig	Mon Jul 19 18:52:57 2004
++++ codecs/Makefile	Sun Oct 10 15:28:35 2004
+@@ -17,23 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+-MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
 +MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
++MODILBC=codec_ilbc.so
+ CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
++CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
  LIBG723B=g723.1b/libg723b.a
@@ -30,11 +31,11 @@ $FreeBSD$
  
 -CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
 +CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
+         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
+ 	codec_g726.so
  
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
+@@ -91,7 +91,7 @@
+ endif
  
  install: all
 -	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
diff --git a/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c
index 661ff2d88602..3ce9571013ec 100644
--- a/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c
+++ b/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g723_1_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g723_1_dummy.c	Sun Oct 10 16:07:05 2004
 @@ -0,0 +1,308 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -44,7 +44,7 @@ $FreeBSD$
 +#include "slin_g723_ex.h"
 +#include "g723_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
diff --git a/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c b/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c
index c3e27d98e27e..9fcc7b19ca35 100644
--- a/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c
+++ b/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g729_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g729_dummy.c	Sun Oct 10 16:07:12 2004
 @@ -0,0 +1,275 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -38,7 +38,7 @@ $FreeBSD$
 +#include "slin_g729_ex.h"
 +#include "g729_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
diff --git a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile b/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk-bristuff/files/patch-codecs::lpc10::Makefile b/net/asterisk-bristuff/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 1674119a4836..000000000000
--- a/net/asterisk-bristuff/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Mon Mar 15 18:52:28 2004
-+++ codecs/lpc10/Makefile	Wed Apr 14 22:13:47 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,7 +22,7 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors and ALPHA too
-@@ -30,7 +30,7 @@
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
- ifneq ($(PROC),alpha)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+=
- endif
- endif
- endif
diff --git a/net/asterisk-bristuff/files/patch-db.c b/net/asterisk-bristuff/files/patch-db.c
index 59e5cef87770..6c2bdcd443c8 100644
--- a/net/asterisk-bristuff/files/patch-db.c
+++ b/net/asterisk-bristuff/files/patch-db.c
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
+--- db.c.orig	Fri Jul  9 13:08:09 2004
++++ db.c	Sun Oct 10 15:32:33 2004
+@@ -33,7 +33,7 @@
  #include <asterisk/cli.h>
+ #include <asterisk/utils.h>
+ #include <asterisk/lock.h>
 -#include "db1-ast/include/db.h"
 +#include <db.h>
  #include "asterisk.h"
diff --git a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c b/net/asterisk-bristuff/files/patch-formats::format_g723_1.c
index 8d0755e14205..fb5eb12833dc 100644
--- a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c
+++ b/net/asterisk-bristuff/files/patch-formats::format_g723_1.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
+--- formats/format_g723_1.c.orig	Sun Oct 10 15:59:18 2004
++++ formats/format_g723_1.c	Sun Oct 10 16:05:05 2004
 @@ -0,0 +1,345 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -57,7 +57,7 @@ $FreeBSD$
 +
 +static long g723_tell(struct ast_filestream *);
 +
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(g723_lock);
 +static int glistcnt = 0;
 +
 +static char *name = "g723";
diff --git a/net/asterisk-bristuff/files/patch-include::asterisk::utils.h b/net/asterisk-bristuff/files/patch-include::asterisk::utils.h
new file mode 100644
index 000000000000..a06f7d065c84
--- /dev/null
+++ b/net/asterisk-bristuff/files/patch-include::asterisk::utils.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- include/asterisk/utils.h	2004/10/10 12:55:50	1.1
++++ include/asterisk/utils.h	2004/10/10 12:56:43
+@@ -37,7 +37,6 @@
+ #ifdef inet_ntoa
+ #undef inet_ntoa
+ #endif
+-#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
+ 
+ #ifdef LINUX
+ #define ast_pthread_create pthread_create
diff --git a/net/asterisk-bristuff/files/patch-res::Makefile b/net/asterisk-bristuff/files/patch-res::Makefile
index ccd0a35dd59d..5700f04ea1ef 100644
--- a/net/asterisk-bristuff/files/patch-res::Makefile
+++ b/net/asterisk-bristuff/files/patch-res::Makefile
@@ -1,12 +1,21 @@
 
 $FreeBSD$
 
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
+--- res/Makefile.orig	Sat Jul 17 23:58:01 2004
++++ res/Makefile	Thu Oct 14 19:15:00 2004
+@@ -21,7 +21,7 @@
  
- install: all
+ CFLAGS+=
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
++CFLAGS+=-DZAPATA_MOH -I$(LOCALBASE)/include
+ #
+ # Work around buggy RedHat 9.0
+ #
+@@ -34,7 +34,7 @@
+ 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
 -	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
  
diff --git a/net/asterisk-bristuff/files/patch-rtp.c b/net/asterisk-bristuff/files/patch-rtp.c
index 11767dca198f..06289f357208 100644
--- a/net/asterisk-bristuff/files/patch-rtp.c
+++ b/net/asterisk-bristuff/files/patch-rtp.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- rtp.c.orig	Tue Nov 25 23:15:28 2003
-+++ rtp.c	Fri Jan 30 01:47:34 2004
-@@ -114,7 +114,7 @@
+--- rtp.c.orig	Sat Sep 18 16:56:28 2004
++++ rtp.c	Sun Oct 10 15:57:22 2004
+@@ -127,7 +127,7 @@
  {
  	switch(buf & TYPE_MASK) {
  	case TYPE_DONTSEND:
@@ -12,31 +12,15 @@ $FreeBSD$
  		break;
  	case TYPE_SILENCE:
  		return 4;
-@@ -1028,19 +1028,6 @@
- 		while((f = ast_smoother_read(rtp->smoother)))
- 			ast_rtp_raw_write(rtp, f, codec);
- 		break;
--	case AST_FORMAT_G729A:
--		if (!rtp->smoother) {
--			rtp->smoother = ast_smoother_new(20);
--		}
--		if (!rtp->smoother) {
--			ast_log(LOG_WARNING, "Unable to create g729 smoother :(\n");
--			return -1;
--		}
--		ast_smoother_feed(rtp->smoother, _f);
--		
--		while((f = ast_smoother_read(rtp->smoother)))
--			ast_rtp_raw_write(rtp, f, codec);
--		break;
- 	case AST_FORMAT_GSM:
- 		if (!rtp->smoother) {
- 			rtp->smoother = ast_smoother_new(33);
-@@ -1071,6 +1058,7 @@
- 	case AST_FORMAT_H261:
- 	case AST_FORMAT_H263:
- 	case AST_FORMAT_G723_1:
-+	case AST_FORMAT_G729A:
- 	case AST_FORMAT_SPEEX:
- 	        // Don't buffer outgoing frames; send them one-per-packet:
- 		if (_f->offset < hdrlen) {
+@@ -841,8 +841,10 @@
+ 		/* Must be an even port number by RTP spec */
+ 		rtp->us.sin_port = htons(x);
+ 		rtp->us.sin_addr = addr;
+-		if (rtp->rtcp)
++		if (rtp->rtcp) {
+ 			rtp->rtcp->us.sin_port = htons(x + 1);
++			rtp->rtcp->us.sin_addr = addr;
++		}
+ 		if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
+ 			(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
+ 			break;
diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist
index eb427fa04447..f1519b3f3a39 100644
--- a/net/asterisk-bristuff/pkg-plist
+++ b/net/asterisk-bristuff/pkg-plist
@@ -7,6 +7,9 @@ etc/asterisk/adtranvofr.conf-dist
 @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
 etc/asterisk/agents.conf-dist
 @exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
+@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
+etc/asterisk/alarmreceiver.conf-dist
+@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf
 @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
 etc/asterisk/alsa.conf-dist
 @exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
@@ -16,18 +19,30 @@ etc/asterisk/asterisk.adsi-dist
 @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
 etc/asterisk/asterisk.conf-dist
 @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
+etc/asterisk/cdr_manager.conf-dist
+@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
 etc/asterisk/cdr_odbc.conf-dist
 @exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
 etc/asterisk/cdr_pgsql.conf-dist
 @exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
+etc/asterisk/cdr_tds.conf-dist
+@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf
 @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
 etc/asterisk/enum.conf-dist
 @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
+@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
+etc/asterisk/extconfig.conf-dist
+@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf
 @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
 etc/asterisk/extensions.conf-dist
 @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
+@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
+etc/asterisk/features.conf-dist
+@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
@@ -37,6 +52,9 @@ etc/asterisk/h323.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
+@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
+etc/asterisk/iaxprov.conf-dist
+@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf
 @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
 etc/asterisk/indications.conf-dist
 @exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
@@ -61,12 +79,12 @@ etc/asterisk/modules.conf-dist
 @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
 etc/asterisk/musiconhold.conf-dist
 @exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
+@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
+etc/asterisk/osp.conf-dist
+@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf
 @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
 etc/asterisk/oss.conf-dist
 @exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
 @unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
 etc/asterisk/phone.conf-dist
 @exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
@@ -76,6 +94,12 @@ etc/asterisk/privacy.conf-dist
 @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
 etc/asterisk/queues.conf-dist
 @exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
+@unexec if cmp -s %D/etc/asterisk/res_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi
+etc/asterisk/res_config_odbc.conf-dist
+@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.conf
+@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
+etc/asterisk/res_odbc.conf-dist
+@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
 etc/asterisk/rpt.conf-dist
 @exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
@@ -103,11 +127,13 @@ etc/asterisk/zapata.conf-dist
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
+include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/app.h
 include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
+include/asterisk/astosp.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
@@ -116,12 +142,14 @@ include/asterisk/channel_pvt.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/config.h
+include/asterisk/config_pvt.h
 include/asterisk/crypto.h
 include/asterisk/cvsid.h
 include/asterisk/dlfcn-compat.h
 include/asterisk/dns.h
 include/asterisk/dsp.h
 include/asterisk/enum.h
+include/asterisk/features.h
 include/asterisk/file.h
 include/asterisk/frame.h
 include/asterisk/fskmodem.h
@@ -138,10 +166,10 @@ include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
 include/asterisk/options.h
-include/asterisk/parking.h
 include/asterisk/pbx.h
 include/asterisk/poll-compat.h
 include/asterisk/privacy.h
+include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -150,30 +178,39 @@ include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/translate.h
 include/asterisk/ulaw.h
+include/asterisk/utils.h
 include/asterisk/vmodem.h
 lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
+lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
+lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
 lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_enumlookup.so
+lib/asterisk/modules/app_eval.so
+lib/asterisk/modules/app_exec.so
 lib/asterisk/modules/app_festival.so
+lib/asterisk/modules/app_flash.so
+lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
+lib/asterisk/modules/app_groupcount.so
 lib/asterisk/modules/app_hasnewvoicemail.so
+lib/asterisk/modules/app_ices.so
 lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_intercom.so
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+lib/asterisk/modules/app_meetme.so
 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_playback.so
 lib/asterisk/modules/app_privacy.so
@@ -184,20 +221,31 @@ lib/asterisk/modules/app_read.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
+lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so
 lib/asterisk/modules/app_setcdruserfield.so
 lib/asterisk/modules/app_setcidname.so
 lib/asterisk/modules/app_setcidnum.so
+lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_striplsd.so
 lib/asterisk/modules/app_substring.so
 lib/asterisk/modules/app_system.so
+lib/asterisk/modules/app_talkdetect.so
+lib/asterisk/modules/app_test.so
 lib/asterisk/modules/app_transfer.so
+lib/asterisk/modules/app_txtcidname.so
 lib/asterisk/modules/app_url.so
+lib/asterisk/modules/app_userevent.so
+lib/asterisk/modules/app_verbose.so
 lib/asterisk/modules/app_voicemail.so
 lib/asterisk/modules/app_waitforring.so
 lib/asterisk/modules/app_zapateller.so
+lib/asterisk/modules/app_zapbarge.so
+lib/asterisk/modules/app_zapras.so
+lib/asterisk/modules/app_zapscan.so
 lib/asterisk/modules/cdr_csv.so
+lib/asterisk/modules/cdr_manager.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax2.so
@@ -210,11 +258,12 @@ lib/asterisk/modules/chan_modem_i4l.so
 lib/asterisk/modules/chan_oss.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
-%%ZAPTEL%%lib/asterisk/modules/chan_zap.so
+lib/asterisk/modules/chan_zap.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g723_1_dummy.so
+lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_g729_dummy.so
 lib/asterisk/modules/codec_gsm.so
 lib/asterisk/modules/codec_ilbc.so
@@ -222,12 +271,15 @@ lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723_1.so
+lib/asterisk/modules/format_g726.so
 lib/asterisk/modules/format_g729.so
 lib/asterisk/modules/format_gsm.so
 lib/asterisk/modules/format_h263.so
+lib/asterisk/modules/format_ilbc.so
 lib/asterisk/modules/format_jpeg.so
 lib/asterisk/modules/format_pcm.so
 lib/asterisk/modules/format_pcm_alaw.so
+lib/asterisk/modules/format_sln.so
 lib/asterisk/modules/format_vox.so
 lib/asterisk/modules/format_wav.so
 lib/asterisk/modules/format_wav_gsm.so
@@ -235,20 +287,25 @@ lib/asterisk/modules/pbx_config.so
 lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/pbx_wilcalu.so
 lib/asterisk/modules/res_adsi.so
+lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_features.so
 lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
 sbin/asterisk
 sbin/astgenkey
 sbin/safe_asterisk
 share/asterisk/agi-bin/agi-test.agi
 share/asterisk/agi-bin/eagi-sphinx-test
 share/asterisk/agi-bin/eagi-test
+share/asterisk/firmware/iax/iaxy.bin
 share/asterisk/images/asterisk-intro.jpg
+share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
+share/asterisk/mohmp3/fpm-calm-river.mp3
+share/asterisk/mohmp3/fpm-sunshine.mp3
+share/asterisk/mohmp3/fpm-world-mix.mp3
 share/asterisk/sounds/agent-alreadyon.gsm
 share/asterisk/sounds/agent-incorrect.gsm
 share/asterisk/sounds/agent-loggedoff.gsm
@@ -259,12 +316,23 @@ share/asterisk/sounds/agent-user.gsm
 share/asterisk/sounds/auth-incorrect.gsm
 share/asterisk/sounds/auth-thankyou.gsm
 share/asterisk/sounds/beep.gsm
+share/asterisk/sounds/conf-adminmenu.gsm
+share/asterisk/sounds/conf-enteringno.gsm
+share/asterisk/sounds/conf-errormenu.gsm
 share/asterisk/sounds/conf-getchannel.gsm
 share/asterisk/sounds/conf-getconfno.gsm
 share/asterisk/sounds/conf-getpin.gsm
 share/asterisk/sounds/conf-invalid.gsm
 share/asterisk/sounds/conf-invalidpin.gsm
+share/asterisk/sounds/conf-kicked.gsm
+share/asterisk/sounds/conf-locked.gsm
+share/asterisk/sounds/conf-lockednow.gsm
+share/asterisk/sounds/conf-muted.gsm
+share/asterisk/sounds/conf-noempty.gsm
 share/asterisk/sounds/conf-onlyperson.gsm
+share/asterisk/sounds/conf-unlockednow.gsm
+share/asterisk/sounds/conf-unmuted.gsm
+share/asterisk/sounds/conf-usermenu.gsm
 share/asterisk/sounds/demo-abouttotry.gsm
 share/asterisk/sounds/demo-congrats.gsm
 share/asterisk/sounds/demo-echodone.gsm
@@ -359,16 +427,88 @@ share/asterisk/sounds/digits/tomorrow.gsm
 share/asterisk/sounds/digits/yesterday.gsm
 share/asterisk/sounds/dir-instr.gsm
 share/asterisk/sounds/dir-intro.gsm
+share/asterisk/sounds/dir-intro-fn.gsm
 share/asterisk/sounds/dir-nomatch.gsm
 share/asterisk/sounds/dir-nomore.gsm
 share/asterisk/sounds/invalid.gsm
+share/asterisk/sounds/letters/a.gsm
+share/asterisk/sounds/letters/at.gsm
+share/asterisk/sounds/letters/b.gsm
+share/asterisk/sounds/letters/c.gsm
+share/asterisk/sounds/letters/d.gsm
+share/asterisk/sounds/letters/dash.gsm
+share/asterisk/sounds/letters/dollar.gsm
+share/asterisk/sounds/letters/dot.gsm
+share/asterisk/sounds/letters/e.gsm
+share/asterisk/sounds/letters/equals.gsm
+share/asterisk/sounds/letters/exclaimation-point.gsm
+share/asterisk/sounds/letters/f.gsm
+share/asterisk/sounds/letters/g.gsm
+share/asterisk/sounds/letters/h.gsm
+share/asterisk/sounds/letters/i.gsm
+share/asterisk/sounds/letters/j.gsm
+share/asterisk/sounds/letters/k.gsm
+share/asterisk/sounds/letters/l.gsm
+share/asterisk/sounds/letters/m.gsm
+share/asterisk/sounds/letters/n.gsm
+share/asterisk/sounds/letters/o.gsm
+share/asterisk/sounds/letters/p.gsm
+share/asterisk/sounds/letters/plus.gsm
+share/asterisk/sounds/letters/q.gsm
+share/asterisk/sounds/letters/r.gsm
+share/asterisk/sounds/letters/s.gsm
+share/asterisk/sounds/letters/slash.gsm
+share/asterisk/sounds/letters/space.gsm
+share/asterisk/sounds/letters/t.gsm
+share/asterisk/sounds/letters/u.gsm
+share/asterisk/sounds/letters/v.gsm
+share/asterisk/sounds/letters/w.gsm
+share/asterisk/sounds/letters/x.gsm
+share/asterisk/sounds/letters/y.gsm
+share/asterisk/sounds/letters/z.gsm
+share/asterisk/sounds/letters/zed.gsm
 share/asterisk/sounds/pbx-invalid.gsm
 share/asterisk/sounds/pbx-invalidpark.gsm
 share/asterisk/sounds/pbx-transfer.gsm
+share/asterisk/sounds/phonetic/9_p.gsm
+share/asterisk/sounds/phonetic/a_p.gsm
+share/asterisk/sounds/phonetic/b_p.gsm
+share/asterisk/sounds/phonetic/c_p.gsm
+share/asterisk/sounds/phonetic/d_p.gsm
+share/asterisk/sounds/phonetic/e_p.gsm
+share/asterisk/sounds/phonetic/f_p.gsm
+share/asterisk/sounds/phonetic/g_p.gsm
+share/asterisk/sounds/phonetic/h_p.gsm
+share/asterisk/sounds/phonetic/i_p.gsm
+share/asterisk/sounds/phonetic/j_p.gsm
+share/asterisk/sounds/phonetic/k_p.gsm
+share/asterisk/sounds/phonetic/l_p.gsm
+share/asterisk/sounds/phonetic/m_p.gsm
+share/asterisk/sounds/phonetic/n_p.gsm
+share/asterisk/sounds/phonetic/o_p.gsm
+share/asterisk/sounds/phonetic/p_p.gsm
+share/asterisk/sounds/phonetic/q_p.gsm
+share/asterisk/sounds/phonetic/r_p.gsm
+share/asterisk/sounds/phonetic/s_p.gsm
+share/asterisk/sounds/phonetic/t_p.gsm
+share/asterisk/sounds/phonetic/u_p.gsm
+share/asterisk/sounds/phonetic/v_p.gsm
+share/asterisk/sounds/phonetic/w_p.gsm
+share/asterisk/sounds/phonetic/x_p.gsm
+share/asterisk/sounds/phonetic/y_p.gsm
+share/asterisk/sounds/phonetic/z_p.gsm
 share/asterisk/sounds/privacy-incorrect.gsm
 share/asterisk/sounds/privacy-prompt.gsm
 share/asterisk/sounds/privacy-thankyou.gsm
 share/asterisk/sounds/privacy-unident.gsm
+share/asterisk/sounds/queue-callswaiting.gsm
+share/asterisk/sounds/queue-holdtime.gsm
+share/asterisk/sounds/queue-less-than.gsm
+share/asterisk/sounds/queue-minutes.gsm
+share/asterisk/sounds/queue-seconds.gsm
+share/asterisk/sounds/queue-thankyou.gsm
+share/asterisk/sounds/queue-thereare.gsm
+share/asterisk/sounds/queue-youarenext.gsm
 share/asterisk/sounds/ss-noservice.gsm
 share/asterisk/sounds/transfer.gsm
 share/asterisk/sounds/tt-allbusy.gsm
@@ -387,22 +527,31 @@ share/asterisk/sounds/vm-Friends.gsm
 share/asterisk/sounds/vm-INBOX.gsm
 share/asterisk/sounds/vm-Old.gsm
 share/asterisk/sounds/vm-Work.gsm
+share/asterisk/sounds/vm-advopts.gsm
 share/asterisk/sounds/vm-and.gsm
+share/asterisk/sounds/vm-calldiffnum.gsm
 share/asterisk/sounds/vm-changeto.gsm
 share/asterisk/sounds/vm-delete.gsm
 share/asterisk/sounds/vm-deleted.gsm
+share/asterisk/sounds/vm-dialout.gsm
+share/asterisk/sounds/vm-enter-num-to-call.gsm
 share/asterisk/sounds/vm-extension.gsm
 share/asterisk/sounds/vm-first.gsm
 share/asterisk/sounds/vm-for.gsm
 share/asterisk/sounds/vm-forwardoptions.gsm
+share/asterisk/sounds/vm-from-extension.gsm
+share/asterisk/sounds/vm-from-phonenumber.gsm
+share/asterisk/sounds/vm-from.gsm
 share/asterisk/sounds/vm-goodbye.gsm
 share/asterisk/sounds/vm-helpexit.gsm
 share/asterisk/sounds/vm-incorrect.gsm
+share/asterisk/sounds/vm-incorrect-mailbox.gsm
 share/asterisk/sounds/vm-instructions.gsm
 share/asterisk/sounds/vm-intro.gsm
 share/asterisk/sounds/vm-isonphone.gsm
 share/asterisk/sounds/vm-isunavail.gsm
 share/asterisk/sounds/vm-last.gsm
+share/asterisk/sounds/vm-leavemsg.gsm
 share/asterisk/sounds/vm-login.gsm
 share/asterisk/sounds/vm-mailboxfull.gsm
 share/asterisk/sounds/vm-message.gsm
@@ -414,7 +563,10 @@ share/asterisk/sounds/vm-newpassword.gsm
 share/asterisk/sounds/vm-next.gsm
 share/asterisk/sounds/vm-no.gsm
 share/asterisk/sounds/vm-nobodyavail.gsm
+share/asterisk/sounds/vm-nobox.gsm
 share/asterisk/sounds/vm-nomore.gsm
+share/asterisk/sounds/vm-nonumber.gsm
+share/asterisk/sounds/vm-num-i-have.gsm
 share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-options.gsm
 share/asterisk/sounds/vm-opts.gsm
@@ -422,30 +574,49 @@ share/asterisk/sounds/vm-passchanged.gsm
 share/asterisk/sounds/vm-password.gsm
 share/asterisk/sounds/vm-press.gsm
 share/asterisk/sounds/vm-prev.gsm
+share/asterisk/sounds/vm-reachoper.gsm
 share/asterisk/sounds/vm-rec-busy.gsm
 share/asterisk/sounds/vm-rec-name.gsm
 share/asterisk/sounds/vm-rec-unv.gsm
 share/asterisk/sounds/vm-received.gsm
 share/asterisk/sounds/vm-reenterpassword.gsm
 share/asterisk/sounds/vm-repeat.gsm
+share/asterisk/sounds/vm-review.gsm
 share/asterisk/sounds/vm-saved.gsm
 share/asterisk/sounds/vm-savedto.gsm
 share/asterisk/sounds/vm-savefolder.gsm
 share/asterisk/sounds/vm-savemessage.gsm
 share/asterisk/sounds/vm-sorry.gsm
+share/asterisk/sounds/vm-star-cancel.gsm
+share/asterisk/sounds/vm-starmain.gsm
+share/asterisk/sounds/vm-then-pound.gsm
 share/asterisk/sounds/vm-theperson.gsm
+share/asterisk/sounds/vm-tocallback.gsm
+share/asterisk/sounds/vm-tocallnum.gsm
 share/asterisk/sounds/vm-tocancel.gsm
+share/asterisk/sounds/vm-tocancelmsg.gsm
+share/asterisk/sounds/vm-toenternumber.gsm
 share/asterisk/sounds/vm-toforward.gsm
+share/asterisk/sounds/vm-tohearenv.gsm
+share/asterisk/sounds/vm-tomakecall.gsm
+share/asterisk/sounds/vm-tooshort.gsm
+share/asterisk/sounds/vm-toreply.gsm
+share/asterisk/sounds/vm-torerecord.gsm
 share/asterisk/sounds/vm-undelete.gsm
 share/asterisk/sounds/vm-undeleted.gsm
+share/asterisk/sounds/vm-unknown-caller.gsm
 share/asterisk/sounds/vm-whichbox.gsm
 share/asterisk/sounds/vm-youhave.gsm
 share/asterisk/sounds/voicemail
+@dirrm share/asterisk/sounds/phonetic
+@dirrm share/asterisk/sounds/letters
 @dirrm share/asterisk/sounds/digits
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/mohmp3
 @dirrm share/asterisk/keys
 @dirrm share/asterisk/images
+@dirrm share/asterisk/firmware/iax
+@dirrm share/asterisk/firmware
 @dirrm share/asterisk/agi-bin
 @dirrm share/asterisk
 @dirrm lib/asterisk/modules
@@ -463,6 +634,7 @@ spool/asterisk/voicemail/default/1234/unavail.gsm
 @dirrm spool/asterisk/voicemail/default/1234
 @dirrm spool/asterisk/voicemail/default
 @dirrm spool/asterisk/voicemail
+@dirrm spool/asterisk/tmp
 @dirrm spool/asterisk
 @dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk
diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile
index 420c2dcfe4e7..3f24e2ef57a9 100644
--- a/net/asterisk-devel/Makefile
+++ b/net/asterisk-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -17,11 +16,13 @@ COMMENT=	An Open Source PBX and telephony toolkit
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
 		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
@@ -35,14 +36,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
-.include <bsd.port.pre.mk>
+MAN8=		asterisk.8
 
-.if defined(WITH_ZAPTEL) || exists(${LOCALBASE}/include/zaptel.h)
-BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-PLIST_SUB=	ZAPTEL=""
-.else
-PLIST_SUB=	ZAPTEL="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/asterisk-devel/distinfo b/net/asterisk-devel/distinfo
index a12f4a79e431..d7661cced0c6 100644
--- a/net/asterisk-devel/distinfo
+++ b/net/asterisk-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (asterisk-0.9.0.tar.gz) = cb0fbb5185fdf2356ee30bdcf4ad9b9c
-SIZE (asterisk-0.9.0.tar.gz) = 2787458
+MD5 (asterisk-1.0.1.tar.gz) = cb55b1a0be8ff6e94179db0cdc7e074d
+SIZE (asterisk-1.0.1.tar.gz) = 9558497
diff --git a/net/asterisk-devel/files/patch-Makefile b/net/asterisk-devel/files/patch-Makefile
index 94155a666be0..43bf910fe669 100644
--- a/net/asterisk-devel/files/patch-Makefile
+++ b/net/asterisk-devel/files/patch-Makefile
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- Makefile.orig	Thu Apr  1 01:43:10 2004
-+++ Makefile	Wed Apr 14 22:08:43 2004
-@@ -43,10 +43,10 @@
+--- Makefile.orig	Tue Sep 28 20:11:30 2004
++++ Makefile	Thu Oct 14 19:48:30 2004
+@@ -62,10 +62,10 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
  
  #Include debug symbols in the executables (-g) and profiling info (-pg)
 -DEBUG=-g #-pg
 +#DEBUG=-g #-pg
  
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
+ # If you are running a radio application, define RADIO_RELAX so that the DTMF
+ # will be received more reliably
+@@ -90,7 +90,7 @@
  
  # Where to install asterisk after compiling
  # Default -> leave empty
@@ -25,7 +25,7 @@ $FreeBSD$
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -88,28 +88,27 @@
+@@ -110,23 +110,23 @@
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
@@ -44,36 +44,45 @@ $FreeBSD$
 -ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
 -ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
 -ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+-ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 +ASTBINDIR=$(INSTALL_PREFIX)/bin
 +ASTSBINDIR=$(INSTALL_PREFIX)/sbin
 +ASTVARRUNDIR=/var/run
++ASTMANDIR=$(INSTALL_PREFIX)/man
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
- INCLUDE=-Iinclude -I../include 
+ INCLUDE=-Iinclude -I../include
 -CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
- CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ 
+ ifneq ($(PROC),ultrasparc)
+@@ -137,11 +137,8 @@
+ CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
+ 
  ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
+-OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 -INCLUDE+=-I/usr/local/include
+-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 +CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +150,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +178,7 @@
++LIBS+=$(PTHREAD_LIBS)
+ endif # FreeBSD
+ 
+ ifeq (${OSARCH},NetBSD)
+@@ -157,7 +154,7 @@
+ #CFLAGS+=-DOLD_DSP_ROUTINES
+ 
+ CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
++CFLAGS+=-I$(LOCALBASE)/include -DZAPTEL_OPTIMIZATIONS
+ 
+ LIBEDIT=editline/libedit.a
+ 
+@@ -219,7 +216,7 @@
  SOLINK=-shared -Xlinker -x
  endif
  
@@ -82,7 +91,16 @@ $FreeBSD$
  INSTALL=install
  
  _all: all
-@@ -200,13 +199,13 @@
+@@ -231,7 +228,7 @@
+ 	@echo " +               $(MAKE) install                +"  
+ 	@echo " +-------------------------------------------+"  
+ 
+-all: depend asterisk subdirs 
++all: depend asterisk subdirs manpage
+ 
+ editline/config.h:
+ 	cd editline && unset CFLAGS LIBS && ./configure ; \
+@@ -240,13 +237,13 @@
  	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  	$(MAKE) -C editline libedit.a
  
@@ -103,18 +121,35 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
  include .depend
-@@ -244,8 +243,8 @@
+@@ -268,13 +265,10 @@
+ 
+ asterisk.o: asterisk.c build.h
+ 
+-manpage: asterisk.8.gz
++manpage: asterisk.8
+ 
+-asterisk.8.gz: asterisk.sgml
+-	rm -f asterisk.8
+-	docbook2man asterisk.sgml
+-	mv ./*.8 asterisk.8
+-	gzip asterisk.8
++asterisk.8: asterisk.8.gz
++	gzcat asterisk.8.gz > asterisk.8
+ 
+ ifneq ($(strip $(ASTERISKVERSION)),)
+ build.h: .version
+@@ -292,8 +286,8 @@
  		exit 1; \
  	fi
  
 -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+-	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
 +asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
++	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS)
  
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +259,10 @@
+ muted: muted.o
+ 	$(CC) -o muted muted.o
+@@ -312,28 +306,28 @@
  	$(MAKE) -C stdtime clean
  
  datafiles: all
@@ -127,9 +162,31 @@ $FreeBSD$
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -271,18 +270,18 @@
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ 	for x in sounds/letters/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ 	for x in sounds/phonetic/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+@@ -341,18 +335,18 @@
  	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
+ 	for x in 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-*; do \
  		if grep -q "^%`basename $$x`%" sounds.txt; then \
 -			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 +			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
@@ -151,7 +208,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -294,105 +293,74 @@
+@@ -364,111 +358,86 @@
  	fi
  
  bininstall: all
@@ -162,6 +219,7 @@ $FreeBSD$
 -	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
@@ -171,6 +229,7 @@ $FreeBSD$
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
@@ -191,19 +250,34 @@ $FreeBSD$
 -		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
 -	fi
 -	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 -	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
++	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	if [ -d contrib/firmware/iax ]; then \
+-		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ 	else \
+ 		echo "You need to do cvs update -d not just cvs update" ; \
+ 	fi 
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
+-	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -225,13 +299,8 @@ $FreeBSD$
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
@@ -294,8 +363,31 @@ $FreeBSD$
 -		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
  	done
+ 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	:> $(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 ; \
+@@ -483,7 +452,7 @@
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
+ 	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
+-	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk
++	$(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk
+ 	for x in images/*.gif; do \
+ 		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
+ 	done
+@@ -503,10 +472,10 @@
+ 
+ __rpm: _version
+ 	rm -rf /tmp/asterisk ; \
+-	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++	$(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
+-	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++	$(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+ 	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
+ 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
diff --git a/net/asterisk-devel/files/patch-agi::Makefile b/net/asterisk-devel/files/patch-agi::Makefile
index 567c30f5624e..32efb5d2b101 100644
--- a/net/asterisk-devel/files/patch-agi::Makefile
+++ b/net/asterisk-devel/files/patch-agi::Makefile
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
+--- agi/Makefile.orig	Tue Jun 22 20:42:13 2004
++++ agi/Makefile	Tue Oct  5 21:03:40 2004
+@@ -11,15 +11,18 @@
  # the GNU General Public License
  #
  
@@ -24,12 +24,4 @@ $FreeBSD$
 +	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
  
  eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
+ 	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
diff --git a/net/asterisk-devel/files/patch-apps::Makefile b/net/asterisk-devel/files/patch-apps::Makefile
index 901ba694c33a..00b77dfe2434 100644
--- a/net/asterisk-devel/files/patch-apps::Makefile
+++ b/net/asterisk-devel/files/patch-apps::Makefile
@@ -1,22 +1,24 @@
 
 $FreeBSD$
 
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
+--- apps/Makefile.orig	Sat Sep 25 00:32:56 2004
++++ apps/Makefile	Sun Oct 10 16:20:06 2004
+@@ -40,7 +40,7 @@
+ #APPS+=app_rpt.so
+ 
+ APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+-APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
++APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+ APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+ 
+ CFLAGS+=-fPIC
+@@ -65,12 +65,12 @@
  	$(CC) $(SOLINK) -o $@ $< -ltonezone
  
  install: all
 -	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
  
  app_voicemail.so : app_voicemail.o
  ifeq ($(USE_MYSQL_VM_INTERFACE),1)
@@ -25,11 +27,22 @@ $FreeBSD$
  else
  ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
  	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
+@@ -80,16 +80,16 @@
+ endif
+ 
+ app_sql_postgres.o: app_sql_postgres.c
+-	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
++	$(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ 
+ app_sql_postgres.so: app_sql_postgres.o
+-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/pgsql/lib -lpq
++	$(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq
+ 
+ app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ $< -lodbc
  
  look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
+-	$(CC) -pipe -O6 -g look.c -o look -lncurses
 +	$(CC) $(CFLAGS) look.c -o look -lncurses
  
  ifneq ($(wildcard .depend),)
diff --git a/net/asterisk-devel/files/patch-apps::app_intercom.c b/net/asterisk-devel/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk-devel/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk-devel/files/patch-astman::Makefile b/net/asterisk-devel/files/patch-astman::Makefile
index cf31005257cf..2745860cdd36 100644
--- a/net/asterisk-devel/files/patch-astman::Makefile
+++ b/net/asterisk-devel/files/patch-astman::Makefile
@@ -1,9 +1,20 @@
 
 $FreeBSD$
 
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
+--- astman/Makefile.orig	Sat Jun 26 22:25:39 2004
++++ astman/Makefile	Thu Oct 14 19:14:22 2004
+@@ -5,16 +5,16 @@
+ 
+ OSARCH=$(shell uname -s)
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS+=-I/usr/local/include -L/usr/local/lib
++CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib
+ endif
+ 
+-TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi)
++TARGET=astman
+ all: depend $(TARGET)
+ 
  install:
  	if [ "$(TARGET)" != "none" ]; then \
  		for x in $(TARGET); do \
diff --git a/net/asterisk-devel/files/patch-cdr::Makefile b/net/asterisk-devel/files/patch-cdr::Makefile
index 2ede608f9019..f646d2c9a3dc 100644
--- a/net/asterisk-devel/files/patch-cdr::Makefile
+++ b/net/asterisk-devel/files/patch-cdr::Makefile
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
+--- cdr/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ cdr/Makefile	Thu Oct 14 19:13:38 2004
+@@ -21,7 +21,7 @@
+ OSARCH=$(shell uname -s)
+ 
+ ifeq (${OSARCH},FreeBSD)
+-SOLINK+=-L/usr/local/lib
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+@@ -71,7 +71,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk-devel/files/patch-channels::Makefile b/net/asterisk-devel/files/patch-channels::Makefile
index fd855e7a2710..98caab3a33d6 100644
--- a/net/asterisk-devel/files/patch-channels::Makefile
+++ b/net/asterisk-devel/files/patch-channels::Makefile
@@ -1,53 +1,62 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Thu Mar 25 11:43:36 2004
-+++ channels/Makefile	Thu Apr 29 14:36:36 2004
-@@ -33,12 +33,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
+--- channels/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ channels/Makefile	Sun Oct 10 16:18:05 2004
+@@ -57,10 +57,10 @@
+ 
+ endif
+ ifeq (${OSARCH},FreeBSD)
+-PTLIB=-lpt_FreeBSD_x86_r
+-H323LIB=-lh323_FreeBSD_x86_r
+-CHANH323LIB=-pthread
+-SOLINK+=-L/usr/local/lib
++PTLIB=-lpt_FreeBSD_x86_r_s
++H323LIB=-lh323_FreeBSD_x86_r_s
++CHANH323LIB=
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ ifeq (${OSARCH},NetBSD)
+ PTLIB=-lpt_NetBSD_x86_r
+@@ -72,8 +72,8 @@
+ endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so)
 +CHANNEL_LIBS+=chan_h323.so
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -48,7 +46,7 @@
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+@@ -84,7 +84,7 @@
  ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 +CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
  CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
  
-@@ -69,7 +67,7 @@
- 
+@@ -107,7 +107,7 @@
  ZAPDIR=/usr/lib
  
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so")
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
  
-@@ -110,10 +108,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
+@@ -156,6 +156,8 @@
  chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
+ 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+ endif
++chan_oss.so: chan_oss.o
 +	$(CC) $(SOLINK) -o $@ chan_oss.o
  
- chan_iax2.so: chan_iax2.o iax2-parser.o
+ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -133,7 +129,7 @@
+@@ -175,7 +177,7 @@
  	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
  
  chan_zap.so: chan_zap.o
@@ -55,15 +64,15 @@ $FreeBSD$
 +	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone
  
  chan_sip.so: chan_sip.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -157,16 +153,17 @@
+ ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+@@ -199,15 +201,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
+-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(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
++	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
@@ -73,8 +82,7 @@ $FreeBSD$
  
  install: all
 -	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 +	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
+ 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
  
  depend: .depend
- 
diff --git a/net/asterisk-devel/files/patch-channels::chan_h323.c b/net/asterisk-devel/files/patch-channels::chan_h323.c
index e413bd8ecec8..de2ed3978663 100644
--- a/net/asterisk-devel/files/patch-channels::chan_h323.c
+++ b/net/asterisk-devel/files/patch-channels::chan_h323.c
@@ -1,13 +1,14 @@
 
 $FreeBSD$
 
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
+--- channels/chan_h323.c	2004/10/10 13:00:17	1.1
++++ channels/chan_h323.c	2004/10/10 13:00:39
+@@ -26,7 +26,7 @@
+  * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $
+  */
  
+-
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
diff --git a/net/asterisk-devel/files/patch-channels::chan_iax2.c b/net/asterisk-devel/files/patch-channels::chan_iax2.c
deleted file mode 100644
index 9127bee41cb6..000000000000
--- a/net/asterisk-devel/files/patch-channels::chan_iax2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_iax2.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_iax2.c	2004/04/29 21:37:10
-@@ -52,7 +52,7 @@
- #include <sys/stat.h>
- #ifdef IAX_TRUNKING
- #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #endif
- #ifdef MYSQL_FRIENDS
- #include <mysql/mysql.h>
diff --git a/net/asterisk-devel/files/patch-channels::chan_oss.c b/net/asterisk-devel/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk-devel/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk-devel/files/patch-channels::chan_sip.c b/net/asterisk-devel/files/patch-channels::chan_sip.c
index b98f9d185009..521d6a46d256 100644
--- a/net/asterisk-devel/files/patch-channels::chan_sip.c
+++ b/net/asterisk-devel/files/patch-channels::chan_sip.c
@@ -1,26 +1,26 @@
 
 $FreeBSD$
 
---- channels/chan_sip.c.orig	Wed Jan 14 08:10:53 2004
-+++ channels/chan_sip.c	Fri Jan 30 01:47:34 2004
-@@ -124,7 +124,7 @@
- static int restart_monitor(void);
+--- channels/chan_sip.c.orig
++++ channels/chan_sip.c
+@@ -139,7 +139,7 @@
  
- /* Codecs that we support by default: */
--static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
-+static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263 | AST_FORMAT_G723_1 | AST_FORMAT_G729A;
- static int noncodeccapability = AST_RTP_DTMF;
+ static char default_language[MAX_LANGUAGE] = "";
  
- static char ourhost[256];
-@@ -176,6 +176,7 @@
+-static char default_callerid[AST_MAX_EXTENSION] = "asterisk";
++static char default_callerid[AST_MAX_EXTENSION] = "Unknown";
+ 
+ static char default_fromdomain[AST_MAX_EXTENSION] = "";
+ 
+@@ -244,6 +244,7 @@
  struct sip_route {
  	struct sip_route *next;
  	char hop[0];
 +	int lr;
  };
  
- static struct sip_pvt {
-@@ -3417,6 +3418,10 @@
+ struct sip_history {
+@@ -4573,6 +4574,10 @@
  			/* Make a struct route */
  			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
  			if (thishop) {
@@ -28,17 +28,17 @@ $FreeBSD$
 +					thishop->lr = 1;
 +				else
 +					thishop->lr = 0;
- 				strncpy(thishop->hop, rr, len);
+ 				strncpy(thishop->hop, rr, len); /* safe */
  				thishop->hop[len] = '\0';
  				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
-@@ -3440,31 +3445,41 @@
+@@ -4596,31 +4601,41 @@
  			rr += len+1;
  		}
  	}
 -	/* 2nd append the Contact: if there is one */
 -	/* Can be multiple Contact headers, comma separated values - we just take the first */
 -	contact = get_header(req, "Contact");
--	if (strlen(contact)) {
+-	if (!ast_strlen_zero(contact)) {
 -		ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 -		/* Look for <: delimited address */
 -		c = strchr(contact, '<');
@@ -55,7 +55,7 @@ $FreeBSD$
 +	if (head && head->lr) {
 +		thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1);
  		if (thishop) {
--			strncpy(thishop->hop, c, len);
+-			strncpy(thishop->hop, c, len); /* safe */
 -			thishop->hop[len] = '\0';
 -			thishop->next = NULL;
 -			/* Goes at the end */
@@ -71,7 +71,7 @@ $FreeBSD$
 +		/* Append the Contact: if there is one and first route is w/o `lr' param */
 +		/* Can be multiple Contact headers, comma separated values - we just take the first */
 +		contact = get_header(req, "Contact");
-+		if (strlen(contact)) {
++		if (!ast_strlen_zero(contact)) {
 +			ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 +			/* Look for <: delimited address */
 +			c = strchr(contact, '<');
@@ -85,7 +85,7 @@ $FreeBSD$
 +			}
 +			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
 +			if (thishop) {
-+				strncpy(thishop->hop, c, len);
++				strncpy(thishop->hop, c, len); /* safe */
 +				thishop->hop[len] = '\0';
 +				thishop->next = NULL;
 +				/* Goes at the end */
@@ -97,7 +97,7 @@ $FreeBSD$
  		}
  	}
  	/* Store as new route */
-@@ -5143,7 +5158,11 @@
+@@ -7197,7 +7212,11 @@
  			/* Get destination right away */
  			gotdest = get_destination(p, NULL);
  			get_rdnis(p, NULL);
@@ -110,8 +110,8 @@ $FreeBSD$
  			build_contact(p);
  
  			if (gotdest) {
-@@ -5165,7 +5184,6 @@
- 				c = sip_new(p, AST_STATE_DOWN, strlen(p->username) ? p->username : NULL);
+@@ -7225,7 +7244,6 @@
+ 				c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
  				*recount = 1;
  				/* Save Record-Route for any later requests we make on this dialogue */
 -				build_route(p, req, 0);
diff --git a/net/asterisk-devel/files/patch-channels::chan_zap.c b/net/asterisk-devel/files/patch-channels::chan_zap.c
index e5a3ffc6afec..965a643bb687 100644
--- a/net/asterisk-devel/files/patch-channels::chan_zap.c
+++ b/net/asterisk-devel/files/patch-channels::chan_zap.c
@@ -1,14 +1,15 @@
 
 $FreeBSD$
 
---- channels/chan_zap.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_zap.c	2004/04/29 21:37:17
-@@ -45,7 +45,7 @@
+--- channels/chan_zap.c
++++ channels/chan_zap.c
+@@ -42,7 +42,9 @@
+ #include <sys/signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifndef __FreeBSD__
  #include <stdint.h>
++#endif
  #include <unistd.h>
  #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #include <math.h>
- #include <tonezone.h>
- #include <ctype.h>
+ #ifdef __linux__
diff --git a/net/asterisk-devel/files/patch-channels::h323::Makefile b/net/asterisk-devel/files/patch-channels::h323::Makefile
index a9159b4441c1..bc34083e2ff3 100644
--- a/net/asterisk-devel/files/patch-channels::h323::Makefile
+++ b/net/asterisk-devel/files/patch-channels::h323::Makefile
@@ -1,64 +1,38 @@
 
 $FreeBSD$
 
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+--- channels/h323/Makefile.orig	Tue Aug 31 16:32:11 2004
++++ channels/h323/Makefile	Sun Oct 10 15:25:42 2004
+@@ -53,7 +53,7 @@
+ LIBS+=-lpthread
+ endif
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS += -pthread
++CFLAGS += $(PTHREAD_LIBS)
+ endif
+ CFLAGS += -D_REENTRANT -D_GNU_SOURCE
  CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
+@@ -74,19 +74,19 @@
   
  
  ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
+-	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
++	$(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $<
  
  libchanh323.a:	ast_h323.o
  	ar cr libchanh323.a ast_h323.o
  
  chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB)
  
  chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)     -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB)
  
  chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
+-	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB)
  clean:
  	rm -f *.o *.so core.* libchanh323.a
  
diff --git a/net/asterisk-devel/files/patch-codecs::Makefile b/net/asterisk-devel/files/patch-codecs::Makefile
index b802dc1233e8..de9aff4c34fe 100644
--- a/net/asterisk-devel/files/patch-codecs::Makefile
+++ b/net/asterisk-devel/files/patch-codecs::Makefile
@@ -1,22 +1,23 @@
 
 $FreeBSD$
 
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
+--- codecs/Makefile.orig	Mon Jul 19 18:52:57 2004
++++ codecs/Makefile	Sun Oct 10 15:28:35 2004
+@@ -17,23 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+-MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
 +MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
++MODILBC=codec_ilbc.so
+ CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
++CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
  LIBG723B=g723.1b/libg723b.a
@@ -30,11 +31,11 @@ $FreeBSD$
  
 -CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
 +CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
+         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
+ 	codec_g726.so
  
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
+@@ -91,7 +91,7 @@
+ endif
  
  install: all
 -	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
diff --git a/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c
index 661ff2d88602..3ce9571013ec 100644
--- a/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c
+++ b/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g723_1_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g723_1_dummy.c	Sun Oct 10 16:07:05 2004
 @@ -0,0 +1,308 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -44,7 +44,7 @@ $FreeBSD$
 +#include "slin_g723_ex.h"
 +#include "g723_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
diff --git a/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c b/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c
index c3e27d98e27e..9fcc7b19ca35 100644
--- a/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c
+++ b/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g729_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g729_dummy.c	Sun Oct 10 16:07:12 2004
 @@ -0,0 +1,275 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -38,7 +38,7 @@ $FreeBSD$
 +#include "slin_g729_ex.h"
 +#include "g729_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
diff --git a/net/asterisk-devel/files/patch-codecs::gsm::Makefile b/net/asterisk-devel/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk-devel/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk-devel/files/patch-codecs::lpc10::Makefile b/net/asterisk-devel/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 1674119a4836..000000000000
--- a/net/asterisk-devel/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Mon Mar 15 18:52:28 2004
-+++ codecs/lpc10/Makefile	Wed Apr 14 22:13:47 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,7 +22,7 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors and ALPHA too
-@@ -30,7 +30,7 @@
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
- ifneq ($(PROC),alpha)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+=
- endif
- endif
- endif
diff --git a/net/asterisk-devel/files/patch-db.c b/net/asterisk-devel/files/patch-db.c
index 59e5cef87770..6c2bdcd443c8 100644
--- a/net/asterisk-devel/files/patch-db.c
+++ b/net/asterisk-devel/files/patch-db.c
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
+--- db.c.orig	Fri Jul  9 13:08:09 2004
++++ db.c	Sun Oct 10 15:32:33 2004
+@@ -33,7 +33,7 @@
  #include <asterisk/cli.h>
+ #include <asterisk/utils.h>
+ #include <asterisk/lock.h>
 -#include "db1-ast/include/db.h"
 +#include <db.h>
  #include "asterisk.h"
diff --git a/net/asterisk-devel/files/patch-formats::format_g723_1.c b/net/asterisk-devel/files/patch-formats::format_g723_1.c
index 8d0755e14205..fb5eb12833dc 100644
--- a/net/asterisk-devel/files/patch-formats::format_g723_1.c
+++ b/net/asterisk-devel/files/patch-formats::format_g723_1.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
+--- formats/format_g723_1.c.orig	Sun Oct 10 15:59:18 2004
++++ formats/format_g723_1.c	Sun Oct 10 16:05:05 2004
 @@ -0,0 +1,345 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -57,7 +57,7 @@ $FreeBSD$
 +
 +static long g723_tell(struct ast_filestream *);
 +
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(g723_lock);
 +static int glistcnt = 0;
 +
 +static char *name = "g723";
diff --git a/net/asterisk-devel/files/patch-include::asterisk::utils.h b/net/asterisk-devel/files/patch-include::asterisk::utils.h
new file mode 100644
index 000000000000..a06f7d065c84
--- /dev/null
+++ b/net/asterisk-devel/files/patch-include::asterisk::utils.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- include/asterisk/utils.h	2004/10/10 12:55:50	1.1
++++ include/asterisk/utils.h	2004/10/10 12:56:43
+@@ -37,7 +37,6 @@
+ #ifdef inet_ntoa
+ #undef inet_ntoa
+ #endif
+-#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
+ 
+ #ifdef LINUX
+ #define ast_pthread_create pthread_create
diff --git a/net/asterisk-devel/files/patch-res::Makefile b/net/asterisk-devel/files/patch-res::Makefile
index ccd0a35dd59d..5700f04ea1ef 100644
--- a/net/asterisk-devel/files/patch-res::Makefile
+++ b/net/asterisk-devel/files/patch-res::Makefile
@@ -1,12 +1,21 @@
 
 $FreeBSD$
 
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
+--- res/Makefile.orig	Sat Jul 17 23:58:01 2004
++++ res/Makefile	Thu Oct 14 19:15:00 2004
+@@ -21,7 +21,7 @@
  
- install: all
+ CFLAGS+=
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
++CFLAGS+=-DZAPATA_MOH -I$(LOCALBASE)/include
+ #
+ # Work around buggy RedHat 9.0
+ #
+@@ -34,7 +34,7 @@
+ 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
 -	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
  
diff --git a/net/asterisk-devel/files/patch-rtp.c b/net/asterisk-devel/files/patch-rtp.c
index 11767dca198f..06289f357208 100644
--- a/net/asterisk-devel/files/patch-rtp.c
+++ b/net/asterisk-devel/files/patch-rtp.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- rtp.c.orig	Tue Nov 25 23:15:28 2003
-+++ rtp.c	Fri Jan 30 01:47:34 2004
-@@ -114,7 +114,7 @@
+--- rtp.c.orig	Sat Sep 18 16:56:28 2004
++++ rtp.c	Sun Oct 10 15:57:22 2004
+@@ -127,7 +127,7 @@
  {
  	switch(buf & TYPE_MASK) {
  	case TYPE_DONTSEND:
@@ -12,31 +12,15 @@ $FreeBSD$
  		break;
  	case TYPE_SILENCE:
  		return 4;
-@@ -1028,19 +1028,6 @@
- 		while((f = ast_smoother_read(rtp->smoother)))
- 			ast_rtp_raw_write(rtp, f, codec);
- 		break;
--	case AST_FORMAT_G729A:
--		if (!rtp->smoother) {
--			rtp->smoother = ast_smoother_new(20);
--		}
--		if (!rtp->smoother) {
--			ast_log(LOG_WARNING, "Unable to create g729 smoother :(\n");
--			return -1;
--		}
--		ast_smoother_feed(rtp->smoother, _f);
--		
--		while((f = ast_smoother_read(rtp->smoother)))
--			ast_rtp_raw_write(rtp, f, codec);
--		break;
- 	case AST_FORMAT_GSM:
- 		if (!rtp->smoother) {
- 			rtp->smoother = ast_smoother_new(33);
-@@ -1071,6 +1058,7 @@
- 	case AST_FORMAT_H261:
- 	case AST_FORMAT_H263:
- 	case AST_FORMAT_G723_1:
-+	case AST_FORMAT_G729A:
- 	case AST_FORMAT_SPEEX:
- 	        // Don't buffer outgoing frames; send them one-per-packet:
- 		if (_f->offset < hdrlen) {
+@@ -841,8 +841,10 @@
+ 		/* Must be an even port number by RTP spec */
+ 		rtp->us.sin_port = htons(x);
+ 		rtp->us.sin_addr = addr;
+-		if (rtp->rtcp)
++		if (rtp->rtcp) {
+ 			rtp->rtcp->us.sin_port = htons(x + 1);
++			rtp->rtcp->us.sin_addr = addr;
++		}
+ 		if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
+ 			(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
+ 			break;
diff --git a/net/asterisk-devel/pkg-plist b/net/asterisk-devel/pkg-plist
index eb427fa04447..f1519b3f3a39 100644
--- a/net/asterisk-devel/pkg-plist
+++ b/net/asterisk-devel/pkg-plist
@@ -7,6 +7,9 @@ etc/asterisk/adtranvofr.conf-dist
 @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
 etc/asterisk/agents.conf-dist
 @exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
+@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
+etc/asterisk/alarmreceiver.conf-dist
+@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf
 @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
 etc/asterisk/alsa.conf-dist
 @exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
@@ -16,18 +19,30 @@ etc/asterisk/asterisk.adsi-dist
 @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
 etc/asterisk/asterisk.conf-dist
 @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
+etc/asterisk/cdr_manager.conf-dist
+@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
 etc/asterisk/cdr_odbc.conf-dist
 @exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
 etc/asterisk/cdr_pgsql.conf-dist
 @exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
+etc/asterisk/cdr_tds.conf-dist
+@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf
 @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
 etc/asterisk/enum.conf-dist
 @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
+@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
+etc/asterisk/extconfig.conf-dist
+@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf
 @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
 etc/asterisk/extensions.conf-dist
 @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
+@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
+etc/asterisk/features.conf-dist
+@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
@@ -37,6 +52,9 @@ etc/asterisk/h323.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
+@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
+etc/asterisk/iaxprov.conf-dist
+@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf
 @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
 etc/asterisk/indications.conf-dist
 @exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
@@ -61,12 +79,12 @@ etc/asterisk/modules.conf-dist
 @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
 etc/asterisk/musiconhold.conf-dist
 @exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
+@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
+etc/asterisk/osp.conf-dist
+@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf
 @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
 etc/asterisk/oss.conf-dist
 @exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
 @unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
 etc/asterisk/phone.conf-dist
 @exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
@@ -76,6 +94,12 @@ etc/asterisk/privacy.conf-dist
 @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
 etc/asterisk/queues.conf-dist
 @exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
+@unexec if cmp -s %D/etc/asterisk/res_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi
+etc/asterisk/res_config_odbc.conf-dist
+@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.conf
+@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
+etc/asterisk/res_odbc.conf-dist
+@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
 etc/asterisk/rpt.conf-dist
 @exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
@@ -103,11 +127,13 @@ etc/asterisk/zapata.conf-dist
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
+include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/app.h
 include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
+include/asterisk/astosp.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
@@ -116,12 +142,14 @@ include/asterisk/channel_pvt.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/config.h
+include/asterisk/config_pvt.h
 include/asterisk/crypto.h
 include/asterisk/cvsid.h
 include/asterisk/dlfcn-compat.h
 include/asterisk/dns.h
 include/asterisk/dsp.h
 include/asterisk/enum.h
+include/asterisk/features.h
 include/asterisk/file.h
 include/asterisk/frame.h
 include/asterisk/fskmodem.h
@@ -138,10 +166,10 @@ include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
 include/asterisk/options.h
-include/asterisk/parking.h
 include/asterisk/pbx.h
 include/asterisk/poll-compat.h
 include/asterisk/privacy.h
+include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -150,30 +178,39 @@ include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/translate.h
 include/asterisk/ulaw.h
+include/asterisk/utils.h
 include/asterisk/vmodem.h
 lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
+lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
+lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
 lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_enumlookup.so
+lib/asterisk/modules/app_eval.so
+lib/asterisk/modules/app_exec.so
 lib/asterisk/modules/app_festival.so
+lib/asterisk/modules/app_flash.so
+lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
+lib/asterisk/modules/app_groupcount.so
 lib/asterisk/modules/app_hasnewvoicemail.so
+lib/asterisk/modules/app_ices.so
 lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_intercom.so
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+lib/asterisk/modules/app_meetme.so
 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_playback.so
 lib/asterisk/modules/app_privacy.so
@@ -184,20 +221,31 @@ lib/asterisk/modules/app_read.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
+lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so
 lib/asterisk/modules/app_setcdruserfield.so
 lib/asterisk/modules/app_setcidname.so
 lib/asterisk/modules/app_setcidnum.so
+lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_striplsd.so
 lib/asterisk/modules/app_substring.so
 lib/asterisk/modules/app_system.so
+lib/asterisk/modules/app_talkdetect.so
+lib/asterisk/modules/app_test.so
 lib/asterisk/modules/app_transfer.so
+lib/asterisk/modules/app_txtcidname.so
 lib/asterisk/modules/app_url.so
+lib/asterisk/modules/app_userevent.so
+lib/asterisk/modules/app_verbose.so
 lib/asterisk/modules/app_voicemail.so
 lib/asterisk/modules/app_waitforring.so
 lib/asterisk/modules/app_zapateller.so
+lib/asterisk/modules/app_zapbarge.so
+lib/asterisk/modules/app_zapras.so
+lib/asterisk/modules/app_zapscan.so
 lib/asterisk/modules/cdr_csv.so
+lib/asterisk/modules/cdr_manager.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax2.so
@@ -210,11 +258,12 @@ lib/asterisk/modules/chan_modem_i4l.so
 lib/asterisk/modules/chan_oss.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
-%%ZAPTEL%%lib/asterisk/modules/chan_zap.so
+lib/asterisk/modules/chan_zap.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g723_1_dummy.so
+lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_g729_dummy.so
 lib/asterisk/modules/codec_gsm.so
 lib/asterisk/modules/codec_ilbc.so
@@ -222,12 +271,15 @@ lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723_1.so
+lib/asterisk/modules/format_g726.so
 lib/asterisk/modules/format_g729.so
 lib/asterisk/modules/format_gsm.so
 lib/asterisk/modules/format_h263.so
+lib/asterisk/modules/format_ilbc.so
 lib/asterisk/modules/format_jpeg.so
 lib/asterisk/modules/format_pcm.so
 lib/asterisk/modules/format_pcm_alaw.so
+lib/asterisk/modules/format_sln.so
 lib/asterisk/modules/format_vox.so
 lib/asterisk/modules/format_wav.so
 lib/asterisk/modules/format_wav_gsm.so
@@ -235,20 +287,25 @@ lib/asterisk/modules/pbx_config.so
 lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/pbx_wilcalu.so
 lib/asterisk/modules/res_adsi.so
+lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_features.so
 lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
 sbin/asterisk
 sbin/astgenkey
 sbin/safe_asterisk
 share/asterisk/agi-bin/agi-test.agi
 share/asterisk/agi-bin/eagi-sphinx-test
 share/asterisk/agi-bin/eagi-test
+share/asterisk/firmware/iax/iaxy.bin
 share/asterisk/images/asterisk-intro.jpg
+share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
+share/asterisk/mohmp3/fpm-calm-river.mp3
+share/asterisk/mohmp3/fpm-sunshine.mp3
+share/asterisk/mohmp3/fpm-world-mix.mp3
 share/asterisk/sounds/agent-alreadyon.gsm
 share/asterisk/sounds/agent-incorrect.gsm
 share/asterisk/sounds/agent-loggedoff.gsm
@@ -259,12 +316,23 @@ share/asterisk/sounds/agent-user.gsm
 share/asterisk/sounds/auth-incorrect.gsm
 share/asterisk/sounds/auth-thankyou.gsm
 share/asterisk/sounds/beep.gsm
+share/asterisk/sounds/conf-adminmenu.gsm
+share/asterisk/sounds/conf-enteringno.gsm
+share/asterisk/sounds/conf-errormenu.gsm
 share/asterisk/sounds/conf-getchannel.gsm
 share/asterisk/sounds/conf-getconfno.gsm
 share/asterisk/sounds/conf-getpin.gsm
 share/asterisk/sounds/conf-invalid.gsm
 share/asterisk/sounds/conf-invalidpin.gsm
+share/asterisk/sounds/conf-kicked.gsm
+share/asterisk/sounds/conf-locked.gsm
+share/asterisk/sounds/conf-lockednow.gsm
+share/asterisk/sounds/conf-muted.gsm
+share/asterisk/sounds/conf-noempty.gsm
 share/asterisk/sounds/conf-onlyperson.gsm
+share/asterisk/sounds/conf-unlockednow.gsm
+share/asterisk/sounds/conf-unmuted.gsm
+share/asterisk/sounds/conf-usermenu.gsm
 share/asterisk/sounds/demo-abouttotry.gsm
 share/asterisk/sounds/demo-congrats.gsm
 share/asterisk/sounds/demo-echodone.gsm
@@ -359,16 +427,88 @@ share/asterisk/sounds/digits/tomorrow.gsm
 share/asterisk/sounds/digits/yesterday.gsm
 share/asterisk/sounds/dir-instr.gsm
 share/asterisk/sounds/dir-intro.gsm
+share/asterisk/sounds/dir-intro-fn.gsm
 share/asterisk/sounds/dir-nomatch.gsm
 share/asterisk/sounds/dir-nomore.gsm
 share/asterisk/sounds/invalid.gsm
+share/asterisk/sounds/letters/a.gsm
+share/asterisk/sounds/letters/at.gsm
+share/asterisk/sounds/letters/b.gsm
+share/asterisk/sounds/letters/c.gsm
+share/asterisk/sounds/letters/d.gsm
+share/asterisk/sounds/letters/dash.gsm
+share/asterisk/sounds/letters/dollar.gsm
+share/asterisk/sounds/letters/dot.gsm
+share/asterisk/sounds/letters/e.gsm
+share/asterisk/sounds/letters/equals.gsm
+share/asterisk/sounds/letters/exclaimation-point.gsm
+share/asterisk/sounds/letters/f.gsm
+share/asterisk/sounds/letters/g.gsm
+share/asterisk/sounds/letters/h.gsm
+share/asterisk/sounds/letters/i.gsm
+share/asterisk/sounds/letters/j.gsm
+share/asterisk/sounds/letters/k.gsm
+share/asterisk/sounds/letters/l.gsm
+share/asterisk/sounds/letters/m.gsm
+share/asterisk/sounds/letters/n.gsm
+share/asterisk/sounds/letters/o.gsm
+share/asterisk/sounds/letters/p.gsm
+share/asterisk/sounds/letters/plus.gsm
+share/asterisk/sounds/letters/q.gsm
+share/asterisk/sounds/letters/r.gsm
+share/asterisk/sounds/letters/s.gsm
+share/asterisk/sounds/letters/slash.gsm
+share/asterisk/sounds/letters/space.gsm
+share/asterisk/sounds/letters/t.gsm
+share/asterisk/sounds/letters/u.gsm
+share/asterisk/sounds/letters/v.gsm
+share/asterisk/sounds/letters/w.gsm
+share/asterisk/sounds/letters/x.gsm
+share/asterisk/sounds/letters/y.gsm
+share/asterisk/sounds/letters/z.gsm
+share/asterisk/sounds/letters/zed.gsm
 share/asterisk/sounds/pbx-invalid.gsm
 share/asterisk/sounds/pbx-invalidpark.gsm
 share/asterisk/sounds/pbx-transfer.gsm
+share/asterisk/sounds/phonetic/9_p.gsm
+share/asterisk/sounds/phonetic/a_p.gsm
+share/asterisk/sounds/phonetic/b_p.gsm
+share/asterisk/sounds/phonetic/c_p.gsm
+share/asterisk/sounds/phonetic/d_p.gsm
+share/asterisk/sounds/phonetic/e_p.gsm
+share/asterisk/sounds/phonetic/f_p.gsm
+share/asterisk/sounds/phonetic/g_p.gsm
+share/asterisk/sounds/phonetic/h_p.gsm
+share/asterisk/sounds/phonetic/i_p.gsm
+share/asterisk/sounds/phonetic/j_p.gsm
+share/asterisk/sounds/phonetic/k_p.gsm
+share/asterisk/sounds/phonetic/l_p.gsm
+share/asterisk/sounds/phonetic/m_p.gsm
+share/asterisk/sounds/phonetic/n_p.gsm
+share/asterisk/sounds/phonetic/o_p.gsm
+share/asterisk/sounds/phonetic/p_p.gsm
+share/asterisk/sounds/phonetic/q_p.gsm
+share/asterisk/sounds/phonetic/r_p.gsm
+share/asterisk/sounds/phonetic/s_p.gsm
+share/asterisk/sounds/phonetic/t_p.gsm
+share/asterisk/sounds/phonetic/u_p.gsm
+share/asterisk/sounds/phonetic/v_p.gsm
+share/asterisk/sounds/phonetic/w_p.gsm
+share/asterisk/sounds/phonetic/x_p.gsm
+share/asterisk/sounds/phonetic/y_p.gsm
+share/asterisk/sounds/phonetic/z_p.gsm
 share/asterisk/sounds/privacy-incorrect.gsm
 share/asterisk/sounds/privacy-prompt.gsm
 share/asterisk/sounds/privacy-thankyou.gsm
 share/asterisk/sounds/privacy-unident.gsm
+share/asterisk/sounds/queue-callswaiting.gsm
+share/asterisk/sounds/queue-holdtime.gsm
+share/asterisk/sounds/queue-less-than.gsm
+share/asterisk/sounds/queue-minutes.gsm
+share/asterisk/sounds/queue-seconds.gsm
+share/asterisk/sounds/queue-thankyou.gsm
+share/asterisk/sounds/queue-thereare.gsm
+share/asterisk/sounds/queue-youarenext.gsm
 share/asterisk/sounds/ss-noservice.gsm
 share/asterisk/sounds/transfer.gsm
 share/asterisk/sounds/tt-allbusy.gsm
@@ -387,22 +527,31 @@ share/asterisk/sounds/vm-Friends.gsm
 share/asterisk/sounds/vm-INBOX.gsm
 share/asterisk/sounds/vm-Old.gsm
 share/asterisk/sounds/vm-Work.gsm
+share/asterisk/sounds/vm-advopts.gsm
 share/asterisk/sounds/vm-and.gsm
+share/asterisk/sounds/vm-calldiffnum.gsm
 share/asterisk/sounds/vm-changeto.gsm
 share/asterisk/sounds/vm-delete.gsm
 share/asterisk/sounds/vm-deleted.gsm
+share/asterisk/sounds/vm-dialout.gsm
+share/asterisk/sounds/vm-enter-num-to-call.gsm
 share/asterisk/sounds/vm-extension.gsm
 share/asterisk/sounds/vm-first.gsm
 share/asterisk/sounds/vm-for.gsm
 share/asterisk/sounds/vm-forwardoptions.gsm
+share/asterisk/sounds/vm-from-extension.gsm
+share/asterisk/sounds/vm-from-phonenumber.gsm
+share/asterisk/sounds/vm-from.gsm
 share/asterisk/sounds/vm-goodbye.gsm
 share/asterisk/sounds/vm-helpexit.gsm
 share/asterisk/sounds/vm-incorrect.gsm
+share/asterisk/sounds/vm-incorrect-mailbox.gsm
 share/asterisk/sounds/vm-instructions.gsm
 share/asterisk/sounds/vm-intro.gsm
 share/asterisk/sounds/vm-isonphone.gsm
 share/asterisk/sounds/vm-isunavail.gsm
 share/asterisk/sounds/vm-last.gsm
+share/asterisk/sounds/vm-leavemsg.gsm
 share/asterisk/sounds/vm-login.gsm
 share/asterisk/sounds/vm-mailboxfull.gsm
 share/asterisk/sounds/vm-message.gsm
@@ -414,7 +563,10 @@ share/asterisk/sounds/vm-newpassword.gsm
 share/asterisk/sounds/vm-next.gsm
 share/asterisk/sounds/vm-no.gsm
 share/asterisk/sounds/vm-nobodyavail.gsm
+share/asterisk/sounds/vm-nobox.gsm
 share/asterisk/sounds/vm-nomore.gsm
+share/asterisk/sounds/vm-nonumber.gsm
+share/asterisk/sounds/vm-num-i-have.gsm
 share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-options.gsm
 share/asterisk/sounds/vm-opts.gsm
@@ -422,30 +574,49 @@ share/asterisk/sounds/vm-passchanged.gsm
 share/asterisk/sounds/vm-password.gsm
 share/asterisk/sounds/vm-press.gsm
 share/asterisk/sounds/vm-prev.gsm
+share/asterisk/sounds/vm-reachoper.gsm
 share/asterisk/sounds/vm-rec-busy.gsm
 share/asterisk/sounds/vm-rec-name.gsm
 share/asterisk/sounds/vm-rec-unv.gsm
 share/asterisk/sounds/vm-received.gsm
 share/asterisk/sounds/vm-reenterpassword.gsm
 share/asterisk/sounds/vm-repeat.gsm
+share/asterisk/sounds/vm-review.gsm
 share/asterisk/sounds/vm-saved.gsm
 share/asterisk/sounds/vm-savedto.gsm
 share/asterisk/sounds/vm-savefolder.gsm
 share/asterisk/sounds/vm-savemessage.gsm
 share/asterisk/sounds/vm-sorry.gsm
+share/asterisk/sounds/vm-star-cancel.gsm
+share/asterisk/sounds/vm-starmain.gsm
+share/asterisk/sounds/vm-then-pound.gsm
 share/asterisk/sounds/vm-theperson.gsm
+share/asterisk/sounds/vm-tocallback.gsm
+share/asterisk/sounds/vm-tocallnum.gsm
 share/asterisk/sounds/vm-tocancel.gsm
+share/asterisk/sounds/vm-tocancelmsg.gsm
+share/asterisk/sounds/vm-toenternumber.gsm
 share/asterisk/sounds/vm-toforward.gsm
+share/asterisk/sounds/vm-tohearenv.gsm
+share/asterisk/sounds/vm-tomakecall.gsm
+share/asterisk/sounds/vm-tooshort.gsm
+share/asterisk/sounds/vm-toreply.gsm
+share/asterisk/sounds/vm-torerecord.gsm
 share/asterisk/sounds/vm-undelete.gsm
 share/asterisk/sounds/vm-undeleted.gsm
+share/asterisk/sounds/vm-unknown-caller.gsm
 share/asterisk/sounds/vm-whichbox.gsm
 share/asterisk/sounds/vm-youhave.gsm
 share/asterisk/sounds/voicemail
+@dirrm share/asterisk/sounds/phonetic
+@dirrm share/asterisk/sounds/letters
 @dirrm share/asterisk/sounds/digits
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/mohmp3
 @dirrm share/asterisk/keys
 @dirrm share/asterisk/images
+@dirrm share/asterisk/firmware/iax
+@dirrm share/asterisk/firmware
 @dirrm share/asterisk/agi-bin
 @dirrm share/asterisk
 @dirrm lib/asterisk/modules
@@ -463,6 +634,7 @@ spool/asterisk/voicemail/default/1234/unavail.gsm
 @dirrm spool/asterisk/voicemail/default/1234
 @dirrm spool/asterisk/voicemail/default
 @dirrm spool/asterisk/voicemail
+@dirrm spool/asterisk/tmp
 @dirrm spool/asterisk
 @dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 420c2dcfe4e7..3f24e2ef57a9 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -17,11 +16,13 @@ COMMENT=	An Open Source PBX and telephony toolkit
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
 		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
@@ -35,14 +36,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
-.include <bsd.port.pre.mk>
+MAN8=		asterisk.8
 
-.if defined(WITH_ZAPTEL) || exists(${LOCALBASE}/include/zaptel.h)
-BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-PLIST_SUB=	ZAPTEL=""
-.else
-PLIST_SUB=	ZAPTEL="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo
index a12f4a79e431..d7661cced0c6 100644
--- a/net/asterisk/distinfo
+++ b/net/asterisk/distinfo
@@ -1,2 +1,2 @@
-MD5 (asterisk-0.9.0.tar.gz) = cb0fbb5185fdf2356ee30bdcf4ad9b9c
-SIZE (asterisk-0.9.0.tar.gz) = 2787458
+MD5 (asterisk-1.0.1.tar.gz) = cb55b1a0be8ff6e94179db0cdc7e074d
+SIZE (asterisk-1.0.1.tar.gz) = 9558497
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile
index 94155a666be0..43bf910fe669 100644
--- a/net/asterisk/files/patch-Makefile
+++ b/net/asterisk/files/patch-Makefile
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- Makefile.orig	Thu Apr  1 01:43:10 2004
-+++ Makefile	Wed Apr 14 22:08:43 2004
-@@ -43,10 +43,10 @@
+--- Makefile.orig	Tue Sep 28 20:11:30 2004
++++ Makefile	Thu Oct 14 19:48:30 2004
+@@ -62,10 +62,10 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
  
  #Include debug symbols in the executables (-g) and profiling info (-pg)
 -DEBUG=-g #-pg
 +#DEBUG=-g #-pg
  
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
+ # If you are running a radio application, define RADIO_RELAX so that the DTMF
+ # will be received more reliably
+@@ -90,7 +90,7 @@
  
  # Where to install asterisk after compiling
  # Default -> leave empty
@@ -25,7 +25,7 @@ $FreeBSD$
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -88,28 +88,27 @@
+@@ -110,23 +110,23 @@
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
@@ -44,36 +44,45 @@ $FreeBSD$
 -ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
 -ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
 -ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+-ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 +ASTBINDIR=$(INSTALL_PREFIX)/bin
 +ASTSBINDIR=$(INSTALL_PREFIX)/sbin
 +ASTVARRUNDIR=/var/run
++ASTMANDIR=$(INSTALL_PREFIX)/man
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
- INCLUDE=-Iinclude -I../include 
+ INCLUDE=-Iinclude -I../include
 -CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
- CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ 
+ ifneq ($(PROC),ultrasparc)
+@@ -137,11 +137,8 @@
+ CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
+ 
  ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
+-OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 -INCLUDE+=-I/usr/local/include
+-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 +CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +150,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +178,7 @@
++LIBS+=$(PTHREAD_LIBS)
+ endif # FreeBSD
+ 
+ ifeq (${OSARCH},NetBSD)
+@@ -157,7 +154,7 @@
+ #CFLAGS+=-DOLD_DSP_ROUTINES
+ 
+ CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
++CFLAGS+=-I$(LOCALBASE)/include -DZAPTEL_OPTIMIZATIONS
+ 
+ LIBEDIT=editline/libedit.a
+ 
+@@ -219,7 +216,7 @@
  SOLINK=-shared -Xlinker -x
  endif
  
@@ -82,7 +91,16 @@ $FreeBSD$
  INSTALL=install
  
  _all: all
-@@ -200,13 +199,13 @@
+@@ -231,7 +228,7 @@
+ 	@echo " +               $(MAKE) install                +"  
+ 	@echo " +-------------------------------------------+"  
+ 
+-all: depend asterisk subdirs 
++all: depend asterisk subdirs manpage
+ 
+ editline/config.h:
+ 	cd editline && unset CFLAGS LIBS && ./configure ; \
+@@ -240,13 +237,13 @@
  	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  	$(MAKE) -C editline libedit.a
  
@@ -103,18 +121,35 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
  include .depend
-@@ -244,8 +243,8 @@
+@@ -268,13 +265,10 @@
+ 
+ asterisk.o: asterisk.c build.h
+ 
+-manpage: asterisk.8.gz
++manpage: asterisk.8
+ 
+-asterisk.8.gz: asterisk.sgml
+-	rm -f asterisk.8
+-	docbook2man asterisk.sgml
+-	mv ./*.8 asterisk.8
+-	gzip asterisk.8
++asterisk.8: asterisk.8.gz
++	gzcat asterisk.8.gz > asterisk.8
+ 
+ ifneq ($(strip $(ASTERISKVERSION)),)
+ build.h: .version
+@@ -292,8 +286,8 @@
  		exit 1; \
  	fi
  
 -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+-	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
 +asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
++	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS)
  
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +259,10 @@
+ muted: muted.o
+ 	$(CC) -o muted muted.o
+@@ -312,28 +306,28 @@
  	$(MAKE) -C stdtime clean
  
  datafiles: all
@@ -127,9 +162,31 @@ $FreeBSD$
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -271,18 +270,18 @@
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ 	for x in sounds/letters/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ 	for x in sounds/phonetic/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+@@ -341,18 +335,18 @@
  	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
+ 	for x in 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-*; do \
  		if grep -q "^%`basename $$x`%" sounds.txt; then \
 -			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 +			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
@@ -151,7 +208,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -294,105 +293,74 @@
+@@ -364,111 +358,86 @@
  	fi
  
  bininstall: all
@@ -162,6 +219,7 @@ $FreeBSD$
 -	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
@@ -171,6 +229,7 @@ $FreeBSD$
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
@@ -191,19 +250,34 @@ $FreeBSD$
 -		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
 -	fi
 -	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 -	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
++	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	if [ -d contrib/firmware/iax ]; then \
+-		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ 	else \
+ 		echo "You need to do cvs update -d not just cvs update" ; \
+ 	fi 
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
+-	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -225,13 +299,8 @@ $FreeBSD$
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
@@ -294,8 +363,31 @@ $FreeBSD$
 -		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
  	done
+ 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	:> $(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 ; \
+@@ -483,7 +452,7 @@
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
+ 	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
+-	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk
++	$(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk
+ 	for x in images/*.gif; do \
+ 		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
+ 	done
+@@ -503,10 +472,10 @@
+ 
+ __rpm: _version
+ 	rm -rf /tmp/asterisk ; \
+-	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++	$(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
+-	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++	$(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+ 	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
+ 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
diff --git a/net/asterisk/files/patch-agi::Makefile b/net/asterisk/files/patch-agi::Makefile
index 567c30f5624e..32efb5d2b101 100644
--- a/net/asterisk/files/patch-agi::Makefile
+++ b/net/asterisk/files/patch-agi::Makefile
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
+--- agi/Makefile.orig	Tue Jun 22 20:42:13 2004
++++ agi/Makefile	Tue Oct  5 21:03:40 2004
+@@ -11,15 +11,18 @@
  # the GNU General Public License
  #
  
@@ -24,12 +24,4 @@ $FreeBSD$
 +	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
  
  eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
+ 	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
diff --git a/net/asterisk/files/patch-apps::Makefile b/net/asterisk/files/patch-apps::Makefile
index 901ba694c33a..00b77dfe2434 100644
--- a/net/asterisk/files/patch-apps::Makefile
+++ b/net/asterisk/files/patch-apps::Makefile
@@ -1,22 +1,24 @@
 
 $FreeBSD$
 
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
+--- apps/Makefile.orig	Sat Sep 25 00:32:56 2004
++++ apps/Makefile	Sun Oct 10 16:20:06 2004
+@@ -40,7 +40,7 @@
+ #APPS+=app_rpt.so
+ 
+ APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+-APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
++APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+ APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+ 
+ CFLAGS+=-fPIC
+@@ -65,12 +65,12 @@
  	$(CC) $(SOLINK) -o $@ $< -ltonezone
  
  install: all
 -	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
  
  app_voicemail.so : app_voicemail.o
  ifeq ($(USE_MYSQL_VM_INTERFACE),1)
@@ -25,11 +27,22 @@ $FreeBSD$
  else
  ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
  	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
+@@ -80,16 +80,16 @@
+ endif
+ 
+ app_sql_postgres.o: app_sql_postgres.c
+-	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
++	$(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ 
+ app_sql_postgres.so: app_sql_postgres.o
+-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/pgsql/lib -lpq
++	$(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq
+ 
+ app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ $< -lodbc
  
  look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
+-	$(CC) -pipe -O6 -g look.c -o look -lncurses
 +	$(CC) $(CFLAGS) look.c -o look -lncurses
  
  ifneq ($(wildcard .depend),)
diff --git a/net/asterisk/files/patch-apps::app_intercom.c b/net/asterisk/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk/files/patch-astman::Makefile b/net/asterisk/files/patch-astman::Makefile
index cf31005257cf..2745860cdd36 100644
--- a/net/asterisk/files/patch-astman::Makefile
+++ b/net/asterisk/files/patch-astman::Makefile
@@ -1,9 +1,20 @@
 
 $FreeBSD$
 
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
+--- astman/Makefile.orig	Sat Jun 26 22:25:39 2004
++++ astman/Makefile	Thu Oct 14 19:14:22 2004
+@@ -5,16 +5,16 @@
+ 
+ OSARCH=$(shell uname -s)
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS+=-I/usr/local/include -L/usr/local/lib
++CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib
+ endif
+ 
+-TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi)
++TARGET=astman
+ all: depend $(TARGET)
+ 
  install:
  	if [ "$(TARGET)" != "none" ]; then \
  		for x in $(TARGET); do \
diff --git a/net/asterisk/files/patch-cdr::Makefile b/net/asterisk/files/patch-cdr::Makefile
index 2ede608f9019..f646d2c9a3dc 100644
--- a/net/asterisk/files/patch-cdr::Makefile
+++ b/net/asterisk/files/patch-cdr::Makefile
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
+--- cdr/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ cdr/Makefile	Thu Oct 14 19:13:38 2004
+@@ -21,7 +21,7 @@
+ OSARCH=$(shell uname -s)
+ 
+ ifeq (${OSARCH},FreeBSD)
+-SOLINK+=-L/usr/local/lib
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+@@ -71,7 +71,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk/files/patch-channels::Makefile b/net/asterisk/files/patch-channels::Makefile
index fd855e7a2710..98caab3a33d6 100644
--- a/net/asterisk/files/patch-channels::Makefile
+++ b/net/asterisk/files/patch-channels::Makefile
@@ -1,53 +1,62 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Thu Mar 25 11:43:36 2004
-+++ channels/Makefile	Thu Apr 29 14:36:36 2004
-@@ -33,12 +33,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
+--- channels/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ channels/Makefile	Sun Oct 10 16:18:05 2004
+@@ -57,10 +57,10 @@
+ 
+ endif
+ ifeq (${OSARCH},FreeBSD)
+-PTLIB=-lpt_FreeBSD_x86_r
+-H323LIB=-lh323_FreeBSD_x86_r
+-CHANH323LIB=-pthread
+-SOLINK+=-L/usr/local/lib
++PTLIB=-lpt_FreeBSD_x86_r_s
++H323LIB=-lh323_FreeBSD_x86_r_s
++CHANH323LIB=
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ ifeq (${OSARCH},NetBSD)
+ PTLIB=-lpt_NetBSD_x86_r
+@@ -72,8 +72,8 @@
+ endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so)
 +CHANNEL_LIBS+=chan_h323.so
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -48,7 +46,7 @@
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+@@ -84,7 +84,7 @@
  ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 +CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
  CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
  
-@@ -69,7 +67,7 @@
- 
+@@ -107,7 +107,7 @@
  ZAPDIR=/usr/lib
  
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so")
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
  
-@@ -110,10 +108,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
+@@ -156,6 +156,8 @@
  chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
+ 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+ endif
++chan_oss.so: chan_oss.o
 +	$(CC) $(SOLINK) -o $@ chan_oss.o
  
- chan_iax2.so: chan_iax2.o iax2-parser.o
+ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -133,7 +129,7 @@
+@@ -175,7 +177,7 @@
  	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
  
  chan_zap.so: chan_zap.o
@@ -55,15 +64,15 @@ $FreeBSD$
 +	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone
  
  chan_sip.so: chan_sip.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -157,16 +153,17 @@
+ ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+@@ -199,15 +201,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
+-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(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
++	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
@@ -73,8 +82,7 @@ $FreeBSD$
  
  install: all
 -	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 +	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
+ 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
  
  depend: .depend
- 
diff --git a/net/asterisk/files/patch-channels::chan_h323.c b/net/asterisk/files/patch-channels::chan_h323.c
index e413bd8ecec8..de2ed3978663 100644
--- a/net/asterisk/files/patch-channels::chan_h323.c
+++ b/net/asterisk/files/patch-channels::chan_h323.c
@@ -1,13 +1,14 @@
 
 $FreeBSD$
 
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
+--- channels/chan_h323.c	2004/10/10 13:00:17	1.1
++++ channels/chan_h323.c	2004/10/10 13:00:39
+@@ -26,7 +26,7 @@
+  * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $
+  */
  
+-
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
diff --git a/net/asterisk/files/patch-channels::chan_iax2.c b/net/asterisk/files/patch-channels::chan_iax2.c
deleted file mode 100644
index 9127bee41cb6..000000000000
--- a/net/asterisk/files/patch-channels::chan_iax2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_iax2.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_iax2.c	2004/04/29 21:37:10
-@@ -52,7 +52,7 @@
- #include <sys/stat.h>
- #ifdef IAX_TRUNKING
- #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #endif
- #ifdef MYSQL_FRIENDS
- #include <mysql/mysql.h>
diff --git a/net/asterisk/files/patch-channels::chan_oss.c b/net/asterisk/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk/files/patch-channels::chan_sip.c b/net/asterisk/files/patch-channels::chan_sip.c
index b98f9d185009..521d6a46d256 100644
--- a/net/asterisk/files/patch-channels::chan_sip.c
+++ b/net/asterisk/files/patch-channels::chan_sip.c
@@ -1,26 +1,26 @@
 
 $FreeBSD$
 
---- channels/chan_sip.c.orig	Wed Jan 14 08:10:53 2004
-+++ channels/chan_sip.c	Fri Jan 30 01:47:34 2004
-@@ -124,7 +124,7 @@
- static int restart_monitor(void);
+--- channels/chan_sip.c.orig
++++ channels/chan_sip.c
+@@ -139,7 +139,7 @@
  
- /* Codecs that we support by default: */
--static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
-+static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263 | AST_FORMAT_G723_1 | AST_FORMAT_G729A;
- static int noncodeccapability = AST_RTP_DTMF;
+ static char default_language[MAX_LANGUAGE] = "";
  
- static char ourhost[256];
-@@ -176,6 +176,7 @@
+-static char default_callerid[AST_MAX_EXTENSION] = "asterisk";
++static char default_callerid[AST_MAX_EXTENSION] = "Unknown";
+ 
+ static char default_fromdomain[AST_MAX_EXTENSION] = "";
+ 
+@@ -244,6 +244,7 @@
  struct sip_route {
  	struct sip_route *next;
  	char hop[0];
 +	int lr;
  };
  
- static struct sip_pvt {
-@@ -3417,6 +3418,10 @@
+ struct sip_history {
+@@ -4573,6 +4574,10 @@
  			/* Make a struct route */
  			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
  			if (thishop) {
@@ -28,17 +28,17 @@ $FreeBSD$
 +					thishop->lr = 1;
 +				else
 +					thishop->lr = 0;
- 				strncpy(thishop->hop, rr, len);
+ 				strncpy(thishop->hop, rr, len); /* safe */
  				thishop->hop[len] = '\0';
  				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
-@@ -3440,31 +3445,41 @@
+@@ -4596,31 +4601,41 @@
  			rr += len+1;
  		}
  	}
 -	/* 2nd append the Contact: if there is one */
 -	/* Can be multiple Contact headers, comma separated values - we just take the first */
 -	contact = get_header(req, "Contact");
--	if (strlen(contact)) {
+-	if (!ast_strlen_zero(contact)) {
 -		ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 -		/* Look for <: delimited address */
 -		c = strchr(contact, '<');
@@ -55,7 +55,7 @@ $FreeBSD$
 +	if (head && head->lr) {
 +		thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1);
  		if (thishop) {
--			strncpy(thishop->hop, c, len);
+-			strncpy(thishop->hop, c, len); /* safe */
 -			thishop->hop[len] = '\0';
 -			thishop->next = NULL;
 -			/* Goes at the end */
@@ -71,7 +71,7 @@ $FreeBSD$
 +		/* Append the Contact: if there is one and first route is w/o `lr' param */
 +		/* Can be multiple Contact headers, comma separated values - we just take the first */
 +		contact = get_header(req, "Contact");
-+		if (strlen(contact)) {
++		if (!ast_strlen_zero(contact)) {
 +			ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 +			/* Look for <: delimited address */
 +			c = strchr(contact, '<');
@@ -85,7 +85,7 @@ $FreeBSD$
 +			}
 +			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
 +			if (thishop) {
-+				strncpy(thishop->hop, c, len);
++				strncpy(thishop->hop, c, len); /* safe */
 +				thishop->hop[len] = '\0';
 +				thishop->next = NULL;
 +				/* Goes at the end */
@@ -97,7 +97,7 @@ $FreeBSD$
  		}
  	}
  	/* Store as new route */
-@@ -5143,7 +5158,11 @@
+@@ -7197,7 +7212,11 @@
  			/* Get destination right away */
  			gotdest = get_destination(p, NULL);
  			get_rdnis(p, NULL);
@@ -110,8 +110,8 @@ $FreeBSD$
  			build_contact(p);
  
  			if (gotdest) {
-@@ -5165,7 +5184,6 @@
- 				c = sip_new(p, AST_STATE_DOWN, strlen(p->username) ? p->username : NULL);
+@@ -7225,7 +7244,6 @@
+ 				c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
  				*recount = 1;
  				/* Save Record-Route for any later requests we make on this dialogue */
 -				build_route(p, req, 0);
diff --git a/net/asterisk/files/patch-channels::chan_zap.c b/net/asterisk/files/patch-channels::chan_zap.c
index e5a3ffc6afec..965a643bb687 100644
--- a/net/asterisk/files/patch-channels::chan_zap.c
+++ b/net/asterisk/files/patch-channels::chan_zap.c
@@ -1,14 +1,15 @@
 
 $FreeBSD$
 
---- channels/chan_zap.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_zap.c	2004/04/29 21:37:17
-@@ -45,7 +45,7 @@
+--- channels/chan_zap.c
++++ channels/chan_zap.c
+@@ -42,7 +42,9 @@
+ #include <sys/signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifndef __FreeBSD__
  #include <stdint.h>
++#endif
  #include <unistd.h>
  #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #include <math.h>
- #include <tonezone.h>
- #include <ctype.h>
+ #ifdef __linux__
diff --git a/net/asterisk/files/patch-channels::h323::Makefile b/net/asterisk/files/patch-channels::h323::Makefile
index a9159b4441c1..bc34083e2ff3 100644
--- a/net/asterisk/files/patch-channels::h323::Makefile
+++ b/net/asterisk/files/patch-channels::h323::Makefile
@@ -1,64 +1,38 @@
 
 $FreeBSD$
 
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+--- channels/h323/Makefile.orig	Tue Aug 31 16:32:11 2004
++++ channels/h323/Makefile	Sun Oct 10 15:25:42 2004
+@@ -53,7 +53,7 @@
+ LIBS+=-lpthread
+ endif
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS += -pthread
++CFLAGS += $(PTHREAD_LIBS)
+ endif
+ CFLAGS += -D_REENTRANT -D_GNU_SOURCE
  CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
+@@ -74,19 +74,19 @@
   
  
  ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
+-	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
++	$(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $<
  
  libchanh323.a:	ast_h323.o
  	ar cr libchanh323.a ast_h323.o
  
  chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB)
  
  chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)     -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB)
  
  chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
+-	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB)
  clean:
  	rm -f *.o *.so core.* libchanh323.a
  
diff --git a/net/asterisk/files/patch-codecs::Makefile b/net/asterisk/files/patch-codecs::Makefile
index b802dc1233e8..de9aff4c34fe 100644
--- a/net/asterisk/files/patch-codecs::Makefile
+++ b/net/asterisk/files/patch-codecs::Makefile
@@ -1,22 +1,23 @@
 
 $FreeBSD$
 
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
+--- codecs/Makefile.orig	Mon Jul 19 18:52:57 2004
++++ codecs/Makefile	Sun Oct 10 15:28:35 2004
+@@ -17,23 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+-MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
 +MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
++MODILBC=codec_ilbc.so
+ CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
++CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
  LIBG723B=g723.1b/libg723b.a
@@ -30,11 +31,11 @@ $FreeBSD$
  
 -CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
 +CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
+         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
+ 	codec_g726.so
  
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
+@@ -91,7 +91,7 @@
+ endif
  
  install: all
 -	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
diff --git a/net/asterisk/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk/files/patch-codecs::codec_g723_1_dummy.c
index 661ff2d88602..3ce9571013ec 100644
--- a/net/asterisk/files/patch-codecs::codec_g723_1_dummy.c
+++ b/net/asterisk/files/patch-codecs::codec_g723_1_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g723_1_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g723_1_dummy.c	Sun Oct 10 16:07:05 2004
 @@ -0,0 +1,308 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -44,7 +44,7 @@ $FreeBSD$
 +#include "slin_g723_ex.h"
 +#include "g723_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
diff --git a/net/asterisk/files/patch-codecs::codec_g729_dummy.c b/net/asterisk/files/patch-codecs::codec_g729_dummy.c
index c3e27d98e27e..9fcc7b19ca35 100644
--- a/net/asterisk/files/patch-codecs::codec_g729_dummy.c
+++ b/net/asterisk/files/patch-codecs::codec_g729_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g729_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g729_dummy.c	Sun Oct 10 16:07:12 2004
 @@ -0,0 +1,275 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -38,7 +38,7 @@ $FreeBSD$
 +#include "slin_g729_ex.h"
 +#include "g729_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
diff --git a/net/asterisk/files/patch-codecs::gsm::Makefile b/net/asterisk/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk/files/patch-codecs::lpc10::Makefile b/net/asterisk/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 1674119a4836..000000000000
--- a/net/asterisk/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Mon Mar 15 18:52:28 2004
-+++ codecs/lpc10/Makefile	Wed Apr 14 22:13:47 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,7 +22,7 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors and ALPHA too
-@@ -30,7 +30,7 @@
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
- ifneq ($(PROC),alpha)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+=
- endif
- endif
- endif
diff --git a/net/asterisk/files/patch-db.c b/net/asterisk/files/patch-db.c
index 59e5cef87770..6c2bdcd443c8 100644
--- a/net/asterisk/files/patch-db.c
+++ b/net/asterisk/files/patch-db.c
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
+--- db.c.orig	Fri Jul  9 13:08:09 2004
++++ db.c	Sun Oct 10 15:32:33 2004
+@@ -33,7 +33,7 @@
  #include <asterisk/cli.h>
+ #include <asterisk/utils.h>
+ #include <asterisk/lock.h>
 -#include "db1-ast/include/db.h"
 +#include <db.h>
  #include "asterisk.h"
diff --git a/net/asterisk/files/patch-formats::format_g723_1.c b/net/asterisk/files/patch-formats::format_g723_1.c
index 8d0755e14205..fb5eb12833dc 100644
--- a/net/asterisk/files/patch-formats::format_g723_1.c
+++ b/net/asterisk/files/patch-formats::format_g723_1.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
+--- formats/format_g723_1.c.orig	Sun Oct 10 15:59:18 2004
++++ formats/format_g723_1.c	Sun Oct 10 16:05:05 2004
 @@ -0,0 +1,345 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -57,7 +57,7 @@ $FreeBSD$
 +
 +static long g723_tell(struct ast_filestream *);
 +
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(g723_lock);
 +static int glistcnt = 0;
 +
 +static char *name = "g723";
diff --git a/net/asterisk/files/patch-include::asterisk::utils.h b/net/asterisk/files/patch-include::asterisk::utils.h
new file mode 100644
index 000000000000..a06f7d065c84
--- /dev/null
+++ b/net/asterisk/files/patch-include::asterisk::utils.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- include/asterisk/utils.h	2004/10/10 12:55:50	1.1
++++ include/asterisk/utils.h	2004/10/10 12:56:43
+@@ -37,7 +37,6 @@
+ #ifdef inet_ntoa
+ #undef inet_ntoa
+ #endif
+-#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
+ 
+ #ifdef LINUX
+ #define ast_pthread_create pthread_create
diff --git a/net/asterisk/files/patch-res::Makefile b/net/asterisk/files/patch-res::Makefile
index ccd0a35dd59d..5700f04ea1ef 100644
--- a/net/asterisk/files/patch-res::Makefile
+++ b/net/asterisk/files/patch-res::Makefile
@@ -1,12 +1,21 @@
 
 $FreeBSD$
 
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
+--- res/Makefile.orig	Sat Jul 17 23:58:01 2004
++++ res/Makefile	Thu Oct 14 19:15:00 2004
+@@ -21,7 +21,7 @@
  
- install: all
+ CFLAGS+=
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
++CFLAGS+=-DZAPATA_MOH -I$(LOCALBASE)/include
+ #
+ # Work around buggy RedHat 9.0
+ #
+@@ -34,7 +34,7 @@
+ 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
 -	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
  
diff --git a/net/asterisk/files/patch-rtp.c b/net/asterisk/files/patch-rtp.c
index 11767dca198f..06289f357208 100644
--- a/net/asterisk/files/patch-rtp.c
+++ b/net/asterisk/files/patch-rtp.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- rtp.c.orig	Tue Nov 25 23:15:28 2003
-+++ rtp.c	Fri Jan 30 01:47:34 2004
-@@ -114,7 +114,7 @@
+--- rtp.c.orig	Sat Sep 18 16:56:28 2004
++++ rtp.c	Sun Oct 10 15:57:22 2004
+@@ -127,7 +127,7 @@
  {
  	switch(buf & TYPE_MASK) {
  	case TYPE_DONTSEND:
@@ -12,31 +12,15 @@ $FreeBSD$
  		break;
  	case TYPE_SILENCE:
  		return 4;
-@@ -1028,19 +1028,6 @@
- 		while((f = ast_smoother_read(rtp->smoother)))
- 			ast_rtp_raw_write(rtp, f, codec);
- 		break;
--	case AST_FORMAT_G729A:
--		if (!rtp->smoother) {
--			rtp->smoother = ast_smoother_new(20);
--		}
--		if (!rtp->smoother) {
--			ast_log(LOG_WARNING, "Unable to create g729 smoother :(\n");
--			return -1;
--		}
--		ast_smoother_feed(rtp->smoother, _f);
--		
--		while((f = ast_smoother_read(rtp->smoother)))
--			ast_rtp_raw_write(rtp, f, codec);
--		break;
- 	case AST_FORMAT_GSM:
- 		if (!rtp->smoother) {
- 			rtp->smoother = ast_smoother_new(33);
-@@ -1071,6 +1058,7 @@
- 	case AST_FORMAT_H261:
- 	case AST_FORMAT_H263:
- 	case AST_FORMAT_G723_1:
-+	case AST_FORMAT_G729A:
- 	case AST_FORMAT_SPEEX:
- 	        // Don't buffer outgoing frames; send them one-per-packet:
- 		if (_f->offset < hdrlen) {
+@@ -841,8 +841,10 @@
+ 		/* Must be an even port number by RTP spec */
+ 		rtp->us.sin_port = htons(x);
+ 		rtp->us.sin_addr = addr;
+-		if (rtp->rtcp)
++		if (rtp->rtcp) {
+ 			rtp->rtcp->us.sin_port = htons(x + 1);
++			rtp->rtcp->us.sin_addr = addr;
++		}
+ 		if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
+ 			(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
+ 			break;
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
index eb427fa04447..f1519b3f3a39 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/pkg-plist
@@ -7,6 +7,9 @@ etc/asterisk/adtranvofr.conf-dist
 @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
 etc/asterisk/agents.conf-dist
 @exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
+@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
+etc/asterisk/alarmreceiver.conf-dist
+@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf
 @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
 etc/asterisk/alsa.conf-dist
 @exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
@@ -16,18 +19,30 @@ etc/asterisk/asterisk.adsi-dist
 @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
 etc/asterisk/asterisk.conf-dist
 @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
+etc/asterisk/cdr_manager.conf-dist
+@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
 etc/asterisk/cdr_odbc.conf-dist
 @exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
 etc/asterisk/cdr_pgsql.conf-dist
 @exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
+etc/asterisk/cdr_tds.conf-dist
+@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf
 @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
 etc/asterisk/enum.conf-dist
 @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
+@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
+etc/asterisk/extconfig.conf-dist
+@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf
 @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
 etc/asterisk/extensions.conf-dist
 @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
+@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
+etc/asterisk/features.conf-dist
+@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
@@ -37,6 +52,9 @@ etc/asterisk/h323.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
+@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
+etc/asterisk/iaxprov.conf-dist
+@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf
 @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
 etc/asterisk/indications.conf-dist
 @exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
@@ -61,12 +79,12 @@ etc/asterisk/modules.conf-dist
 @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
 etc/asterisk/musiconhold.conf-dist
 @exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
+@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
+etc/asterisk/osp.conf-dist
+@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf
 @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
 etc/asterisk/oss.conf-dist
 @exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
 @unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
 etc/asterisk/phone.conf-dist
 @exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
@@ -76,6 +94,12 @@ etc/asterisk/privacy.conf-dist
 @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
 etc/asterisk/queues.conf-dist
 @exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
+@unexec if cmp -s %D/etc/asterisk/res_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi
+etc/asterisk/res_config_odbc.conf-dist
+@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.conf
+@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
+etc/asterisk/res_odbc.conf-dist
+@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
 etc/asterisk/rpt.conf-dist
 @exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
@@ -103,11 +127,13 @@ etc/asterisk/zapata.conf-dist
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
+include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/app.h
 include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
+include/asterisk/astosp.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
@@ -116,12 +142,14 @@ include/asterisk/channel_pvt.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/config.h
+include/asterisk/config_pvt.h
 include/asterisk/crypto.h
 include/asterisk/cvsid.h
 include/asterisk/dlfcn-compat.h
 include/asterisk/dns.h
 include/asterisk/dsp.h
 include/asterisk/enum.h
+include/asterisk/features.h
 include/asterisk/file.h
 include/asterisk/frame.h
 include/asterisk/fskmodem.h
@@ -138,10 +166,10 @@ include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
 include/asterisk/options.h
-include/asterisk/parking.h
 include/asterisk/pbx.h
 include/asterisk/poll-compat.h
 include/asterisk/privacy.h
+include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -150,30 +178,39 @@ include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/translate.h
 include/asterisk/ulaw.h
+include/asterisk/utils.h
 include/asterisk/vmodem.h
 lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
+lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
+lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
 lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_enumlookup.so
+lib/asterisk/modules/app_eval.so
+lib/asterisk/modules/app_exec.so
 lib/asterisk/modules/app_festival.so
+lib/asterisk/modules/app_flash.so
+lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
+lib/asterisk/modules/app_groupcount.so
 lib/asterisk/modules/app_hasnewvoicemail.so
+lib/asterisk/modules/app_ices.so
 lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_intercom.so
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+lib/asterisk/modules/app_meetme.so
 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_playback.so
 lib/asterisk/modules/app_privacy.so
@@ -184,20 +221,31 @@ lib/asterisk/modules/app_read.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
+lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so
 lib/asterisk/modules/app_setcdruserfield.so
 lib/asterisk/modules/app_setcidname.so
 lib/asterisk/modules/app_setcidnum.so
+lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_striplsd.so
 lib/asterisk/modules/app_substring.so
 lib/asterisk/modules/app_system.so
+lib/asterisk/modules/app_talkdetect.so
+lib/asterisk/modules/app_test.so
 lib/asterisk/modules/app_transfer.so
+lib/asterisk/modules/app_txtcidname.so
 lib/asterisk/modules/app_url.so
+lib/asterisk/modules/app_userevent.so
+lib/asterisk/modules/app_verbose.so
 lib/asterisk/modules/app_voicemail.so
 lib/asterisk/modules/app_waitforring.so
 lib/asterisk/modules/app_zapateller.so
+lib/asterisk/modules/app_zapbarge.so
+lib/asterisk/modules/app_zapras.so
+lib/asterisk/modules/app_zapscan.so
 lib/asterisk/modules/cdr_csv.so
+lib/asterisk/modules/cdr_manager.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax2.so
@@ -210,11 +258,12 @@ lib/asterisk/modules/chan_modem_i4l.so
 lib/asterisk/modules/chan_oss.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
-%%ZAPTEL%%lib/asterisk/modules/chan_zap.so
+lib/asterisk/modules/chan_zap.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g723_1_dummy.so
+lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_g729_dummy.so
 lib/asterisk/modules/codec_gsm.so
 lib/asterisk/modules/codec_ilbc.so
@@ -222,12 +271,15 @@ lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723_1.so
+lib/asterisk/modules/format_g726.so
 lib/asterisk/modules/format_g729.so
 lib/asterisk/modules/format_gsm.so
 lib/asterisk/modules/format_h263.so
+lib/asterisk/modules/format_ilbc.so
 lib/asterisk/modules/format_jpeg.so
 lib/asterisk/modules/format_pcm.so
 lib/asterisk/modules/format_pcm_alaw.so
+lib/asterisk/modules/format_sln.so
 lib/asterisk/modules/format_vox.so
 lib/asterisk/modules/format_wav.so
 lib/asterisk/modules/format_wav_gsm.so
@@ -235,20 +287,25 @@ lib/asterisk/modules/pbx_config.so
 lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/pbx_wilcalu.so
 lib/asterisk/modules/res_adsi.so
+lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_features.so
 lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
 sbin/asterisk
 sbin/astgenkey
 sbin/safe_asterisk
 share/asterisk/agi-bin/agi-test.agi
 share/asterisk/agi-bin/eagi-sphinx-test
 share/asterisk/agi-bin/eagi-test
+share/asterisk/firmware/iax/iaxy.bin
 share/asterisk/images/asterisk-intro.jpg
+share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
+share/asterisk/mohmp3/fpm-calm-river.mp3
+share/asterisk/mohmp3/fpm-sunshine.mp3
+share/asterisk/mohmp3/fpm-world-mix.mp3
 share/asterisk/sounds/agent-alreadyon.gsm
 share/asterisk/sounds/agent-incorrect.gsm
 share/asterisk/sounds/agent-loggedoff.gsm
@@ -259,12 +316,23 @@ share/asterisk/sounds/agent-user.gsm
 share/asterisk/sounds/auth-incorrect.gsm
 share/asterisk/sounds/auth-thankyou.gsm
 share/asterisk/sounds/beep.gsm
+share/asterisk/sounds/conf-adminmenu.gsm
+share/asterisk/sounds/conf-enteringno.gsm
+share/asterisk/sounds/conf-errormenu.gsm
 share/asterisk/sounds/conf-getchannel.gsm
 share/asterisk/sounds/conf-getconfno.gsm
 share/asterisk/sounds/conf-getpin.gsm
 share/asterisk/sounds/conf-invalid.gsm
 share/asterisk/sounds/conf-invalidpin.gsm
+share/asterisk/sounds/conf-kicked.gsm
+share/asterisk/sounds/conf-locked.gsm
+share/asterisk/sounds/conf-lockednow.gsm
+share/asterisk/sounds/conf-muted.gsm
+share/asterisk/sounds/conf-noempty.gsm
 share/asterisk/sounds/conf-onlyperson.gsm
+share/asterisk/sounds/conf-unlockednow.gsm
+share/asterisk/sounds/conf-unmuted.gsm
+share/asterisk/sounds/conf-usermenu.gsm
 share/asterisk/sounds/demo-abouttotry.gsm
 share/asterisk/sounds/demo-congrats.gsm
 share/asterisk/sounds/demo-echodone.gsm
@@ -359,16 +427,88 @@ share/asterisk/sounds/digits/tomorrow.gsm
 share/asterisk/sounds/digits/yesterday.gsm
 share/asterisk/sounds/dir-instr.gsm
 share/asterisk/sounds/dir-intro.gsm
+share/asterisk/sounds/dir-intro-fn.gsm
 share/asterisk/sounds/dir-nomatch.gsm
 share/asterisk/sounds/dir-nomore.gsm
 share/asterisk/sounds/invalid.gsm
+share/asterisk/sounds/letters/a.gsm
+share/asterisk/sounds/letters/at.gsm
+share/asterisk/sounds/letters/b.gsm
+share/asterisk/sounds/letters/c.gsm
+share/asterisk/sounds/letters/d.gsm
+share/asterisk/sounds/letters/dash.gsm
+share/asterisk/sounds/letters/dollar.gsm
+share/asterisk/sounds/letters/dot.gsm
+share/asterisk/sounds/letters/e.gsm
+share/asterisk/sounds/letters/equals.gsm
+share/asterisk/sounds/letters/exclaimation-point.gsm
+share/asterisk/sounds/letters/f.gsm
+share/asterisk/sounds/letters/g.gsm
+share/asterisk/sounds/letters/h.gsm
+share/asterisk/sounds/letters/i.gsm
+share/asterisk/sounds/letters/j.gsm
+share/asterisk/sounds/letters/k.gsm
+share/asterisk/sounds/letters/l.gsm
+share/asterisk/sounds/letters/m.gsm
+share/asterisk/sounds/letters/n.gsm
+share/asterisk/sounds/letters/o.gsm
+share/asterisk/sounds/letters/p.gsm
+share/asterisk/sounds/letters/plus.gsm
+share/asterisk/sounds/letters/q.gsm
+share/asterisk/sounds/letters/r.gsm
+share/asterisk/sounds/letters/s.gsm
+share/asterisk/sounds/letters/slash.gsm
+share/asterisk/sounds/letters/space.gsm
+share/asterisk/sounds/letters/t.gsm
+share/asterisk/sounds/letters/u.gsm
+share/asterisk/sounds/letters/v.gsm
+share/asterisk/sounds/letters/w.gsm
+share/asterisk/sounds/letters/x.gsm
+share/asterisk/sounds/letters/y.gsm
+share/asterisk/sounds/letters/z.gsm
+share/asterisk/sounds/letters/zed.gsm
 share/asterisk/sounds/pbx-invalid.gsm
 share/asterisk/sounds/pbx-invalidpark.gsm
 share/asterisk/sounds/pbx-transfer.gsm
+share/asterisk/sounds/phonetic/9_p.gsm
+share/asterisk/sounds/phonetic/a_p.gsm
+share/asterisk/sounds/phonetic/b_p.gsm
+share/asterisk/sounds/phonetic/c_p.gsm
+share/asterisk/sounds/phonetic/d_p.gsm
+share/asterisk/sounds/phonetic/e_p.gsm
+share/asterisk/sounds/phonetic/f_p.gsm
+share/asterisk/sounds/phonetic/g_p.gsm
+share/asterisk/sounds/phonetic/h_p.gsm
+share/asterisk/sounds/phonetic/i_p.gsm
+share/asterisk/sounds/phonetic/j_p.gsm
+share/asterisk/sounds/phonetic/k_p.gsm
+share/asterisk/sounds/phonetic/l_p.gsm
+share/asterisk/sounds/phonetic/m_p.gsm
+share/asterisk/sounds/phonetic/n_p.gsm
+share/asterisk/sounds/phonetic/o_p.gsm
+share/asterisk/sounds/phonetic/p_p.gsm
+share/asterisk/sounds/phonetic/q_p.gsm
+share/asterisk/sounds/phonetic/r_p.gsm
+share/asterisk/sounds/phonetic/s_p.gsm
+share/asterisk/sounds/phonetic/t_p.gsm
+share/asterisk/sounds/phonetic/u_p.gsm
+share/asterisk/sounds/phonetic/v_p.gsm
+share/asterisk/sounds/phonetic/w_p.gsm
+share/asterisk/sounds/phonetic/x_p.gsm
+share/asterisk/sounds/phonetic/y_p.gsm
+share/asterisk/sounds/phonetic/z_p.gsm
 share/asterisk/sounds/privacy-incorrect.gsm
 share/asterisk/sounds/privacy-prompt.gsm
 share/asterisk/sounds/privacy-thankyou.gsm
 share/asterisk/sounds/privacy-unident.gsm
+share/asterisk/sounds/queue-callswaiting.gsm
+share/asterisk/sounds/queue-holdtime.gsm
+share/asterisk/sounds/queue-less-than.gsm
+share/asterisk/sounds/queue-minutes.gsm
+share/asterisk/sounds/queue-seconds.gsm
+share/asterisk/sounds/queue-thankyou.gsm
+share/asterisk/sounds/queue-thereare.gsm
+share/asterisk/sounds/queue-youarenext.gsm
 share/asterisk/sounds/ss-noservice.gsm
 share/asterisk/sounds/transfer.gsm
 share/asterisk/sounds/tt-allbusy.gsm
@@ -387,22 +527,31 @@ share/asterisk/sounds/vm-Friends.gsm
 share/asterisk/sounds/vm-INBOX.gsm
 share/asterisk/sounds/vm-Old.gsm
 share/asterisk/sounds/vm-Work.gsm
+share/asterisk/sounds/vm-advopts.gsm
 share/asterisk/sounds/vm-and.gsm
+share/asterisk/sounds/vm-calldiffnum.gsm
 share/asterisk/sounds/vm-changeto.gsm
 share/asterisk/sounds/vm-delete.gsm
 share/asterisk/sounds/vm-deleted.gsm
+share/asterisk/sounds/vm-dialout.gsm
+share/asterisk/sounds/vm-enter-num-to-call.gsm
 share/asterisk/sounds/vm-extension.gsm
 share/asterisk/sounds/vm-first.gsm
 share/asterisk/sounds/vm-for.gsm
 share/asterisk/sounds/vm-forwardoptions.gsm
+share/asterisk/sounds/vm-from-extension.gsm
+share/asterisk/sounds/vm-from-phonenumber.gsm
+share/asterisk/sounds/vm-from.gsm
 share/asterisk/sounds/vm-goodbye.gsm
 share/asterisk/sounds/vm-helpexit.gsm
 share/asterisk/sounds/vm-incorrect.gsm
+share/asterisk/sounds/vm-incorrect-mailbox.gsm
 share/asterisk/sounds/vm-instructions.gsm
 share/asterisk/sounds/vm-intro.gsm
 share/asterisk/sounds/vm-isonphone.gsm
 share/asterisk/sounds/vm-isunavail.gsm
 share/asterisk/sounds/vm-last.gsm
+share/asterisk/sounds/vm-leavemsg.gsm
 share/asterisk/sounds/vm-login.gsm
 share/asterisk/sounds/vm-mailboxfull.gsm
 share/asterisk/sounds/vm-message.gsm
@@ -414,7 +563,10 @@ share/asterisk/sounds/vm-newpassword.gsm
 share/asterisk/sounds/vm-next.gsm
 share/asterisk/sounds/vm-no.gsm
 share/asterisk/sounds/vm-nobodyavail.gsm
+share/asterisk/sounds/vm-nobox.gsm
 share/asterisk/sounds/vm-nomore.gsm
+share/asterisk/sounds/vm-nonumber.gsm
+share/asterisk/sounds/vm-num-i-have.gsm
 share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-options.gsm
 share/asterisk/sounds/vm-opts.gsm
@@ -422,30 +574,49 @@ share/asterisk/sounds/vm-passchanged.gsm
 share/asterisk/sounds/vm-password.gsm
 share/asterisk/sounds/vm-press.gsm
 share/asterisk/sounds/vm-prev.gsm
+share/asterisk/sounds/vm-reachoper.gsm
 share/asterisk/sounds/vm-rec-busy.gsm
 share/asterisk/sounds/vm-rec-name.gsm
 share/asterisk/sounds/vm-rec-unv.gsm
 share/asterisk/sounds/vm-received.gsm
 share/asterisk/sounds/vm-reenterpassword.gsm
 share/asterisk/sounds/vm-repeat.gsm
+share/asterisk/sounds/vm-review.gsm
 share/asterisk/sounds/vm-saved.gsm
 share/asterisk/sounds/vm-savedto.gsm
 share/asterisk/sounds/vm-savefolder.gsm
 share/asterisk/sounds/vm-savemessage.gsm
 share/asterisk/sounds/vm-sorry.gsm
+share/asterisk/sounds/vm-star-cancel.gsm
+share/asterisk/sounds/vm-starmain.gsm
+share/asterisk/sounds/vm-then-pound.gsm
 share/asterisk/sounds/vm-theperson.gsm
+share/asterisk/sounds/vm-tocallback.gsm
+share/asterisk/sounds/vm-tocallnum.gsm
 share/asterisk/sounds/vm-tocancel.gsm
+share/asterisk/sounds/vm-tocancelmsg.gsm
+share/asterisk/sounds/vm-toenternumber.gsm
 share/asterisk/sounds/vm-toforward.gsm
+share/asterisk/sounds/vm-tohearenv.gsm
+share/asterisk/sounds/vm-tomakecall.gsm
+share/asterisk/sounds/vm-tooshort.gsm
+share/asterisk/sounds/vm-toreply.gsm
+share/asterisk/sounds/vm-torerecord.gsm
 share/asterisk/sounds/vm-undelete.gsm
 share/asterisk/sounds/vm-undeleted.gsm
+share/asterisk/sounds/vm-unknown-caller.gsm
 share/asterisk/sounds/vm-whichbox.gsm
 share/asterisk/sounds/vm-youhave.gsm
 share/asterisk/sounds/voicemail
+@dirrm share/asterisk/sounds/phonetic
+@dirrm share/asterisk/sounds/letters
 @dirrm share/asterisk/sounds/digits
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/mohmp3
 @dirrm share/asterisk/keys
 @dirrm share/asterisk/images
+@dirrm share/asterisk/firmware/iax
+@dirrm share/asterisk/firmware
 @dirrm share/asterisk/agi-bin
 @dirrm share/asterisk
 @dirrm lib/asterisk/modules
@@ -463,6 +634,7 @@ spool/asterisk/voicemail/default/1234/unavail.gsm
 @dirrm spool/asterisk/voicemail/default/1234
 @dirrm spool/asterisk/voicemail/default
 @dirrm spool/asterisk/voicemail
+@dirrm spool/asterisk/tmp
 @dirrm spool/asterisk
 @dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 420c2dcfe4e7..3f24e2ef57a9 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -17,11 +16,13 @@ COMMENT=	An Open Source PBX and telephony toolkit
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
 		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
@@ -35,14 +36,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
-.include <bsd.port.pre.mk>
+MAN8=		asterisk.8
 
-.if defined(WITH_ZAPTEL) || exists(${LOCALBASE}/include/zaptel.h)
-BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-PLIST_SUB=	ZAPTEL=""
-.else
-PLIST_SUB=	ZAPTEL="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo
index a12f4a79e431..d7661cced0c6 100644
--- a/net/asterisk10/distinfo
+++ b/net/asterisk10/distinfo
@@ -1,2 +1,2 @@
-MD5 (asterisk-0.9.0.tar.gz) = cb0fbb5185fdf2356ee30bdcf4ad9b9c
-SIZE (asterisk-0.9.0.tar.gz) = 2787458
+MD5 (asterisk-1.0.1.tar.gz) = cb55b1a0be8ff6e94179db0cdc7e074d
+SIZE (asterisk-1.0.1.tar.gz) = 9558497
diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile
index 94155a666be0..43bf910fe669 100644
--- a/net/asterisk10/files/patch-Makefile
+++ b/net/asterisk10/files/patch-Makefile
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- Makefile.orig	Thu Apr  1 01:43:10 2004
-+++ Makefile	Wed Apr 14 22:08:43 2004
-@@ -43,10 +43,10 @@
+--- Makefile.orig	Tue Sep 28 20:11:30 2004
++++ Makefile	Thu Oct 14 19:48:30 2004
+@@ -62,10 +62,10 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
  
  #Include debug symbols in the executables (-g) and profiling info (-pg)
 -DEBUG=-g #-pg
 +#DEBUG=-g #-pg
  
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
+ # If you are running a radio application, define RADIO_RELAX so that the DTMF
+ # will be received more reliably
+@@ -90,7 +90,7 @@
  
  # Where to install asterisk after compiling
  # Default -> leave empty
@@ -25,7 +25,7 @@ $FreeBSD$
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -88,28 +88,27 @@
+@@ -110,23 +110,23 @@
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
@@ -44,36 +44,45 @@ $FreeBSD$
 -ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
 -ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
 -ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+-ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 +ASTBINDIR=$(INSTALL_PREFIX)/bin
 +ASTSBINDIR=$(INSTALL_PREFIX)/sbin
 +ASTVARRUNDIR=/var/run
++ASTMANDIR=$(INSTALL_PREFIX)/man
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
- INCLUDE=-Iinclude -I../include 
+ INCLUDE=-Iinclude -I../include
 -CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
- CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ 
+ ifneq ($(PROC),ultrasparc)
+@@ -137,11 +137,8 @@
+ CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
+ 
  ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
+-OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 -INCLUDE+=-I/usr/local/include
+-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 +CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +150,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +178,7 @@
++LIBS+=$(PTHREAD_LIBS)
+ endif # FreeBSD
+ 
+ ifeq (${OSARCH},NetBSD)
+@@ -157,7 +154,7 @@
+ #CFLAGS+=-DOLD_DSP_ROUTINES
+ 
+ CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
++CFLAGS+=-I$(LOCALBASE)/include -DZAPTEL_OPTIMIZATIONS
+ 
+ LIBEDIT=editline/libedit.a
+ 
+@@ -219,7 +216,7 @@
  SOLINK=-shared -Xlinker -x
  endif
  
@@ -82,7 +91,16 @@ $FreeBSD$
  INSTALL=install
  
  _all: all
-@@ -200,13 +199,13 @@
+@@ -231,7 +228,7 @@
+ 	@echo " +               $(MAKE) install                +"  
+ 	@echo " +-------------------------------------------+"  
+ 
+-all: depend asterisk subdirs 
++all: depend asterisk subdirs manpage
+ 
+ editline/config.h:
+ 	cd editline && unset CFLAGS LIBS && ./configure ; \
+@@ -240,13 +237,13 @@
  	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  	$(MAKE) -C editline libedit.a
  
@@ -103,18 +121,35 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
  include .depend
-@@ -244,8 +243,8 @@
+@@ -268,13 +265,10 @@
+ 
+ asterisk.o: asterisk.c build.h
+ 
+-manpage: asterisk.8.gz
++manpage: asterisk.8
+ 
+-asterisk.8.gz: asterisk.sgml
+-	rm -f asterisk.8
+-	docbook2man asterisk.sgml
+-	mv ./*.8 asterisk.8
+-	gzip asterisk.8
++asterisk.8: asterisk.8.gz
++	gzcat asterisk.8.gz > asterisk.8
+ 
+ ifneq ($(strip $(ASTERISKVERSION)),)
+ build.h: .version
+@@ -292,8 +286,8 @@
  		exit 1; \
  	fi
  
 -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+-	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
 +asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
++	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS)
  
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +259,10 @@
+ muted: muted.o
+ 	$(CC) -o muted muted.o
+@@ -312,28 +306,28 @@
  	$(MAKE) -C stdtime clean
  
  datafiles: all
@@ -127,9 +162,31 @@ $FreeBSD$
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -271,18 +270,18 @@
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ 	for x in sounds/letters/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ 	for x in sounds/phonetic/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+@@ -341,18 +335,18 @@
  	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
+ 	for x in 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-*; do \
  		if grep -q "^%`basename $$x`%" sounds.txt; then \
 -			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 +			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
@@ -151,7 +208,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -294,105 +293,74 @@
+@@ -364,111 +358,86 @@
  	fi
  
  bininstall: all
@@ -162,6 +219,7 @@ $FreeBSD$
 -	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
@@ -171,6 +229,7 @@ $FreeBSD$
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
@@ -191,19 +250,34 @@ $FreeBSD$
 -		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
 -	fi
 -	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 -	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
++	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	if [ -d contrib/firmware/iax ]; then \
+-		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ 	else \
+ 		echo "You need to do cvs update -d not just cvs update" ; \
+ 	fi 
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
+-	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -225,13 +299,8 @@ $FreeBSD$
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
@@ -294,8 +363,31 @@ $FreeBSD$
 -		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
  	done
+ 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	:> $(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 ; \
+@@ -483,7 +452,7 @@
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
+ 	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
+-	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk
++	$(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk
+ 	for x in images/*.gif; do \
+ 		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
+ 	done
+@@ -503,10 +472,10 @@
+ 
+ __rpm: _version
+ 	rm -rf /tmp/asterisk ; \
+-	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++	$(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
+-	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++	$(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+ 	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
+ 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
diff --git a/net/asterisk10/files/patch-agi::Makefile b/net/asterisk10/files/patch-agi::Makefile
index 567c30f5624e..32efb5d2b101 100644
--- a/net/asterisk10/files/patch-agi::Makefile
+++ b/net/asterisk10/files/patch-agi::Makefile
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
+--- agi/Makefile.orig	Tue Jun 22 20:42:13 2004
++++ agi/Makefile	Tue Oct  5 21:03:40 2004
+@@ -11,15 +11,18 @@
  # the GNU General Public License
  #
  
@@ -24,12 +24,4 @@ $FreeBSD$
 +	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
  
  eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
+ 	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
diff --git a/net/asterisk10/files/patch-apps::Makefile b/net/asterisk10/files/patch-apps::Makefile
index 901ba694c33a..00b77dfe2434 100644
--- a/net/asterisk10/files/patch-apps::Makefile
+++ b/net/asterisk10/files/patch-apps::Makefile
@@ -1,22 +1,24 @@
 
 $FreeBSD$
 
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
+--- apps/Makefile.orig	Sat Sep 25 00:32:56 2004
++++ apps/Makefile	Sun Oct 10 16:20:06 2004
+@@ -40,7 +40,7 @@
+ #APPS+=app_rpt.so
+ 
+ APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+-APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
++APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+ APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+ 
+ CFLAGS+=-fPIC
+@@ -65,12 +65,12 @@
  	$(CC) $(SOLINK) -o $@ $< -ltonezone
  
  install: all
 -	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
  
  app_voicemail.so : app_voicemail.o
  ifeq ($(USE_MYSQL_VM_INTERFACE),1)
@@ -25,11 +27,22 @@ $FreeBSD$
  else
  ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
  	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
+@@ -80,16 +80,16 @@
+ endif
+ 
+ app_sql_postgres.o: app_sql_postgres.c
+-	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
++	$(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ 
+ app_sql_postgres.so: app_sql_postgres.o
+-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/pgsql/lib -lpq
++	$(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq
+ 
+ app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ $< -lodbc
  
  look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
+-	$(CC) -pipe -O6 -g look.c -o look -lncurses
 +	$(CC) $(CFLAGS) look.c -o look -lncurses
  
  ifneq ($(wildcard .depend),)
diff --git a/net/asterisk10/files/patch-apps::app_intercom.c b/net/asterisk10/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk10/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk10/files/patch-astman::Makefile b/net/asterisk10/files/patch-astman::Makefile
index cf31005257cf..2745860cdd36 100644
--- a/net/asterisk10/files/patch-astman::Makefile
+++ b/net/asterisk10/files/patch-astman::Makefile
@@ -1,9 +1,20 @@
 
 $FreeBSD$
 
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
+--- astman/Makefile.orig	Sat Jun 26 22:25:39 2004
++++ astman/Makefile	Thu Oct 14 19:14:22 2004
+@@ -5,16 +5,16 @@
+ 
+ OSARCH=$(shell uname -s)
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS+=-I/usr/local/include -L/usr/local/lib
++CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib
+ endif
+ 
+-TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi)
++TARGET=astman
+ all: depend $(TARGET)
+ 
  install:
  	if [ "$(TARGET)" != "none" ]; then \
  		for x in $(TARGET); do \
diff --git a/net/asterisk10/files/patch-cdr::Makefile b/net/asterisk10/files/patch-cdr::Makefile
index 2ede608f9019..f646d2c9a3dc 100644
--- a/net/asterisk10/files/patch-cdr::Makefile
+++ b/net/asterisk10/files/patch-cdr::Makefile
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
+--- cdr/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ cdr/Makefile	Thu Oct 14 19:13:38 2004
+@@ -21,7 +21,7 @@
+ OSARCH=$(shell uname -s)
+ 
+ ifeq (${OSARCH},FreeBSD)
+-SOLINK+=-L/usr/local/lib
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+@@ -71,7 +71,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk10/files/patch-channels::Makefile b/net/asterisk10/files/patch-channels::Makefile
index fd855e7a2710..98caab3a33d6 100644
--- a/net/asterisk10/files/patch-channels::Makefile
+++ b/net/asterisk10/files/patch-channels::Makefile
@@ -1,53 +1,62 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Thu Mar 25 11:43:36 2004
-+++ channels/Makefile	Thu Apr 29 14:36:36 2004
-@@ -33,12 +33,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
+--- channels/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ channels/Makefile	Sun Oct 10 16:18:05 2004
+@@ -57,10 +57,10 @@
+ 
+ endif
+ ifeq (${OSARCH},FreeBSD)
+-PTLIB=-lpt_FreeBSD_x86_r
+-H323LIB=-lh323_FreeBSD_x86_r
+-CHANH323LIB=-pthread
+-SOLINK+=-L/usr/local/lib
++PTLIB=-lpt_FreeBSD_x86_r_s
++H323LIB=-lh323_FreeBSD_x86_r_s
++CHANH323LIB=
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ ifeq (${OSARCH},NetBSD)
+ PTLIB=-lpt_NetBSD_x86_r
+@@ -72,8 +72,8 @@
+ endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so)
 +CHANNEL_LIBS+=chan_h323.so
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -48,7 +46,7 @@
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+@@ -84,7 +84,7 @@
  ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 +CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
  CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
  
-@@ -69,7 +67,7 @@
- 
+@@ -107,7 +107,7 @@
  ZAPDIR=/usr/lib
  
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so")
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
  
-@@ -110,10 +108,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
+@@ -156,6 +156,8 @@
  chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
+ 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+ endif
++chan_oss.so: chan_oss.o
 +	$(CC) $(SOLINK) -o $@ chan_oss.o
  
- chan_iax2.so: chan_iax2.o iax2-parser.o
+ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -133,7 +129,7 @@
+@@ -175,7 +177,7 @@
  	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
  
  chan_zap.so: chan_zap.o
@@ -55,15 +64,15 @@ $FreeBSD$
 +	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone
  
  chan_sip.so: chan_sip.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -157,16 +153,17 @@
+ ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+@@ -199,15 +201,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
+-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(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
++	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
@@ -73,8 +82,7 @@ $FreeBSD$
  
  install: all
 -	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 +	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
+ 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
  
  depend: .depend
- 
diff --git a/net/asterisk10/files/patch-channels::chan_h323.c b/net/asterisk10/files/patch-channels::chan_h323.c
index e413bd8ecec8..de2ed3978663 100644
--- a/net/asterisk10/files/patch-channels::chan_h323.c
+++ b/net/asterisk10/files/patch-channels::chan_h323.c
@@ -1,13 +1,14 @@
 
 $FreeBSD$
 
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
+--- channels/chan_h323.c	2004/10/10 13:00:17	1.1
++++ channels/chan_h323.c	2004/10/10 13:00:39
+@@ -26,7 +26,7 @@
+  * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $
+  */
  
+-
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
diff --git a/net/asterisk10/files/patch-channels::chan_iax2.c b/net/asterisk10/files/patch-channels::chan_iax2.c
deleted file mode 100644
index 9127bee41cb6..000000000000
--- a/net/asterisk10/files/patch-channels::chan_iax2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_iax2.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_iax2.c	2004/04/29 21:37:10
-@@ -52,7 +52,7 @@
- #include <sys/stat.h>
- #ifdef IAX_TRUNKING
- #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #endif
- #ifdef MYSQL_FRIENDS
- #include <mysql/mysql.h>
diff --git a/net/asterisk10/files/patch-channels::chan_oss.c b/net/asterisk10/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk10/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk10/files/patch-channels::chan_sip.c b/net/asterisk10/files/patch-channels::chan_sip.c
index b98f9d185009..521d6a46d256 100644
--- a/net/asterisk10/files/patch-channels::chan_sip.c
+++ b/net/asterisk10/files/patch-channels::chan_sip.c
@@ -1,26 +1,26 @@
 
 $FreeBSD$
 
---- channels/chan_sip.c.orig	Wed Jan 14 08:10:53 2004
-+++ channels/chan_sip.c	Fri Jan 30 01:47:34 2004
-@@ -124,7 +124,7 @@
- static int restart_monitor(void);
+--- channels/chan_sip.c.orig
++++ channels/chan_sip.c
+@@ -139,7 +139,7 @@
  
- /* Codecs that we support by default: */
--static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
-+static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263 | AST_FORMAT_G723_1 | AST_FORMAT_G729A;
- static int noncodeccapability = AST_RTP_DTMF;
+ static char default_language[MAX_LANGUAGE] = "";
  
- static char ourhost[256];
-@@ -176,6 +176,7 @@
+-static char default_callerid[AST_MAX_EXTENSION] = "asterisk";
++static char default_callerid[AST_MAX_EXTENSION] = "Unknown";
+ 
+ static char default_fromdomain[AST_MAX_EXTENSION] = "";
+ 
+@@ -244,6 +244,7 @@
  struct sip_route {
  	struct sip_route *next;
  	char hop[0];
 +	int lr;
  };
  
- static struct sip_pvt {
-@@ -3417,6 +3418,10 @@
+ struct sip_history {
+@@ -4573,6 +4574,10 @@
  			/* Make a struct route */
  			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
  			if (thishop) {
@@ -28,17 +28,17 @@ $FreeBSD$
 +					thishop->lr = 1;
 +				else
 +					thishop->lr = 0;
- 				strncpy(thishop->hop, rr, len);
+ 				strncpy(thishop->hop, rr, len); /* safe */
  				thishop->hop[len] = '\0';
  				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
-@@ -3440,31 +3445,41 @@
+@@ -4596,31 +4601,41 @@
  			rr += len+1;
  		}
  	}
 -	/* 2nd append the Contact: if there is one */
 -	/* Can be multiple Contact headers, comma separated values - we just take the first */
 -	contact = get_header(req, "Contact");
--	if (strlen(contact)) {
+-	if (!ast_strlen_zero(contact)) {
 -		ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 -		/* Look for <: delimited address */
 -		c = strchr(contact, '<');
@@ -55,7 +55,7 @@ $FreeBSD$
 +	if (head && head->lr) {
 +		thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1);
  		if (thishop) {
--			strncpy(thishop->hop, c, len);
+-			strncpy(thishop->hop, c, len); /* safe */
 -			thishop->hop[len] = '\0';
 -			thishop->next = NULL;
 -			/* Goes at the end */
@@ -71,7 +71,7 @@ $FreeBSD$
 +		/* Append the Contact: if there is one and first route is w/o `lr' param */
 +		/* Can be multiple Contact headers, comma separated values - we just take the first */
 +		contact = get_header(req, "Contact");
-+		if (strlen(contact)) {
++		if (!ast_strlen_zero(contact)) {
 +			ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 +			/* Look for <: delimited address */
 +			c = strchr(contact, '<');
@@ -85,7 +85,7 @@ $FreeBSD$
 +			}
 +			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
 +			if (thishop) {
-+				strncpy(thishop->hop, c, len);
++				strncpy(thishop->hop, c, len); /* safe */
 +				thishop->hop[len] = '\0';
 +				thishop->next = NULL;
 +				/* Goes at the end */
@@ -97,7 +97,7 @@ $FreeBSD$
  		}
  	}
  	/* Store as new route */
-@@ -5143,7 +5158,11 @@
+@@ -7197,7 +7212,11 @@
  			/* Get destination right away */
  			gotdest = get_destination(p, NULL);
  			get_rdnis(p, NULL);
@@ -110,8 +110,8 @@ $FreeBSD$
  			build_contact(p);
  
  			if (gotdest) {
-@@ -5165,7 +5184,6 @@
- 				c = sip_new(p, AST_STATE_DOWN, strlen(p->username) ? p->username : NULL);
+@@ -7225,7 +7244,6 @@
+ 				c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
  				*recount = 1;
  				/* Save Record-Route for any later requests we make on this dialogue */
 -				build_route(p, req, 0);
diff --git a/net/asterisk10/files/patch-channels::chan_zap.c b/net/asterisk10/files/patch-channels::chan_zap.c
index e5a3ffc6afec..965a643bb687 100644
--- a/net/asterisk10/files/patch-channels::chan_zap.c
+++ b/net/asterisk10/files/patch-channels::chan_zap.c
@@ -1,14 +1,15 @@
 
 $FreeBSD$
 
---- channels/chan_zap.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_zap.c	2004/04/29 21:37:17
-@@ -45,7 +45,7 @@
+--- channels/chan_zap.c
++++ channels/chan_zap.c
+@@ -42,7 +42,9 @@
+ #include <sys/signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifndef __FreeBSD__
  #include <stdint.h>
++#endif
  #include <unistd.h>
  #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #include <math.h>
- #include <tonezone.h>
- #include <ctype.h>
+ #ifdef __linux__
diff --git a/net/asterisk10/files/patch-channels::h323::Makefile b/net/asterisk10/files/patch-channels::h323::Makefile
index a9159b4441c1..bc34083e2ff3 100644
--- a/net/asterisk10/files/patch-channels::h323::Makefile
+++ b/net/asterisk10/files/patch-channels::h323::Makefile
@@ -1,64 +1,38 @@
 
 $FreeBSD$
 
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+--- channels/h323/Makefile.orig	Tue Aug 31 16:32:11 2004
++++ channels/h323/Makefile	Sun Oct 10 15:25:42 2004
+@@ -53,7 +53,7 @@
+ LIBS+=-lpthread
+ endif
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS += -pthread
++CFLAGS += $(PTHREAD_LIBS)
+ endif
+ CFLAGS += -D_REENTRANT -D_GNU_SOURCE
  CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
+@@ -74,19 +74,19 @@
   
  
  ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
+-	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
++	$(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $<
  
  libchanh323.a:	ast_h323.o
  	ar cr libchanh323.a ast_h323.o
  
  chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB)
  
  chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)     -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB)
  
  chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
+-	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB)
  clean:
  	rm -f *.o *.so core.* libchanh323.a
  
diff --git a/net/asterisk10/files/patch-codecs::Makefile b/net/asterisk10/files/patch-codecs::Makefile
index b802dc1233e8..de9aff4c34fe 100644
--- a/net/asterisk10/files/patch-codecs::Makefile
+++ b/net/asterisk10/files/patch-codecs::Makefile
@@ -1,22 +1,23 @@
 
 $FreeBSD$
 
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
+--- codecs/Makefile.orig	Mon Jul 19 18:52:57 2004
++++ codecs/Makefile	Sun Oct 10 15:28:35 2004
+@@ -17,23 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+-MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
 +MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
++MODILBC=codec_ilbc.so
+ CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
++CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
  LIBG723B=g723.1b/libg723b.a
@@ -30,11 +31,11 @@ $FreeBSD$
  
 -CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
 +CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
+         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
+ 	codec_g726.so
  
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
+@@ -91,7 +91,7 @@
+ endif
  
  install: all
 -	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
diff --git a/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c
index 661ff2d88602..3ce9571013ec 100644
--- a/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c
+++ b/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g723_1_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g723_1_dummy.c	Sun Oct 10 16:07:05 2004
 @@ -0,0 +1,308 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -44,7 +44,7 @@ $FreeBSD$
 +#include "slin_g723_ex.h"
 +#include "g723_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
diff --git a/net/asterisk10/files/patch-codecs::codec_g729_dummy.c b/net/asterisk10/files/patch-codecs::codec_g729_dummy.c
index c3e27d98e27e..9fcc7b19ca35 100644
--- a/net/asterisk10/files/patch-codecs::codec_g729_dummy.c
+++ b/net/asterisk10/files/patch-codecs::codec_g729_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g729_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g729_dummy.c	Sun Oct 10 16:07:12 2004
 @@ -0,0 +1,275 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -38,7 +38,7 @@ $FreeBSD$
 +#include "slin_g729_ex.h"
 +#include "g729_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
diff --git a/net/asterisk10/files/patch-codecs::gsm::Makefile b/net/asterisk10/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk10/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk10/files/patch-codecs::lpc10::Makefile b/net/asterisk10/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 1674119a4836..000000000000
--- a/net/asterisk10/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Mon Mar 15 18:52:28 2004
-+++ codecs/lpc10/Makefile	Wed Apr 14 22:13:47 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,7 +22,7 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors and ALPHA too
-@@ -30,7 +30,7 @@
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
- ifneq ($(PROC),alpha)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+=
- endif
- endif
- endif
diff --git a/net/asterisk10/files/patch-db.c b/net/asterisk10/files/patch-db.c
index 59e5cef87770..6c2bdcd443c8 100644
--- a/net/asterisk10/files/patch-db.c
+++ b/net/asterisk10/files/patch-db.c
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
+--- db.c.orig	Fri Jul  9 13:08:09 2004
++++ db.c	Sun Oct 10 15:32:33 2004
+@@ -33,7 +33,7 @@
  #include <asterisk/cli.h>
+ #include <asterisk/utils.h>
+ #include <asterisk/lock.h>
 -#include "db1-ast/include/db.h"
 +#include <db.h>
  #include "asterisk.h"
diff --git a/net/asterisk10/files/patch-formats::format_g723_1.c b/net/asterisk10/files/patch-formats::format_g723_1.c
index 8d0755e14205..fb5eb12833dc 100644
--- a/net/asterisk10/files/patch-formats::format_g723_1.c
+++ b/net/asterisk10/files/patch-formats::format_g723_1.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
+--- formats/format_g723_1.c.orig	Sun Oct 10 15:59:18 2004
++++ formats/format_g723_1.c	Sun Oct 10 16:05:05 2004
 @@ -0,0 +1,345 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -57,7 +57,7 @@ $FreeBSD$
 +
 +static long g723_tell(struct ast_filestream *);
 +
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(g723_lock);
 +static int glistcnt = 0;
 +
 +static char *name = "g723";
diff --git a/net/asterisk10/files/patch-include::asterisk::utils.h b/net/asterisk10/files/patch-include::asterisk::utils.h
new file mode 100644
index 000000000000..a06f7d065c84
--- /dev/null
+++ b/net/asterisk10/files/patch-include::asterisk::utils.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- include/asterisk/utils.h	2004/10/10 12:55:50	1.1
++++ include/asterisk/utils.h	2004/10/10 12:56:43
+@@ -37,7 +37,6 @@
+ #ifdef inet_ntoa
+ #undef inet_ntoa
+ #endif
+-#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
+ 
+ #ifdef LINUX
+ #define ast_pthread_create pthread_create
diff --git a/net/asterisk10/files/patch-res::Makefile b/net/asterisk10/files/patch-res::Makefile
index ccd0a35dd59d..5700f04ea1ef 100644
--- a/net/asterisk10/files/patch-res::Makefile
+++ b/net/asterisk10/files/patch-res::Makefile
@@ -1,12 +1,21 @@
 
 $FreeBSD$
 
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
+--- res/Makefile.orig	Sat Jul 17 23:58:01 2004
++++ res/Makefile	Thu Oct 14 19:15:00 2004
+@@ -21,7 +21,7 @@
  
- install: all
+ CFLAGS+=
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
++CFLAGS+=-DZAPATA_MOH -I$(LOCALBASE)/include
+ #
+ # Work around buggy RedHat 9.0
+ #
+@@ -34,7 +34,7 @@
+ 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
 -	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
  
diff --git a/net/asterisk10/files/patch-rtp.c b/net/asterisk10/files/patch-rtp.c
index 11767dca198f..06289f357208 100644
--- a/net/asterisk10/files/patch-rtp.c
+++ b/net/asterisk10/files/patch-rtp.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- rtp.c.orig	Tue Nov 25 23:15:28 2003
-+++ rtp.c	Fri Jan 30 01:47:34 2004
-@@ -114,7 +114,7 @@
+--- rtp.c.orig	Sat Sep 18 16:56:28 2004
++++ rtp.c	Sun Oct 10 15:57:22 2004
+@@ -127,7 +127,7 @@
  {
  	switch(buf & TYPE_MASK) {
  	case TYPE_DONTSEND:
@@ -12,31 +12,15 @@ $FreeBSD$
  		break;
  	case TYPE_SILENCE:
  		return 4;
-@@ -1028,19 +1028,6 @@
- 		while((f = ast_smoother_read(rtp->smoother)))
- 			ast_rtp_raw_write(rtp, f, codec);
- 		break;
--	case AST_FORMAT_G729A:
--		if (!rtp->smoother) {
--			rtp->smoother = ast_smoother_new(20);
--		}
--		if (!rtp->smoother) {
--			ast_log(LOG_WARNING, "Unable to create g729 smoother :(\n");
--			return -1;
--		}
--		ast_smoother_feed(rtp->smoother, _f);
--		
--		while((f = ast_smoother_read(rtp->smoother)))
--			ast_rtp_raw_write(rtp, f, codec);
--		break;
- 	case AST_FORMAT_GSM:
- 		if (!rtp->smoother) {
- 			rtp->smoother = ast_smoother_new(33);
-@@ -1071,6 +1058,7 @@
- 	case AST_FORMAT_H261:
- 	case AST_FORMAT_H263:
- 	case AST_FORMAT_G723_1:
-+	case AST_FORMAT_G729A:
- 	case AST_FORMAT_SPEEX:
- 	        // Don't buffer outgoing frames; send them one-per-packet:
- 		if (_f->offset < hdrlen) {
+@@ -841,8 +841,10 @@
+ 		/* Must be an even port number by RTP spec */
+ 		rtp->us.sin_port = htons(x);
+ 		rtp->us.sin_addr = addr;
+-		if (rtp->rtcp)
++		if (rtp->rtcp) {
+ 			rtp->rtcp->us.sin_port = htons(x + 1);
++			rtp->rtcp->us.sin_addr = addr;
++		}
+ 		if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
+ 			(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
+ 			break;
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index eb427fa04447..f1519b3f3a39 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/pkg-plist
@@ -7,6 +7,9 @@ etc/asterisk/adtranvofr.conf-dist
 @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
 etc/asterisk/agents.conf-dist
 @exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
+@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
+etc/asterisk/alarmreceiver.conf-dist
+@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf
 @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
 etc/asterisk/alsa.conf-dist
 @exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
@@ -16,18 +19,30 @@ etc/asterisk/asterisk.adsi-dist
 @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
 etc/asterisk/asterisk.conf-dist
 @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
+etc/asterisk/cdr_manager.conf-dist
+@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
 etc/asterisk/cdr_odbc.conf-dist
 @exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
 etc/asterisk/cdr_pgsql.conf-dist
 @exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
+etc/asterisk/cdr_tds.conf-dist
+@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf
 @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
 etc/asterisk/enum.conf-dist
 @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
+@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
+etc/asterisk/extconfig.conf-dist
+@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf
 @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
 etc/asterisk/extensions.conf-dist
 @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
+@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
+etc/asterisk/features.conf-dist
+@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
@@ -37,6 +52,9 @@ etc/asterisk/h323.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
+@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
+etc/asterisk/iaxprov.conf-dist
+@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf
 @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
 etc/asterisk/indications.conf-dist
 @exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
@@ -61,12 +79,12 @@ etc/asterisk/modules.conf-dist
 @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
 etc/asterisk/musiconhold.conf-dist
 @exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
+@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
+etc/asterisk/osp.conf-dist
+@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf
 @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
 etc/asterisk/oss.conf-dist
 @exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
 @unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
 etc/asterisk/phone.conf-dist
 @exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
@@ -76,6 +94,12 @@ etc/asterisk/privacy.conf-dist
 @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
 etc/asterisk/queues.conf-dist
 @exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
+@unexec if cmp -s %D/etc/asterisk/res_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi
+etc/asterisk/res_config_odbc.conf-dist
+@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.conf
+@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
+etc/asterisk/res_odbc.conf-dist
+@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
 etc/asterisk/rpt.conf-dist
 @exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
@@ -103,11 +127,13 @@ etc/asterisk/zapata.conf-dist
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
+include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/app.h
 include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
+include/asterisk/astosp.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
@@ -116,12 +142,14 @@ include/asterisk/channel_pvt.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/config.h
+include/asterisk/config_pvt.h
 include/asterisk/crypto.h
 include/asterisk/cvsid.h
 include/asterisk/dlfcn-compat.h
 include/asterisk/dns.h
 include/asterisk/dsp.h
 include/asterisk/enum.h
+include/asterisk/features.h
 include/asterisk/file.h
 include/asterisk/frame.h
 include/asterisk/fskmodem.h
@@ -138,10 +166,10 @@ include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
 include/asterisk/options.h
-include/asterisk/parking.h
 include/asterisk/pbx.h
 include/asterisk/poll-compat.h
 include/asterisk/privacy.h
+include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -150,30 +178,39 @@ include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/translate.h
 include/asterisk/ulaw.h
+include/asterisk/utils.h
 include/asterisk/vmodem.h
 lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
+lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
+lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
 lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_enumlookup.so
+lib/asterisk/modules/app_eval.so
+lib/asterisk/modules/app_exec.so
 lib/asterisk/modules/app_festival.so
+lib/asterisk/modules/app_flash.so
+lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
+lib/asterisk/modules/app_groupcount.so
 lib/asterisk/modules/app_hasnewvoicemail.so
+lib/asterisk/modules/app_ices.so
 lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_intercom.so
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+lib/asterisk/modules/app_meetme.so
 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_playback.so
 lib/asterisk/modules/app_privacy.so
@@ -184,20 +221,31 @@ lib/asterisk/modules/app_read.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
+lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so
 lib/asterisk/modules/app_setcdruserfield.so
 lib/asterisk/modules/app_setcidname.so
 lib/asterisk/modules/app_setcidnum.so
+lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_striplsd.so
 lib/asterisk/modules/app_substring.so
 lib/asterisk/modules/app_system.so
+lib/asterisk/modules/app_talkdetect.so
+lib/asterisk/modules/app_test.so
 lib/asterisk/modules/app_transfer.so
+lib/asterisk/modules/app_txtcidname.so
 lib/asterisk/modules/app_url.so
+lib/asterisk/modules/app_userevent.so
+lib/asterisk/modules/app_verbose.so
 lib/asterisk/modules/app_voicemail.so
 lib/asterisk/modules/app_waitforring.so
 lib/asterisk/modules/app_zapateller.so
+lib/asterisk/modules/app_zapbarge.so
+lib/asterisk/modules/app_zapras.so
+lib/asterisk/modules/app_zapscan.so
 lib/asterisk/modules/cdr_csv.so
+lib/asterisk/modules/cdr_manager.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax2.so
@@ -210,11 +258,12 @@ lib/asterisk/modules/chan_modem_i4l.so
 lib/asterisk/modules/chan_oss.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
-%%ZAPTEL%%lib/asterisk/modules/chan_zap.so
+lib/asterisk/modules/chan_zap.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g723_1_dummy.so
+lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_g729_dummy.so
 lib/asterisk/modules/codec_gsm.so
 lib/asterisk/modules/codec_ilbc.so
@@ -222,12 +271,15 @@ lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723_1.so
+lib/asterisk/modules/format_g726.so
 lib/asterisk/modules/format_g729.so
 lib/asterisk/modules/format_gsm.so
 lib/asterisk/modules/format_h263.so
+lib/asterisk/modules/format_ilbc.so
 lib/asterisk/modules/format_jpeg.so
 lib/asterisk/modules/format_pcm.so
 lib/asterisk/modules/format_pcm_alaw.so
+lib/asterisk/modules/format_sln.so
 lib/asterisk/modules/format_vox.so
 lib/asterisk/modules/format_wav.so
 lib/asterisk/modules/format_wav_gsm.so
@@ -235,20 +287,25 @@ lib/asterisk/modules/pbx_config.so
 lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/pbx_wilcalu.so
 lib/asterisk/modules/res_adsi.so
+lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_features.so
 lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
 sbin/asterisk
 sbin/astgenkey
 sbin/safe_asterisk
 share/asterisk/agi-bin/agi-test.agi
 share/asterisk/agi-bin/eagi-sphinx-test
 share/asterisk/agi-bin/eagi-test
+share/asterisk/firmware/iax/iaxy.bin
 share/asterisk/images/asterisk-intro.jpg
+share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
+share/asterisk/mohmp3/fpm-calm-river.mp3
+share/asterisk/mohmp3/fpm-sunshine.mp3
+share/asterisk/mohmp3/fpm-world-mix.mp3
 share/asterisk/sounds/agent-alreadyon.gsm
 share/asterisk/sounds/agent-incorrect.gsm
 share/asterisk/sounds/agent-loggedoff.gsm
@@ -259,12 +316,23 @@ share/asterisk/sounds/agent-user.gsm
 share/asterisk/sounds/auth-incorrect.gsm
 share/asterisk/sounds/auth-thankyou.gsm
 share/asterisk/sounds/beep.gsm
+share/asterisk/sounds/conf-adminmenu.gsm
+share/asterisk/sounds/conf-enteringno.gsm
+share/asterisk/sounds/conf-errormenu.gsm
 share/asterisk/sounds/conf-getchannel.gsm
 share/asterisk/sounds/conf-getconfno.gsm
 share/asterisk/sounds/conf-getpin.gsm
 share/asterisk/sounds/conf-invalid.gsm
 share/asterisk/sounds/conf-invalidpin.gsm
+share/asterisk/sounds/conf-kicked.gsm
+share/asterisk/sounds/conf-locked.gsm
+share/asterisk/sounds/conf-lockednow.gsm
+share/asterisk/sounds/conf-muted.gsm
+share/asterisk/sounds/conf-noempty.gsm
 share/asterisk/sounds/conf-onlyperson.gsm
+share/asterisk/sounds/conf-unlockednow.gsm
+share/asterisk/sounds/conf-unmuted.gsm
+share/asterisk/sounds/conf-usermenu.gsm
 share/asterisk/sounds/demo-abouttotry.gsm
 share/asterisk/sounds/demo-congrats.gsm
 share/asterisk/sounds/demo-echodone.gsm
@@ -359,16 +427,88 @@ share/asterisk/sounds/digits/tomorrow.gsm
 share/asterisk/sounds/digits/yesterday.gsm
 share/asterisk/sounds/dir-instr.gsm
 share/asterisk/sounds/dir-intro.gsm
+share/asterisk/sounds/dir-intro-fn.gsm
 share/asterisk/sounds/dir-nomatch.gsm
 share/asterisk/sounds/dir-nomore.gsm
 share/asterisk/sounds/invalid.gsm
+share/asterisk/sounds/letters/a.gsm
+share/asterisk/sounds/letters/at.gsm
+share/asterisk/sounds/letters/b.gsm
+share/asterisk/sounds/letters/c.gsm
+share/asterisk/sounds/letters/d.gsm
+share/asterisk/sounds/letters/dash.gsm
+share/asterisk/sounds/letters/dollar.gsm
+share/asterisk/sounds/letters/dot.gsm
+share/asterisk/sounds/letters/e.gsm
+share/asterisk/sounds/letters/equals.gsm
+share/asterisk/sounds/letters/exclaimation-point.gsm
+share/asterisk/sounds/letters/f.gsm
+share/asterisk/sounds/letters/g.gsm
+share/asterisk/sounds/letters/h.gsm
+share/asterisk/sounds/letters/i.gsm
+share/asterisk/sounds/letters/j.gsm
+share/asterisk/sounds/letters/k.gsm
+share/asterisk/sounds/letters/l.gsm
+share/asterisk/sounds/letters/m.gsm
+share/asterisk/sounds/letters/n.gsm
+share/asterisk/sounds/letters/o.gsm
+share/asterisk/sounds/letters/p.gsm
+share/asterisk/sounds/letters/plus.gsm
+share/asterisk/sounds/letters/q.gsm
+share/asterisk/sounds/letters/r.gsm
+share/asterisk/sounds/letters/s.gsm
+share/asterisk/sounds/letters/slash.gsm
+share/asterisk/sounds/letters/space.gsm
+share/asterisk/sounds/letters/t.gsm
+share/asterisk/sounds/letters/u.gsm
+share/asterisk/sounds/letters/v.gsm
+share/asterisk/sounds/letters/w.gsm
+share/asterisk/sounds/letters/x.gsm
+share/asterisk/sounds/letters/y.gsm
+share/asterisk/sounds/letters/z.gsm
+share/asterisk/sounds/letters/zed.gsm
 share/asterisk/sounds/pbx-invalid.gsm
 share/asterisk/sounds/pbx-invalidpark.gsm
 share/asterisk/sounds/pbx-transfer.gsm
+share/asterisk/sounds/phonetic/9_p.gsm
+share/asterisk/sounds/phonetic/a_p.gsm
+share/asterisk/sounds/phonetic/b_p.gsm
+share/asterisk/sounds/phonetic/c_p.gsm
+share/asterisk/sounds/phonetic/d_p.gsm
+share/asterisk/sounds/phonetic/e_p.gsm
+share/asterisk/sounds/phonetic/f_p.gsm
+share/asterisk/sounds/phonetic/g_p.gsm
+share/asterisk/sounds/phonetic/h_p.gsm
+share/asterisk/sounds/phonetic/i_p.gsm
+share/asterisk/sounds/phonetic/j_p.gsm
+share/asterisk/sounds/phonetic/k_p.gsm
+share/asterisk/sounds/phonetic/l_p.gsm
+share/asterisk/sounds/phonetic/m_p.gsm
+share/asterisk/sounds/phonetic/n_p.gsm
+share/asterisk/sounds/phonetic/o_p.gsm
+share/asterisk/sounds/phonetic/p_p.gsm
+share/asterisk/sounds/phonetic/q_p.gsm
+share/asterisk/sounds/phonetic/r_p.gsm
+share/asterisk/sounds/phonetic/s_p.gsm
+share/asterisk/sounds/phonetic/t_p.gsm
+share/asterisk/sounds/phonetic/u_p.gsm
+share/asterisk/sounds/phonetic/v_p.gsm
+share/asterisk/sounds/phonetic/w_p.gsm
+share/asterisk/sounds/phonetic/x_p.gsm
+share/asterisk/sounds/phonetic/y_p.gsm
+share/asterisk/sounds/phonetic/z_p.gsm
 share/asterisk/sounds/privacy-incorrect.gsm
 share/asterisk/sounds/privacy-prompt.gsm
 share/asterisk/sounds/privacy-thankyou.gsm
 share/asterisk/sounds/privacy-unident.gsm
+share/asterisk/sounds/queue-callswaiting.gsm
+share/asterisk/sounds/queue-holdtime.gsm
+share/asterisk/sounds/queue-less-than.gsm
+share/asterisk/sounds/queue-minutes.gsm
+share/asterisk/sounds/queue-seconds.gsm
+share/asterisk/sounds/queue-thankyou.gsm
+share/asterisk/sounds/queue-thereare.gsm
+share/asterisk/sounds/queue-youarenext.gsm
 share/asterisk/sounds/ss-noservice.gsm
 share/asterisk/sounds/transfer.gsm
 share/asterisk/sounds/tt-allbusy.gsm
@@ -387,22 +527,31 @@ share/asterisk/sounds/vm-Friends.gsm
 share/asterisk/sounds/vm-INBOX.gsm
 share/asterisk/sounds/vm-Old.gsm
 share/asterisk/sounds/vm-Work.gsm
+share/asterisk/sounds/vm-advopts.gsm
 share/asterisk/sounds/vm-and.gsm
+share/asterisk/sounds/vm-calldiffnum.gsm
 share/asterisk/sounds/vm-changeto.gsm
 share/asterisk/sounds/vm-delete.gsm
 share/asterisk/sounds/vm-deleted.gsm
+share/asterisk/sounds/vm-dialout.gsm
+share/asterisk/sounds/vm-enter-num-to-call.gsm
 share/asterisk/sounds/vm-extension.gsm
 share/asterisk/sounds/vm-first.gsm
 share/asterisk/sounds/vm-for.gsm
 share/asterisk/sounds/vm-forwardoptions.gsm
+share/asterisk/sounds/vm-from-extension.gsm
+share/asterisk/sounds/vm-from-phonenumber.gsm
+share/asterisk/sounds/vm-from.gsm
 share/asterisk/sounds/vm-goodbye.gsm
 share/asterisk/sounds/vm-helpexit.gsm
 share/asterisk/sounds/vm-incorrect.gsm
+share/asterisk/sounds/vm-incorrect-mailbox.gsm
 share/asterisk/sounds/vm-instructions.gsm
 share/asterisk/sounds/vm-intro.gsm
 share/asterisk/sounds/vm-isonphone.gsm
 share/asterisk/sounds/vm-isunavail.gsm
 share/asterisk/sounds/vm-last.gsm
+share/asterisk/sounds/vm-leavemsg.gsm
 share/asterisk/sounds/vm-login.gsm
 share/asterisk/sounds/vm-mailboxfull.gsm
 share/asterisk/sounds/vm-message.gsm
@@ -414,7 +563,10 @@ share/asterisk/sounds/vm-newpassword.gsm
 share/asterisk/sounds/vm-next.gsm
 share/asterisk/sounds/vm-no.gsm
 share/asterisk/sounds/vm-nobodyavail.gsm
+share/asterisk/sounds/vm-nobox.gsm
 share/asterisk/sounds/vm-nomore.gsm
+share/asterisk/sounds/vm-nonumber.gsm
+share/asterisk/sounds/vm-num-i-have.gsm
 share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-options.gsm
 share/asterisk/sounds/vm-opts.gsm
@@ -422,30 +574,49 @@ share/asterisk/sounds/vm-passchanged.gsm
 share/asterisk/sounds/vm-password.gsm
 share/asterisk/sounds/vm-press.gsm
 share/asterisk/sounds/vm-prev.gsm
+share/asterisk/sounds/vm-reachoper.gsm
 share/asterisk/sounds/vm-rec-busy.gsm
 share/asterisk/sounds/vm-rec-name.gsm
 share/asterisk/sounds/vm-rec-unv.gsm
 share/asterisk/sounds/vm-received.gsm
 share/asterisk/sounds/vm-reenterpassword.gsm
 share/asterisk/sounds/vm-repeat.gsm
+share/asterisk/sounds/vm-review.gsm
 share/asterisk/sounds/vm-saved.gsm
 share/asterisk/sounds/vm-savedto.gsm
 share/asterisk/sounds/vm-savefolder.gsm
 share/asterisk/sounds/vm-savemessage.gsm
 share/asterisk/sounds/vm-sorry.gsm
+share/asterisk/sounds/vm-star-cancel.gsm
+share/asterisk/sounds/vm-starmain.gsm
+share/asterisk/sounds/vm-then-pound.gsm
 share/asterisk/sounds/vm-theperson.gsm
+share/asterisk/sounds/vm-tocallback.gsm
+share/asterisk/sounds/vm-tocallnum.gsm
 share/asterisk/sounds/vm-tocancel.gsm
+share/asterisk/sounds/vm-tocancelmsg.gsm
+share/asterisk/sounds/vm-toenternumber.gsm
 share/asterisk/sounds/vm-toforward.gsm
+share/asterisk/sounds/vm-tohearenv.gsm
+share/asterisk/sounds/vm-tomakecall.gsm
+share/asterisk/sounds/vm-tooshort.gsm
+share/asterisk/sounds/vm-toreply.gsm
+share/asterisk/sounds/vm-torerecord.gsm
 share/asterisk/sounds/vm-undelete.gsm
 share/asterisk/sounds/vm-undeleted.gsm
+share/asterisk/sounds/vm-unknown-caller.gsm
 share/asterisk/sounds/vm-whichbox.gsm
 share/asterisk/sounds/vm-youhave.gsm
 share/asterisk/sounds/voicemail
+@dirrm share/asterisk/sounds/phonetic
+@dirrm share/asterisk/sounds/letters
 @dirrm share/asterisk/sounds/digits
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/mohmp3
 @dirrm share/asterisk/keys
 @dirrm share/asterisk/images
+@dirrm share/asterisk/firmware/iax
+@dirrm share/asterisk/firmware
 @dirrm share/asterisk/agi-bin
 @dirrm share/asterisk
 @dirrm lib/asterisk/modules
@@ -463,6 +634,7 @@ spool/asterisk/voicemail/default/1234/unavail.gsm
 @dirrm spool/asterisk/voicemail/default/1234
 @dirrm spool/asterisk/voicemail/default
 @dirrm spool/asterisk/voicemail
+@dirrm spool/asterisk/tmp
 @dirrm spool/asterisk
 @dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index 420c2dcfe4e7..3f24e2ef57a9 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -17,11 +16,13 @@ COMMENT=	An Open Source PBX and telephony toolkit
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
 		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
@@ -35,14 +36,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
-.include <bsd.port.pre.mk>
+MAN8=		asterisk.8
 
-.if defined(WITH_ZAPTEL) || exists(${LOCALBASE}/include/zaptel.h)
-BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-PLIST_SUB=	ZAPTEL=""
-.else
-PLIST_SUB=	ZAPTEL="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/asterisk12/distinfo b/net/asterisk12/distinfo
index a12f4a79e431..d7661cced0c6 100644
--- a/net/asterisk12/distinfo
+++ b/net/asterisk12/distinfo
@@ -1,2 +1,2 @@
-MD5 (asterisk-0.9.0.tar.gz) = cb0fbb5185fdf2356ee30bdcf4ad9b9c
-SIZE (asterisk-0.9.0.tar.gz) = 2787458
+MD5 (asterisk-1.0.1.tar.gz) = cb55b1a0be8ff6e94179db0cdc7e074d
+SIZE (asterisk-1.0.1.tar.gz) = 9558497
diff --git a/net/asterisk12/files/patch-Makefile b/net/asterisk12/files/patch-Makefile
index 94155a666be0..43bf910fe669 100644
--- a/net/asterisk12/files/patch-Makefile
+++ b/net/asterisk12/files/patch-Makefile
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- Makefile.orig	Thu Apr  1 01:43:10 2004
-+++ Makefile	Wed Apr 14 22:08:43 2004
-@@ -43,10 +43,10 @@
+--- Makefile.orig	Tue Sep 28 20:11:30 2004
++++ Makefile	Thu Oct 14 19:48:30 2004
+@@ -62,10 +62,10 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
  
  #Include debug symbols in the executables (-g) and profiling info (-pg)
 -DEBUG=-g #-pg
 +#DEBUG=-g #-pg
  
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
+ # If you are running a radio application, define RADIO_RELAX so that the DTMF
+ # will be received more reliably
+@@ -90,7 +90,7 @@
  
  # Where to install asterisk after compiling
  # Default -> leave empty
@@ -25,7 +25,7 @@ $FreeBSD$
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -88,28 +88,27 @@
+@@ -110,23 +110,23 @@
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
@@ -44,36 +44,45 @@ $FreeBSD$
 -ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
 -ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
 -ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+-ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 +ASTBINDIR=$(INSTALL_PREFIX)/bin
 +ASTSBINDIR=$(INSTALL_PREFIX)/sbin
 +ASTVARRUNDIR=/var/run
++ASTMANDIR=$(INSTALL_PREFIX)/man
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
- INCLUDE=-Iinclude -I../include 
+ INCLUDE=-Iinclude -I../include
 -CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
- CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ 
+ ifneq ($(PROC),ultrasparc)
+@@ -137,11 +137,8 @@
+ CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
+ 
  ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
+-OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 -INCLUDE+=-I/usr/local/include
+-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 +CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +150,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +178,7 @@
++LIBS+=$(PTHREAD_LIBS)
+ endif # FreeBSD
+ 
+ ifeq (${OSARCH},NetBSD)
+@@ -157,7 +154,7 @@
+ #CFLAGS+=-DOLD_DSP_ROUTINES
+ 
+ CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
++CFLAGS+=-I$(LOCALBASE)/include -DZAPTEL_OPTIMIZATIONS
+ 
+ LIBEDIT=editline/libedit.a
+ 
+@@ -219,7 +216,7 @@
  SOLINK=-shared -Xlinker -x
  endif
  
@@ -82,7 +91,16 @@ $FreeBSD$
  INSTALL=install
  
  _all: all
-@@ -200,13 +199,13 @@
+@@ -231,7 +228,7 @@
+ 	@echo " +               $(MAKE) install                +"  
+ 	@echo " +-------------------------------------------+"  
+ 
+-all: depend asterisk subdirs 
++all: depend asterisk subdirs manpage
+ 
+ editline/config.h:
+ 	cd editline && unset CFLAGS LIBS && ./configure ; \
+@@ -240,13 +237,13 @@
  	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  	$(MAKE) -C editline libedit.a
  
@@ -103,18 +121,35 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
  include .depend
-@@ -244,8 +243,8 @@
+@@ -268,13 +265,10 @@
+ 
+ asterisk.o: asterisk.c build.h
+ 
+-manpage: asterisk.8.gz
++manpage: asterisk.8
+ 
+-asterisk.8.gz: asterisk.sgml
+-	rm -f asterisk.8
+-	docbook2man asterisk.sgml
+-	mv ./*.8 asterisk.8
+-	gzip asterisk.8
++asterisk.8: asterisk.8.gz
++	gzcat asterisk.8.gz > asterisk.8
+ 
+ ifneq ($(strip $(ASTERISKVERSION)),)
+ build.h: .version
+@@ -292,8 +286,8 @@
  		exit 1; \
  	fi
  
 -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+-	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
 +asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
++	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS)
  
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +259,10 @@
+ muted: muted.o
+ 	$(CC) -o muted muted.o
+@@ -312,28 +306,28 @@
  	$(MAKE) -C stdtime clean
  
  datafiles: all
@@ -127,9 +162,31 @@ $FreeBSD$
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -271,18 +270,18 @@
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ 	for x in sounds/letters/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ 	for x in sounds/phonetic/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+@@ -341,18 +335,18 @@
  	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
+ 	for x in 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-*; do \
  		if grep -q "^%`basename $$x`%" sounds.txt; then \
 -			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 +			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
@@ -151,7 +208,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -294,105 +293,74 @@
+@@ -364,111 +358,86 @@
  	fi
  
  bininstall: all
@@ -162,6 +219,7 @@ $FreeBSD$
 -	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
@@ -171,6 +229,7 @@ $FreeBSD$
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
@@ -191,19 +250,34 @@ $FreeBSD$
 -		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
 -	fi
 -	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 -	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
++	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	if [ -d contrib/firmware/iax ]; then \
+-		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ 	else \
+ 		echo "You need to do cvs update -d not just cvs update" ; \
+ 	fi 
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
+-	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -225,13 +299,8 @@ $FreeBSD$
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
@@ -294,8 +363,31 @@ $FreeBSD$
 -		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
  	done
+ 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	:> $(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 ; \
+@@ -483,7 +452,7 @@
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
+ 	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
+-	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk
++	$(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk
+ 	for x in images/*.gif; do \
+ 		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
+ 	done
+@@ -503,10 +472,10 @@
+ 
+ __rpm: _version
+ 	rm -rf /tmp/asterisk ; \
+-	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++	$(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
+-	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++	$(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+ 	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
+ 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
diff --git a/net/asterisk12/files/patch-agi::Makefile b/net/asterisk12/files/patch-agi::Makefile
index 567c30f5624e..32efb5d2b101 100644
--- a/net/asterisk12/files/patch-agi::Makefile
+++ b/net/asterisk12/files/patch-agi::Makefile
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
+--- agi/Makefile.orig	Tue Jun 22 20:42:13 2004
++++ agi/Makefile	Tue Oct  5 21:03:40 2004
+@@ -11,15 +11,18 @@
  # the GNU General Public License
  #
  
@@ -24,12 +24,4 @@ $FreeBSD$
 +	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
  
  eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
+ 	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
diff --git a/net/asterisk12/files/patch-apps::Makefile b/net/asterisk12/files/patch-apps::Makefile
index 901ba694c33a..00b77dfe2434 100644
--- a/net/asterisk12/files/patch-apps::Makefile
+++ b/net/asterisk12/files/patch-apps::Makefile
@@ -1,22 +1,24 @@
 
 $FreeBSD$
 
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
+--- apps/Makefile.orig	Sat Sep 25 00:32:56 2004
++++ apps/Makefile	Sun Oct 10 16:20:06 2004
+@@ -40,7 +40,7 @@
+ #APPS+=app_rpt.so
+ 
+ APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+-APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
++APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+ APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+ 
+ CFLAGS+=-fPIC
+@@ -65,12 +65,12 @@
  	$(CC) $(SOLINK) -o $@ $< -ltonezone
  
  install: all
 -	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
  
  app_voicemail.so : app_voicemail.o
  ifeq ($(USE_MYSQL_VM_INTERFACE),1)
@@ -25,11 +27,22 @@ $FreeBSD$
  else
  ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
  	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
+@@ -80,16 +80,16 @@
+ endif
+ 
+ app_sql_postgres.o: app_sql_postgres.c
+-	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
++	$(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ 
+ app_sql_postgres.so: app_sql_postgres.o
+-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/pgsql/lib -lpq
++	$(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq
+ 
+ app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ $< -lodbc
  
  look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
+-	$(CC) -pipe -O6 -g look.c -o look -lncurses
 +	$(CC) $(CFLAGS) look.c -o look -lncurses
  
  ifneq ($(wildcard .depend),)
diff --git a/net/asterisk12/files/patch-apps::app_intercom.c b/net/asterisk12/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk12/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk12/files/patch-astman::Makefile b/net/asterisk12/files/patch-astman::Makefile
index cf31005257cf..2745860cdd36 100644
--- a/net/asterisk12/files/patch-astman::Makefile
+++ b/net/asterisk12/files/patch-astman::Makefile
@@ -1,9 +1,20 @@
 
 $FreeBSD$
 
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
+--- astman/Makefile.orig	Sat Jun 26 22:25:39 2004
++++ astman/Makefile	Thu Oct 14 19:14:22 2004
+@@ -5,16 +5,16 @@
+ 
+ OSARCH=$(shell uname -s)
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS+=-I/usr/local/include -L/usr/local/lib
++CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib
+ endif
+ 
+-TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi)
++TARGET=astman
+ all: depend $(TARGET)
+ 
  install:
  	if [ "$(TARGET)" != "none" ]; then \
  		for x in $(TARGET); do \
diff --git a/net/asterisk12/files/patch-cdr::Makefile b/net/asterisk12/files/patch-cdr::Makefile
index 2ede608f9019..f646d2c9a3dc 100644
--- a/net/asterisk12/files/patch-cdr::Makefile
+++ b/net/asterisk12/files/patch-cdr::Makefile
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
+--- cdr/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ cdr/Makefile	Thu Oct 14 19:13:38 2004
+@@ -21,7 +21,7 @@
+ OSARCH=$(shell uname -s)
+ 
+ ifeq (${OSARCH},FreeBSD)
+-SOLINK+=-L/usr/local/lib
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+@@ -71,7 +71,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk12/files/patch-channels::Makefile b/net/asterisk12/files/patch-channels::Makefile
index fd855e7a2710..98caab3a33d6 100644
--- a/net/asterisk12/files/patch-channels::Makefile
+++ b/net/asterisk12/files/patch-channels::Makefile
@@ -1,53 +1,62 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Thu Mar 25 11:43:36 2004
-+++ channels/Makefile	Thu Apr 29 14:36:36 2004
-@@ -33,12 +33,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
+--- channels/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ channels/Makefile	Sun Oct 10 16:18:05 2004
+@@ -57,10 +57,10 @@
+ 
+ endif
+ ifeq (${OSARCH},FreeBSD)
+-PTLIB=-lpt_FreeBSD_x86_r
+-H323LIB=-lh323_FreeBSD_x86_r
+-CHANH323LIB=-pthread
+-SOLINK+=-L/usr/local/lib
++PTLIB=-lpt_FreeBSD_x86_r_s
++H323LIB=-lh323_FreeBSD_x86_r_s
++CHANH323LIB=
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ ifeq (${OSARCH},NetBSD)
+ PTLIB=-lpt_NetBSD_x86_r
+@@ -72,8 +72,8 @@
+ endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so)
 +CHANNEL_LIBS+=chan_h323.so
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -48,7 +46,7 @@
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+@@ -84,7 +84,7 @@
  ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 +CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
  CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
  
-@@ -69,7 +67,7 @@
- 
+@@ -107,7 +107,7 @@
  ZAPDIR=/usr/lib
  
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so")
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
  
-@@ -110,10 +108,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
+@@ -156,6 +156,8 @@
  chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
+ 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+ endif
++chan_oss.so: chan_oss.o
 +	$(CC) $(SOLINK) -o $@ chan_oss.o
  
- chan_iax2.so: chan_iax2.o iax2-parser.o
+ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -133,7 +129,7 @@
+@@ -175,7 +177,7 @@
  	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
  
  chan_zap.so: chan_zap.o
@@ -55,15 +64,15 @@ $FreeBSD$
 +	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone
  
  chan_sip.so: chan_sip.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -157,16 +153,17 @@
+ ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+@@ -199,15 +201,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
+-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(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
++	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
@@ -73,8 +82,7 @@ $FreeBSD$
  
  install: all
 -	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 +	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
+ 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
  
  depend: .depend
- 
diff --git a/net/asterisk12/files/patch-channels::chan_h323.c b/net/asterisk12/files/patch-channels::chan_h323.c
index e413bd8ecec8..de2ed3978663 100644
--- a/net/asterisk12/files/patch-channels::chan_h323.c
+++ b/net/asterisk12/files/patch-channels::chan_h323.c
@@ -1,13 +1,14 @@
 
 $FreeBSD$
 
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
+--- channels/chan_h323.c	2004/10/10 13:00:17	1.1
++++ channels/chan_h323.c	2004/10/10 13:00:39
+@@ -26,7 +26,7 @@
+  * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $
+  */
  
+-
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
diff --git a/net/asterisk12/files/patch-channels::chan_iax2.c b/net/asterisk12/files/patch-channels::chan_iax2.c
deleted file mode 100644
index 9127bee41cb6..000000000000
--- a/net/asterisk12/files/patch-channels::chan_iax2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_iax2.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_iax2.c	2004/04/29 21:37:10
-@@ -52,7 +52,7 @@
- #include <sys/stat.h>
- #ifdef IAX_TRUNKING
- #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #endif
- #ifdef MYSQL_FRIENDS
- #include <mysql/mysql.h>
diff --git a/net/asterisk12/files/patch-channels::chan_oss.c b/net/asterisk12/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk12/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk12/files/patch-channels::chan_sip.c b/net/asterisk12/files/patch-channels::chan_sip.c
index b98f9d185009..521d6a46d256 100644
--- a/net/asterisk12/files/patch-channels::chan_sip.c
+++ b/net/asterisk12/files/patch-channels::chan_sip.c
@@ -1,26 +1,26 @@
 
 $FreeBSD$
 
---- channels/chan_sip.c.orig	Wed Jan 14 08:10:53 2004
-+++ channels/chan_sip.c	Fri Jan 30 01:47:34 2004
-@@ -124,7 +124,7 @@
- static int restart_monitor(void);
+--- channels/chan_sip.c.orig
++++ channels/chan_sip.c
+@@ -139,7 +139,7 @@
  
- /* Codecs that we support by default: */
--static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
-+static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263 | AST_FORMAT_G723_1 | AST_FORMAT_G729A;
- static int noncodeccapability = AST_RTP_DTMF;
+ static char default_language[MAX_LANGUAGE] = "";
  
- static char ourhost[256];
-@@ -176,6 +176,7 @@
+-static char default_callerid[AST_MAX_EXTENSION] = "asterisk";
++static char default_callerid[AST_MAX_EXTENSION] = "Unknown";
+ 
+ static char default_fromdomain[AST_MAX_EXTENSION] = "";
+ 
+@@ -244,6 +244,7 @@
  struct sip_route {
  	struct sip_route *next;
  	char hop[0];
 +	int lr;
  };
  
- static struct sip_pvt {
-@@ -3417,6 +3418,10 @@
+ struct sip_history {
+@@ -4573,6 +4574,10 @@
  			/* Make a struct route */
  			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
  			if (thishop) {
@@ -28,17 +28,17 @@ $FreeBSD$
 +					thishop->lr = 1;
 +				else
 +					thishop->lr = 0;
- 				strncpy(thishop->hop, rr, len);
+ 				strncpy(thishop->hop, rr, len); /* safe */
  				thishop->hop[len] = '\0';
  				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
-@@ -3440,31 +3445,41 @@
+@@ -4596,31 +4601,41 @@
  			rr += len+1;
  		}
  	}
 -	/* 2nd append the Contact: if there is one */
 -	/* Can be multiple Contact headers, comma separated values - we just take the first */
 -	contact = get_header(req, "Contact");
--	if (strlen(contact)) {
+-	if (!ast_strlen_zero(contact)) {
 -		ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 -		/* Look for <: delimited address */
 -		c = strchr(contact, '<');
@@ -55,7 +55,7 @@ $FreeBSD$
 +	if (head && head->lr) {
 +		thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1);
  		if (thishop) {
--			strncpy(thishop->hop, c, len);
+-			strncpy(thishop->hop, c, len); /* safe */
 -			thishop->hop[len] = '\0';
 -			thishop->next = NULL;
 -			/* Goes at the end */
@@ -71,7 +71,7 @@ $FreeBSD$
 +		/* Append the Contact: if there is one and first route is w/o `lr' param */
 +		/* Can be multiple Contact headers, comma separated values - we just take the first */
 +		contact = get_header(req, "Contact");
-+		if (strlen(contact)) {
++		if (!ast_strlen_zero(contact)) {
 +			ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 +			/* Look for <: delimited address */
 +			c = strchr(contact, '<');
@@ -85,7 +85,7 @@ $FreeBSD$
 +			}
 +			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
 +			if (thishop) {
-+				strncpy(thishop->hop, c, len);
++				strncpy(thishop->hop, c, len); /* safe */
 +				thishop->hop[len] = '\0';
 +				thishop->next = NULL;
 +				/* Goes at the end */
@@ -97,7 +97,7 @@ $FreeBSD$
  		}
  	}
  	/* Store as new route */
-@@ -5143,7 +5158,11 @@
+@@ -7197,7 +7212,11 @@
  			/* Get destination right away */
  			gotdest = get_destination(p, NULL);
  			get_rdnis(p, NULL);
@@ -110,8 +110,8 @@ $FreeBSD$
  			build_contact(p);
  
  			if (gotdest) {
-@@ -5165,7 +5184,6 @@
- 				c = sip_new(p, AST_STATE_DOWN, strlen(p->username) ? p->username : NULL);
+@@ -7225,7 +7244,6 @@
+ 				c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
  				*recount = 1;
  				/* Save Record-Route for any later requests we make on this dialogue */
 -				build_route(p, req, 0);
diff --git a/net/asterisk12/files/patch-channels::chan_zap.c b/net/asterisk12/files/patch-channels::chan_zap.c
index e5a3ffc6afec..965a643bb687 100644
--- a/net/asterisk12/files/patch-channels::chan_zap.c
+++ b/net/asterisk12/files/patch-channels::chan_zap.c
@@ -1,14 +1,15 @@
 
 $FreeBSD$
 
---- channels/chan_zap.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_zap.c	2004/04/29 21:37:17
-@@ -45,7 +45,7 @@
+--- channels/chan_zap.c
++++ channels/chan_zap.c
+@@ -42,7 +42,9 @@
+ #include <sys/signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifndef __FreeBSD__
  #include <stdint.h>
++#endif
  #include <unistd.h>
  #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #include <math.h>
- #include <tonezone.h>
- #include <ctype.h>
+ #ifdef __linux__
diff --git a/net/asterisk12/files/patch-channels::h323::Makefile b/net/asterisk12/files/patch-channels::h323::Makefile
index a9159b4441c1..bc34083e2ff3 100644
--- a/net/asterisk12/files/patch-channels::h323::Makefile
+++ b/net/asterisk12/files/patch-channels::h323::Makefile
@@ -1,64 +1,38 @@
 
 $FreeBSD$
 
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+--- channels/h323/Makefile.orig	Tue Aug 31 16:32:11 2004
++++ channels/h323/Makefile	Sun Oct 10 15:25:42 2004
+@@ -53,7 +53,7 @@
+ LIBS+=-lpthread
+ endif
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS += -pthread
++CFLAGS += $(PTHREAD_LIBS)
+ endif
+ CFLAGS += -D_REENTRANT -D_GNU_SOURCE
  CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
+@@ -74,19 +74,19 @@
   
  
  ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
+-	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
++	$(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $<
  
  libchanh323.a:	ast_h323.o
  	ar cr libchanh323.a ast_h323.o
  
  chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB)
  
  chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)     -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB)
  
  chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
+-	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB)
  clean:
  	rm -f *.o *.so core.* libchanh323.a
  
diff --git a/net/asterisk12/files/patch-codecs::Makefile b/net/asterisk12/files/patch-codecs::Makefile
index b802dc1233e8..de9aff4c34fe 100644
--- a/net/asterisk12/files/patch-codecs::Makefile
+++ b/net/asterisk12/files/patch-codecs::Makefile
@@ -1,22 +1,23 @@
 
 $FreeBSD$
 
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
+--- codecs/Makefile.orig	Mon Jul 19 18:52:57 2004
++++ codecs/Makefile	Sun Oct 10 15:28:35 2004
+@@ -17,23 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+-MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
 +MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
++MODILBC=codec_ilbc.so
+ CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
++CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
  LIBG723B=g723.1b/libg723b.a
@@ -30,11 +31,11 @@ $FreeBSD$
  
 -CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
 +CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
+         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
+ 	codec_g726.so
  
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
+@@ -91,7 +91,7 @@
+ endif
  
  install: all
 -	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
diff --git a/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c
index 661ff2d88602..3ce9571013ec 100644
--- a/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c
+++ b/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g723_1_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g723_1_dummy.c	Sun Oct 10 16:07:05 2004
 @@ -0,0 +1,308 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -44,7 +44,7 @@ $FreeBSD$
 +#include "slin_g723_ex.h"
 +#include "g723_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
diff --git a/net/asterisk12/files/patch-codecs::codec_g729_dummy.c b/net/asterisk12/files/patch-codecs::codec_g729_dummy.c
index c3e27d98e27e..9fcc7b19ca35 100644
--- a/net/asterisk12/files/patch-codecs::codec_g729_dummy.c
+++ b/net/asterisk12/files/patch-codecs::codec_g729_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g729_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g729_dummy.c	Sun Oct 10 16:07:12 2004
 @@ -0,0 +1,275 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -38,7 +38,7 @@ $FreeBSD$
 +#include "slin_g729_ex.h"
 +#include "g729_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
diff --git a/net/asterisk12/files/patch-codecs::gsm::Makefile b/net/asterisk12/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk12/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk12/files/patch-codecs::lpc10::Makefile b/net/asterisk12/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 1674119a4836..000000000000
--- a/net/asterisk12/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Mon Mar 15 18:52:28 2004
-+++ codecs/lpc10/Makefile	Wed Apr 14 22:13:47 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,7 +22,7 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors and ALPHA too
-@@ -30,7 +30,7 @@
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
- ifneq ($(PROC),alpha)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+=
- endif
- endif
- endif
diff --git a/net/asterisk12/files/patch-db.c b/net/asterisk12/files/patch-db.c
index 59e5cef87770..6c2bdcd443c8 100644
--- a/net/asterisk12/files/patch-db.c
+++ b/net/asterisk12/files/patch-db.c
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
+--- db.c.orig	Fri Jul  9 13:08:09 2004
++++ db.c	Sun Oct 10 15:32:33 2004
+@@ -33,7 +33,7 @@
  #include <asterisk/cli.h>
+ #include <asterisk/utils.h>
+ #include <asterisk/lock.h>
 -#include "db1-ast/include/db.h"
 +#include <db.h>
  #include "asterisk.h"
diff --git a/net/asterisk12/files/patch-formats::format_g723_1.c b/net/asterisk12/files/patch-formats::format_g723_1.c
index 8d0755e14205..fb5eb12833dc 100644
--- a/net/asterisk12/files/patch-formats::format_g723_1.c
+++ b/net/asterisk12/files/patch-formats::format_g723_1.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
+--- formats/format_g723_1.c.orig	Sun Oct 10 15:59:18 2004
++++ formats/format_g723_1.c	Sun Oct 10 16:05:05 2004
 @@ -0,0 +1,345 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -57,7 +57,7 @@ $FreeBSD$
 +
 +static long g723_tell(struct ast_filestream *);
 +
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(g723_lock);
 +static int glistcnt = 0;
 +
 +static char *name = "g723";
diff --git a/net/asterisk12/files/patch-include::asterisk::utils.h b/net/asterisk12/files/patch-include::asterisk::utils.h
new file mode 100644
index 000000000000..a06f7d065c84
--- /dev/null
+++ b/net/asterisk12/files/patch-include::asterisk::utils.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- include/asterisk/utils.h	2004/10/10 12:55:50	1.1
++++ include/asterisk/utils.h	2004/10/10 12:56:43
+@@ -37,7 +37,6 @@
+ #ifdef inet_ntoa
+ #undef inet_ntoa
+ #endif
+-#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
+ 
+ #ifdef LINUX
+ #define ast_pthread_create pthread_create
diff --git a/net/asterisk12/files/patch-res::Makefile b/net/asterisk12/files/patch-res::Makefile
index ccd0a35dd59d..5700f04ea1ef 100644
--- a/net/asterisk12/files/patch-res::Makefile
+++ b/net/asterisk12/files/patch-res::Makefile
@@ -1,12 +1,21 @@
 
 $FreeBSD$
 
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
+--- res/Makefile.orig	Sat Jul 17 23:58:01 2004
++++ res/Makefile	Thu Oct 14 19:15:00 2004
+@@ -21,7 +21,7 @@
  
- install: all
+ CFLAGS+=
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
++CFLAGS+=-DZAPATA_MOH -I$(LOCALBASE)/include
+ #
+ # Work around buggy RedHat 9.0
+ #
+@@ -34,7 +34,7 @@
+ 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
 -	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
  
diff --git a/net/asterisk12/files/patch-rtp.c b/net/asterisk12/files/patch-rtp.c
index 11767dca198f..06289f357208 100644
--- a/net/asterisk12/files/patch-rtp.c
+++ b/net/asterisk12/files/patch-rtp.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- rtp.c.orig	Tue Nov 25 23:15:28 2003
-+++ rtp.c	Fri Jan 30 01:47:34 2004
-@@ -114,7 +114,7 @@
+--- rtp.c.orig	Sat Sep 18 16:56:28 2004
++++ rtp.c	Sun Oct 10 15:57:22 2004
+@@ -127,7 +127,7 @@
  {
  	switch(buf & TYPE_MASK) {
  	case TYPE_DONTSEND:
@@ -12,31 +12,15 @@ $FreeBSD$
  		break;
  	case TYPE_SILENCE:
  		return 4;
-@@ -1028,19 +1028,6 @@
- 		while((f = ast_smoother_read(rtp->smoother)))
- 			ast_rtp_raw_write(rtp, f, codec);
- 		break;
--	case AST_FORMAT_G729A:
--		if (!rtp->smoother) {
--			rtp->smoother = ast_smoother_new(20);
--		}
--		if (!rtp->smoother) {
--			ast_log(LOG_WARNING, "Unable to create g729 smoother :(\n");
--			return -1;
--		}
--		ast_smoother_feed(rtp->smoother, _f);
--		
--		while((f = ast_smoother_read(rtp->smoother)))
--			ast_rtp_raw_write(rtp, f, codec);
--		break;
- 	case AST_FORMAT_GSM:
- 		if (!rtp->smoother) {
- 			rtp->smoother = ast_smoother_new(33);
-@@ -1071,6 +1058,7 @@
- 	case AST_FORMAT_H261:
- 	case AST_FORMAT_H263:
- 	case AST_FORMAT_G723_1:
-+	case AST_FORMAT_G729A:
- 	case AST_FORMAT_SPEEX:
- 	        // Don't buffer outgoing frames; send them one-per-packet:
- 		if (_f->offset < hdrlen) {
+@@ -841,8 +841,10 @@
+ 		/* Must be an even port number by RTP spec */
+ 		rtp->us.sin_port = htons(x);
+ 		rtp->us.sin_addr = addr;
+-		if (rtp->rtcp)
++		if (rtp->rtcp) {
+ 			rtp->rtcp->us.sin_port = htons(x + 1);
++			rtp->rtcp->us.sin_addr = addr;
++		}
+ 		if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
+ 			(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
+ 			break;
diff --git a/net/asterisk12/pkg-plist b/net/asterisk12/pkg-plist
index eb427fa04447..f1519b3f3a39 100644
--- a/net/asterisk12/pkg-plist
+++ b/net/asterisk12/pkg-plist
@@ -7,6 +7,9 @@ etc/asterisk/adtranvofr.conf-dist
 @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
 etc/asterisk/agents.conf-dist
 @exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
+@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
+etc/asterisk/alarmreceiver.conf-dist
+@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf
 @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
 etc/asterisk/alsa.conf-dist
 @exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
@@ -16,18 +19,30 @@ etc/asterisk/asterisk.adsi-dist
 @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
 etc/asterisk/asterisk.conf-dist
 @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
+etc/asterisk/cdr_manager.conf-dist
+@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
 etc/asterisk/cdr_odbc.conf-dist
 @exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
 etc/asterisk/cdr_pgsql.conf-dist
 @exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
+etc/asterisk/cdr_tds.conf-dist
+@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf
 @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
 etc/asterisk/enum.conf-dist
 @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
+@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
+etc/asterisk/extconfig.conf-dist
+@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf
 @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
 etc/asterisk/extensions.conf-dist
 @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
+@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
+etc/asterisk/features.conf-dist
+@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
@@ -37,6 +52,9 @@ etc/asterisk/h323.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
+@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
+etc/asterisk/iaxprov.conf-dist
+@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf
 @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
 etc/asterisk/indications.conf-dist
 @exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
@@ -61,12 +79,12 @@ etc/asterisk/modules.conf-dist
 @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
 etc/asterisk/musiconhold.conf-dist
 @exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
+@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
+etc/asterisk/osp.conf-dist
+@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf
 @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
 etc/asterisk/oss.conf-dist
 @exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
 @unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
 etc/asterisk/phone.conf-dist
 @exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
@@ -76,6 +94,12 @@ etc/asterisk/privacy.conf-dist
 @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
 etc/asterisk/queues.conf-dist
 @exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
+@unexec if cmp -s %D/etc/asterisk/res_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi
+etc/asterisk/res_config_odbc.conf-dist
+@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.conf
+@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
+etc/asterisk/res_odbc.conf-dist
+@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
 etc/asterisk/rpt.conf-dist
 @exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
@@ -103,11 +127,13 @@ etc/asterisk/zapata.conf-dist
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
+include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/app.h
 include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
+include/asterisk/astosp.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
@@ -116,12 +142,14 @@ include/asterisk/channel_pvt.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/config.h
+include/asterisk/config_pvt.h
 include/asterisk/crypto.h
 include/asterisk/cvsid.h
 include/asterisk/dlfcn-compat.h
 include/asterisk/dns.h
 include/asterisk/dsp.h
 include/asterisk/enum.h
+include/asterisk/features.h
 include/asterisk/file.h
 include/asterisk/frame.h
 include/asterisk/fskmodem.h
@@ -138,10 +166,10 @@ include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
 include/asterisk/options.h
-include/asterisk/parking.h
 include/asterisk/pbx.h
 include/asterisk/poll-compat.h
 include/asterisk/privacy.h
+include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -150,30 +178,39 @@ include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/translate.h
 include/asterisk/ulaw.h
+include/asterisk/utils.h
 include/asterisk/vmodem.h
 lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
+lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
+lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
 lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_enumlookup.so
+lib/asterisk/modules/app_eval.so
+lib/asterisk/modules/app_exec.so
 lib/asterisk/modules/app_festival.so
+lib/asterisk/modules/app_flash.so
+lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
+lib/asterisk/modules/app_groupcount.so
 lib/asterisk/modules/app_hasnewvoicemail.so
+lib/asterisk/modules/app_ices.so
 lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_intercom.so
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+lib/asterisk/modules/app_meetme.so
 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_playback.so
 lib/asterisk/modules/app_privacy.so
@@ -184,20 +221,31 @@ lib/asterisk/modules/app_read.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
+lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so
 lib/asterisk/modules/app_setcdruserfield.so
 lib/asterisk/modules/app_setcidname.so
 lib/asterisk/modules/app_setcidnum.so
+lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_striplsd.so
 lib/asterisk/modules/app_substring.so
 lib/asterisk/modules/app_system.so
+lib/asterisk/modules/app_talkdetect.so
+lib/asterisk/modules/app_test.so
 lib/asterisk/modules/app_transfer.so
+lib/asterisk/modules/app_txtcidname.so
 lib/asterisk/modules/app_url.so
+lib/asterisk/modules/app_userevent.so
+lib/asterisk/modules/app_verbose.so
 lib/asterisk/modules/app_voicemail.so
 lib/asterisk/modules/app_waitforring.so
 lib/asterisk/modules/app_zapateller.so
+lib/asterisk/modules/app_zapbarge.so
+lib/asterisk/modules/app_zapras.so
+lib/asterisk/modules/app_zapscan.so
 lib/asterisk/modules/cdr_csv.so
+lib/asterisk/modules/cdr_manager.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax2.so
@@ -210,11 +258,12 @@ lib/asterisk/modules/chan_modem_i4l.so
 lib/asterisk/modules/chan_oss.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
-%%ZAPTEL%%lib/asterisk/modules/chan_zap.so
+lib/asterisk/modules/chan_zap.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g723_1_dummy.so
+lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_g729_dummy.so
 lib/asterisk/modules/codec_gsm.so
 lib/asterisk/modules/codec_ilbc.so
@@ -222,12 +271,15 @@ lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723_1.so
+lib/asterisk/modules/format_g726.so
 lib/asterisk/modules/format_g729.so
 lib/asterisk/modules/format_gsm.so
 lib/asterisk/modules/format_h263.so
+lib/asterisk/modules/format_ilbc.so
 lib/asterisk/modules/format_jpeg.so
 lib/asterisk/modules/format_pcm.so
 lib/asterisk/modules/format_pcm_alaw.so
+lib/asterisk/modules/format_sln.so
 lib/asterisk/modules/format_vox.so
 lib/asterisk/modules/format_wav.so
 lib/asterisk/modules/format_wav_gsm.so
@@ -235,20 +287,25 @@ lib/asterisk/modules/pbx_config.so
 lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/pbx_wilcalu.so
 lib/asterisk/modules/res_adsi.so
+lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_features.so
 lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
 sbin/asterisk
 sbin/astgenkey
 sbin/safe_asterisk
 share/asterisk/agi-bin/agi-test.agi
 share/asterisk/agi-bin/eagi-sphinx-test
 share/asterisk/agi-bin/eagi-test
+share/asterisk/firmware/iax/iaxy.bin
 share/asterisk/images/asterisk-intro.jpg
+share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
+share/asterisk/mohmp3/fpm-calm-river.mp3
+share/asterisk/mohmp3/fpm-sunshine.mp3
+share/asterisk/mohmp3/fpm-world-mix.mp3
 share/asterisk/sounds/agent-alreadyon.gsm
 share/asterisk/sounds/agent-incorrect.gsm
 share/asterisk/sounds/agent-loggedoff.gsm
@@ -259,12 +316,23 @@ share/asterisk/sounds/agent-user.gsm
 share/asterisk/sounds/auth-incorrect.gsm
 share/asterisk/sounds/auth-thankyou.gsm
 share/asterisk/sounds/beep.gsm
+share/asterisk/sounds/conf-adminmenu.gsm
+share/asterisk/sounds/conf-enteringno.gsm
+share/asterisk/sounds/conf-errormenu.gsm
 share/asterisk/sounds/conf-getchannel.gsm
 share/asterisk/sounds/conf-getconfno.gsm
 share/asterisk/sounds/conf-getpin.gsm
 share/asterisk/sounds/conf-invalid.gsm
 share/asterisk/sounds/conf-invalidpin.gsm
+share/asterisk/sounds/conf-kicked.gsm
+share/asterisk/sounds/conf-locked.gsm
+share/asterisk/sounds/conf-lockednow.gsm
+share/asterisk/sounds/conf-muted.gsm
+share/asterisk/sounds/conf-noempty.gsm
 share/asterisk/sounds/conf-onlyperson.gsm
+share/asterisk/sounds/conf-unlockednow.gsm
+share/asterisk/sounds/conf-unmuted.gsm
+share/asterisk/sounds/conf-usermenu.gsm
 share/asterisk/sounds/demo-abouttotry.gsm
 share/asterisk/sounds/demo-congrats.gsm
 share/asterisk/sounds/demo-echodone.gsm
@@ -359,16 +427,88 @@ share/asterisk/sounds/digits/tomorrow.gsm
 share/asterisk/sounds/digits/yesterday.gsm
 share/asterisk/sounds/dir-instr.gsm
 share/asterisk/sounds/dir-intro.gsm
+share/asterisk/sounds/dir-intro-fn.gsm
 share/asterisk/sounds/dir-nomatch.gsm
 share/asterisk/sounds/dir-nomore.gsm
 share/asterisk/sounds/invalid.gsm
+share/asterisk/sounds/letters/a.gsm
+share/asterisk/sounds/letters/at.gsm
+share/asterisk/sounds/letters/b.gsm
+share/asterisk/sounds/letters/c.gsm
+share/asterisk/sounds/letters/d.gsm
+share/asterisk/sounds/letters/dash.gsm
+share/asterisk/sounds/letters/dollar.gsm
+share/asterisk/sounds/letters/dot.gsm
+share/asterisk/sounds/letters/e.gsm
+share/asterisk/sounds/letters/equals.gsm
+share/asterisk/sounds/letters/exclaimation-point.gsm
+share/asterisk/sounds/letters/f.gsm
+share/asterisk/sounds/letters/g.gsm
+share/asterisk/sounds/letters/h.gsm
+share/asterisk/sounds/letters/i.gsm
+share/asterisk/sounds/letters/j.gsm
+share/asterisk/sounds/letters/k.gsm
+share/asterisk/sounds/letters/l.gsm
+share/asterisk/sounds/letters/m.gsm
+share/asterisk/sounds/letters/n.gsm
+share/asterisk/sounds/letters/o.gsm
+share/asterisk/sounds/letters/p.gsm
+share/asterisk/sounds/letters/plus.gsm
+share/asterisk/sounds/letters/q.gsm
+share/asterisk/sounds/letters/r.gsm
+share/asterisk/sounds/letters/s.gsm
+share/asterisk/sounds/letters/slash.gsm
+share/asterisk/sounds/letters/space.gsm
+share/asterisk/sounds/letters/t.gsm
+share/asterisk/sounds/letters/u.gsm
+share/asterisk/sounds/letters/v.gsm
+share/asterisk/sounds/letters/w.gsm
+share/asterisk/sounds/letters/x.gsm
+share/asterisk/sounds/letters/y.gsm
+share/asterisk/sounds/letters/z.gsm
+share/asterisk/sounds/letters/zed.gsm
 share/asterisk/sounds/pbx-invalid.gsm
 share/asterisk/sounds/pbx-invalidpark.gsm
 share/asterisk/sounds/pbx-transfer.gsm
+share/asterisk/sounds/phonetic/9_p.gsm
+share/asterisk/sounds/phonetic/a_p.gsm
+share/asterisk/sounds/phonetic/b_p.gsm
+share/asterisk/sounds/phonetic/c_p.gsm
+share/asterisk/sounds/phonetic/d_p.gsm
+share/asterisk/sounds/phonetic/e_p.gsm
+share/asterisk/sounds/phonetic/f_p.gsm
+share/asterisk/sounds/phonetic/g_p.gsm
+share/asterisk/sounds/phonetic/h_p.gsm
+share/asterisk/sounds/phonetic/i_p.gsm
+share/asterisk/sounds/phonetic/j_p.gsm
+share/asterisk/sounds/phonetic/k_p.gsm
+share/asterisk/sounds/phonetic/l_p.gsm
+share/asterisk/sounds/phonetic/m_p.gsm
+share/asterisk/sounds/phonetic/n_p.gsm
+share/asterisk/sounds/phonetic/o_p.gsm
+share/asterisk/sounds/phonetic/p_p.gsm
+share/asterisk/sounds/phonetic/q_p.gsm
+share/asterisk/sounds/phonetic/r_p.gsm
+share/asterisk/sounds/phonetic/s_p.gsm
+share/asterisk/sounds/phonetic/t_p.gsm
+share/asterisk/sounds/phonetic/u_p.gsm
+share/asterisk/sounds/phonetic/v_p.gsm
+share/asterisk/sounds/phonetic/w_p.gsm
+share/asterisk/sounds/phonetic/x_p.gsm
+share/asterisk/sounds/phonetic/y_p.gsm
+share/asterisk/sounds/phonetic/z_p.gsm
 share/asterisk/sounds/privacy-incorrect.gsm
 share/asterisk/sounds/privacy-prompt.gsm
 share/asterisk/sounds/privacy-thankyou.gsm
 share/asterisk/sounds/privacy-unident.gsm
+share/asterisk/sounds/queue-callswaiting.gsm
+share/asterisk/sounds/queue-holdtime.gsm
+share/asterisk/sounds/queue-less-than.gsm
+share/asterisk/sounds/queue-minutes.gsm
+share/asterisk/sounds/queue-seconds.gsm
+share/asterisk/sounds/queue-thankyou.gsm
+share/asterisk/sounds/queue-thereare.gsm
+share/asterisk/sounds/queue-youarenext.gsm
 share/asterisk/sounds/ss-noservice.gsm
 share/asterisk/sounds/transfer.gsm
 share/asterisk/sounds/tt-allbusy.gsm
@@ -387,22 +527,31 @@ share/asterisk/sounds/vm-Friends.gsm
 share/asterisk/sounds/vm-INBOX.gsm
 share/asterisk/sounds/vm-Old.gsm
 share/asterisk/sounds/vm-Work.gsm
+share/asterisk/sounds/vm-advopts.gsm
 share/asterisk/sounds/vm-and.gsm
+share/asterisk/sounds/vm-calldiffnum.gsm
 share/asterisk/sounds/vm-changeto.gsm
 share/asterisk/sounds/vm-delete.gsm
 share/asterisk/sounds/vm-deleted.gsm
+share/asterisk/sounds/vm-dialout.gsm
+share/asterisk/sounds/vm-enter-num-to-call.gsm
 share/asterisk/sounds/vm-extension.gsm
 share/asterisk/sounds/vm-first.gsm
 share/asterisk/sounds/vm-for.gsm
 share/asterisk/sounds/vm-forwardoptions.gsm
+share/asterisk/sounds/vm-from-extension.gsm
+share/asterisk/sounds/vm-from-phonenumber.gsm
+share/asterisk/sounds/vm-from.gsm
 share/asterisk/sounds/vm-goodbye.gsm
 share/asterisk/sounds/vm-helpexit.gsm
 share/asterisk/sounds/vm-incorrect.gsm
+share/asterisk/sounds/vm-incorrect-mailbox.gsm
 share/asterisk/sounds/vm-instructions.gsm
 share/asterisk/sounds/vm-intro.gsm
 share/asterisk/sounds/vm-isonphone.gsm
 share/asterisk/sounds/vm-isunavail.gsm
 share/asterisk/sounds/vm-last.gsm
+share/asterisk/sounds/vm-leavemsg.gsm
 share/asterisk/sounds/vm-login.gsm
 share/asterisk/sounds/vm-mailboxfull.gsm
 share/asterisk/sounds/vm-message.gsm
@@ -414,7 +563,10 @@ share/asterisk/sounds/vm-newpassword.gsm
 share/asterisk/sounds/vm-next.gsm
 share/asterisk/sounds/vm-no.gsm
 share/asterisk/sounds/vm-nobodyavail.gsm
+share/asterisk/sounds/vm-nobox.gsm
 share/asterisk/sounds/vm-nomore.gsm
+share/asterisk/sounds/vm-nonumber.gsm
+share/asterisk/sounds/vm-num-i-have.gsm
 share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-options.gsm
 share/asterisk/sounds/vm-opts.gsm
@@ -422,30 +574,49 @@ share/asterisk/sounds/vm-passchanged.gsm
 share/asterisk/sounds/vm-password.gsm
 share/asterisk/sounds/vm-press.gsm
 share/asterisk/sounds/vm-prev.gsm
+share/asterisk/sounds/vm-reachoper.gsm
 share/asterisk/sounds/vm-rec-busy.gsm
 share/asterisk/sounds/vm-rec-name.gsm
 share/asterisk/sounds/vm-rec-unv.gsm
 share/asterisk/sounds/vm-received.gsm
 share/asterisk/sounds/vm-reenterpassword.gsm
 share/asterisk/sounds/vm-repeat.gsm
+share/asterisk/sounds/vm-review.gsm
 share/asterisk/sounds/vm-saved.gsm
 share/asterisk/sounds/vm-savedto.gsm
 share/asterisk/sounds/vm-savefolder.gsm
 share/asterisk/sounds/vm-savemessage.gsm
 share/asterisk/sounds/vm-sorry.gsm
+share/asterisk/sounds/vm-star-cancel.gsm
+share/asterisk/sounds/vm-starmain.gsm
+share/asterisk/sounds/vm-then-pound.gsm
 share/asterisk/sounds/vm-theperson.gsm
+share/asterisk/sounds/vm-tocallback.gsm
+share/asterisk/sounds/vm-tocallnum.gsm
 share/asterisk/sounds/vm-tocancel.gsm
+share/asterisk/sounds/vm-tocancelmsg.gsm
+share/asterisk/sounds/vm-toenternumber.gsm
 share/asterisk/sounds/vm-toforward.gsm
+share/asterisk/sounds/vm-tohearenv.gsm
+share/asterisk/sounds/vm-tomakecall.gsm
+share/asterisk/sounds/vm-tooshort.gsm
+share/asterisk/sounds/vm-toreply.gsm
+share/asterisk/sounds/vm-torerecord.gsm
 share/asterisk/sounds/vm-undelete.gsm
 share/asterisk/sounds/vm-undeleted.gsm
+share/asterisk/sounds/vm-unknown-caller.gsm
 share/asterisk/sounds/vm-whichbox.gsm
 share/asterisk/sounds/vm-youhave.gsm
 share/asterisk/sounds/voicemail
+@dirrm share/asterisk/sounds/phonetic
+@dirrm share/asterisk/sounds/letters
 @dirrm share/asterisk/sounds/digits
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/mohmp3
 @dirrm share/asterisk/keys
 @dirrm share/asterisk/images
+@dirrm share/asterisk/firmware/iax
+@dirrm share/asterisk/firmware
 @dirrm share/asterisk/agi-bin
 @dirrm share/asterisk
 @dirrm lib/asterisk/modules
@@ -463,6 +634,7 @@ spool/asterisk/voicemail/default/1234/unavail.gsm
 @dirrm spool/asterisk/voicemail/default/1234
 @dirrm spool/asterisk/voicemail/default
 @dirrm spool/asterisk/voicemail
+@dirrm spool/asterisk/tmp
 @dirrm spool/asterisk
 @dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 420c2dcfe4e7..3f24e2ef57a9 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -17,11 +16,13 @@ COMMENT=	An Open Source PBX and telephony toolkit
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
 		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
@@ -35,14 +36,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
-.include <bsd.port.pre.mk>
+MAN8=		asterisk.8
 
-.if defined(WITH_ZAPTEL) || exists(${LOCALBASE}/include/zaptel.h)
-BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-PLIST_SUB=	ZAPTEL=""
-.else
-PLIST_SUB=	ZAPTEL="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo
index a12f4a79e431..d7661cced0c6 100644
--- a/net/asterisk14/distinfo
+++ b/net/asterisk14/distinfo
@@ -1,2 +1,2 @@
-MD5 (asterisk-0.9.0.tar.gz) = cb0fbb5185fdf2356ee30bdcf4ad9b9c
-SIZE (asterisk-0.9.0.tar.gz) = 2787458
+MD5 (asterisk-1.0.1.tar.gz) = cb55b1a0be8ff6e94179db0cdc7e074d
+SIZE (asterisk-1.0.1.tar.gz) = 9558497
diff --git a/net/asterisk14/files/patch-Makefile b/net/asterisk14/files/patch-Makefile
index 94155a666be0..43bf910fe669 100644
--- a/net/asterisk14/files/patch-Makefile
+++ b/net/asterisk14/files/patch-Makefile
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- Makefile.orig	Thu Apr  1 01:43:10 2004
-+++ Makefile	Wed Apr 14 22:08:43 2004
-@@ -43,10 +43,10 @@
+--- Makefile.orig	Tue Sep 28 20:11:30 2004
++++ Makefile	Thu Oct 14 19:48:30 2004
+@@ -62,10 +62,10 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
  
  #Include debug symbols in the executables (-g) and profiling info (-pg)
 -DEBUG=-g #-pg
 +#DEBUG=-g #-pg
  
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
+ # If you are running a radio application, define RADIO_RELAX so that the DTMF
+ # will be received more reliably
+@@ -90,7 +90,7 @@
  
  # Where to install asterisk after compiling
  # Default -> leave empty
@@ -25,7 +25,7 @@ $FreeBSD$
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -88,28 +88,27 @@
+@@ -110,23 +110,23 @@
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
@@ -44,36 +44,45 @@ $FreeBSD$
 -ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
 -ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
 -ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+-ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 +ASTBINDIR=$(INSTALL_PREFIX)/bin
 +ASTSBINDIR=$(INSTALL_PREFIX)/sbin
 +ASTVARRUNDIR=/var/run
++ASTMANDIR=$(INSTALL_PREFIX)/man
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
- INCLUDE=-Iinclude -I../include 
+ INCLUDE=-Iinclude -I../include
 -CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
- CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ 
+ ifneq ($(PROC),ultrasparc)
+@@ -137,11 +137,8 @@
+ CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
+ 
  ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
+-OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 -INCLUDE+=-I/usr/local/include
+-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 +CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +150,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +178,7 @@
++LIBS+=$(PTHREAD_LIBS)
+ endif # FreeBSD
+ 
+ ifeq (${OSARCH},NetBSD)
+@@ -157,7 +154,7 @@
+ #CFLAGS+=-DOLD_DSP_ROUTINES
+ 
+ CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
++CFLAGS+=-I$(LOCALBASE)/include -DZAPTEL_OPTIMIZATIONS
+ 
+ LIBEDIT=editline/libedit.a
+ 
+@@ -219,7 +216,7 @@
  SOLINK=-shared -Xlinker -x
  endif
  
@@ -82,7 +91,16 @@ $FreeBSD$
  INSTALL=install
  
  _all: all
-@@ -200,13 +199,13 @@
+@@ -231,7 +228,7 @@
+ 	@echo " +               $(MAKE) install                +"  
+ 	@echo " +-------------------------------------------+"  
+ 
+-all: depend asterisk subdirs 
++all: depend asterisk subdirs manpage
+ 
+ editline/config.h:
+ 	cd editline && unset CFLAGS LIBS && ./configure ; \
+@@ -240,13 +237,13 @@
  	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  	$(MAKE) -C editline libedit.a
  
@@ -103,18 +121,35 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
  include .depend
-@@ -244,8 +243,8 @@
+@@ -268,13 +265,10 @@
+ 
+ asterisk.o: asterisk.c build.h
+ 
+-manpage: asterisk.8.gz
++manpage: asterisk.8
+ 
+-asterisk.8.gz: asterisk.sgml
+-	rm -f asterisk.8
+-	docbook2man asterisk.sgml
+-	mv ./*.8 asterisk.8
+-	gzip asterisk.8
++asterisk.8: asterisk.8.gz
++	gzcat asterisk.8.gz > asterisk.8
+ 
+ ifneq ($(strip $(ASTERISKVERSION)),)
+ build.h: .version
+@@ -292,8 +286,8 @@
  		exit 1; \
  	fi
  
 -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+-	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
 +asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
++	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS)
  
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +259,10 @@
+ muted: muted.o
+ 	$(CC) -o muted muted.o
+@@ -312,28 +306,28 @@
  	$(MAKE) -C stdtime clean
  
  datafiles: all
@@ -127,9 +162,31 @@ $FreeBSD$
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -271,18 +270,18 @@
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ 	for x in sounds/letters/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ 	for x in sounds/phonetic/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+@@ -341,18 +335,18 @@
  	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
+ 	for x in 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-*; do \
  		if grep -q "^%`basename $$x`%" sounds.txt; then \
 -			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 +			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
@@ -151,7 +208,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -294,105 +293,74 @@
+@@ -364,111 +358,86 @@
  	fi
  
  bininstall: all
@@ -162,6 +219,7 @@ $FreeBSD$
 -	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
@@ -171,6 +229,7 @@ $FreeBSD$
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
@@ -191,19 +250,34 @@ $FreeBSD$
 -		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
 -	fi
 -	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 -	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
++	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	if [ -d contrib/firmware/iax ]; then \
+-		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ 	else \
+ 		echo "You need to do cvs update -d not just cvs update" ; \
+ 	fi 
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
+-	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -225,13 +299,8 @@ $FreeBSD$
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
@@ -294,8 +363,31 @@ $FreeBSD$
 -		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
  	done
+ 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	:> $(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 ; \
+@@ -483,7 +452,7 @@
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
+ 	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
+-	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk
++	$(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk
+ 	for x in images/*.gif; do \
+ 		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
+ 	done
+@@ -503,10 +472,10 @@
+ 
+ __rpm: _version
+ 	rm -rf /tmp/asterisk ; \
+-	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++	$(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
+-	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++	$(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+ 	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
+ 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
diff --git a/net/asterisk14/files/patch-agi::Makefile b/net/asterisk14/files/patch-agi::Makefile
index 567c30f5624e..32efb5d2b101 100644
--- a/net/asterisk14/files/patch-agi::Makefile
+++ b/net/asterisk14/files/patch-agi::Makefile
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
+--- agi/Makefile.orig	Tue Jun 22 20:42:13 2004
++++ agi/Makefile	Tue Oct  5 21:03:40 2004
+@@ -11,15 +11,18 @@
  # the GNU General Public License
  #
  
@@ -24,12 +24,4 @@ $FreeBSD$
 +	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
  
  eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
+ 	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
diff --git a/net/asterisk14/files/patch-apps::Makefile b/net/asterisk14/files/patch-apps::Makefile
index 901ba694c33a..00b77dfe2434 100644
--- a/net/asterisk14/files/patch-apps::Makefile
+++ b/net/asterisk14/files/patch-apps::Makefile
@@ -1,22 +1,24 @@
 
 $FreeBSD$
 
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
+--- apps/Makefile.orig	Sat Sep 25 00:32:56 2004
++++ apps/Makefile	Sun Oct 10 16:20:06 2004
+@@ -40,7 +40,7 @@
+ #APPS+=app_rpt.so
+ 
+ APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+-APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
++APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+ APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+ 
+ CFLAGS+=-fPIC
+@@ -65,12 +65,12 @@
  	$(CC) $(SOLINK) -o $@ $< -ltonezone
  
  install: all
 -	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
  
  app_voicemail.so : app_voicemail.o
  ifeq ($(USE_MYSQL_VM_INTERFACE),1)
@@ -25,11 +27,22 @@ $FreeBSD$
  else
  ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
  	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
+@@ -80,16 +80,16 @@
+ endif
+ 
+ app_sql_postgres.o: app_sql_postgres.c
+-	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
++	$(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ 
+ app_sql_postgres.so: app_sql_postgres.o
+-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/pgsql/lib -lpq
++	$(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq
+ 
+ app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ $< -lodbc
  
  look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
+-	$(CC) -pipe -O6 -g look.c -o look -lncurses
 +	$(CC) $(CFLAGS) look.c -o look -lncurses
  
  ifneq ($(wildcard .depend),)
diff --git a/net/asterisk14/files/patch-apps::app_intercom.c b/net/asterisk14/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk14/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk14/files/patch-astman::Makefile b/net/asterisk14/files/patch-astman::Makefile
index cf31005257cf..2745860cdd36 100644
--- a/net/asterisk14/files/patch-astman::Makefile
+++ b/net/asterisk14/files/patch-astman::Makefile
@@ -1,9 +1,20 @@
 
 $FreeBSD$
 
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
+--- astman/Makefile.orig	Sat Jun 26 22:25:39 2004
++++ astman/Makefile	Thu Oct 14 19:14:22 2004
+@@ -5,16 +5,16 @@
+ 
+ OSARCH=$(shell uname -s)
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS+=-I/usr/local/include -L/usr/local/lib
++CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib
+ endif
+ 
+-TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi)
++TARGET=astman
+ all: depend $(TARGET)
+ 
  install:
  	if [ "$(TARGET)" != "none" ]; then \
  		for x in $(TARGET); do \
diff --git a/net/asterisk14/files/patch-cdr::Makefile b/net/asterisk14/files/patch-cdr::Makefile
index 2ede608f9019..f646d2c9a3dc 100644
--- a/net/asterisk14/files/patch-cdr::Makefile
+++ b/net/asterisk14/files/patch-cdr::Makefile
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
+--- cdr/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ cdr/Makefile	Thu Oct 14 19:13:38 2004
+@@ -21,7 +21,7 @@
+ OSARCH=$(shell uname -s)
+ 
+ ifeq (${OSARCH},FreeBSD)
+-SOLINK+=-L/usr/local/lib
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+@@ -71,7 +71,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile
index fd855e7a2710..98caab3a33d6 100644
--- a/net/asterisk14/files/patch-channels::Makefile
+++ b/net/asterisk14/files/patch-channels::Makefile
@@ -1,53 +1,62 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Thu Mar 25 11:43:36 2004
-+++ channels/Makefile	Thu Apr 29 14:36:36 2004
-@@ -33,12 +33,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
+--- channels/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ channels/Makefile	Sun Oct 10 16:18:05 2004
+@@ -57,10 +57,10 @@
+ 
+ endif
+ ifeq (${OSARCH},FreeBSD)
+-PTLIB=-lpt_FreeBSD_x86_r
+-H323LIB=-lh323_FreeBSD_x86_r
+-CHANH323LIB=-pthread
+-SOLINK+=-L/usr/local/lib
++PTLIB=-lpt_FreeBSD_x86_r_s
++H323LIB=-lh323_FreeBSD_x86_r_s
++CHANH323LIB=
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ ifeq (${OSARCH},NetBSD)
+ PTLIB=-lpt_NetBSD_x86_r
+@@ -72,8 +72,8 @@
+ endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so)
 +CHANNEL_LIBS+=chan_h323.so
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -48,7 +46,7 @@
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+@@ -84,7 +84,7 @@
  ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 +CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
  CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
  
-@@ -69,7 +67,7 @@
- 
+@@ -107,7 +107,7 @@
  ZAPDIR=/usr/lib
  
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so")
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
  
-@@ -110,10 +108,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
+@@ -156,6 +156,8 @@
  chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
+ 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+ endif
++chan_oss.so: chan_oss.o
 +	$(CC) $(SOLINK) -o $@ chan_oss.o
  
- chan_iax2.so: chan_iax2.o iax2-parser.o
+ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -133,7 +129,7 @@
+@@ -175,7 +177,7 @@
  	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
  
  chan_zap.so: chan_zap.o
@@ -55,15 +64,15 @@ $FreeBSD$
 +	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone
  
  chan_sip.so: chan_sip.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -157,16 +153,17 @@
+ ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+@@ -199,15 +201,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
+-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(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
++	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
@@ -73,8 +82,7 @@ $FreeBSD$
  
  install: all
 -	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 +	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
+ 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
  
  depend: .depend
- 
diff --git a/net/asterisk14/files/patch-channels::chan_h323.c b/net/asterisk14/files/patch-channels::chan_h323.c
index e413bd8ecec8..de2ed3978663 100644
--- a/net/asterisk14/files/patch-channels::chan_h323.c
+++ b/net/asterisk14/files/patch-channels::chan_h323.c
@@ -1,13 +1,14 @@
 
 $FreeBSD$
 
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
+--- channels/chan_h323.c	2004/10/10 13:00:17	1.1
++++ channels/chan_h323.c	2004/10/10 13:00:39
+@@ -26,7 +26,7 @@
+  * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $
+  */
  
+-
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
diff --git a/net/asterisk14/files/patch-channels::chan_iax2.c b/net/asterisk14/files/patch-channels::chan_iax2.c
deleted file mode 100644
index 9127bee41cb6..000000000000
--- a/net/asterisk14/files/patch-channels::chan_iax2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_iax2.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_iax2.c	2004/04/29 21:37:10
-@@ -52,7 +52,7 @@
- #include <sys/stat.h>
- #ifdef IAX_TRUNKING
- #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #endif
- #ifdef MYSQL_FRIENDS
- #include <mysql/mysql.h>
diff --git a/net/asterisk14/files/patch-channels::chan_oss.c b/net/asterisk14/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk14/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk14/files/patch-channels::chan_sip.c b/net/asterisk14/files/patch-channels::chan_sip.c
index b98f9d185009..521d6a46d256 100644
--- a/net/asterisk14/files/patch-channels::chan_sip.c
+++ b/net/asterisk14/files/patch-channels::chan_sip.c
@@ -1,26 +1,26 @@
 
 $FreeBSD$
 
---- channels/chan_sip.c.orig	Wed Jan 14 08:10:53 2004
-+++ channels/chan_sip.c	Fri Jan 30 01:47:34 2004
-@@ -124,7 +124,7 @@
- static int restart_monitor(void);
+--- channels/chan_sip.c.orig
++++ channels/chan_sip.c
+@@ -139,7 +139,7 @@
  
- /* Codecs that we support by default: */
--static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
-+static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263 | AST_FORMAT_G723_1 | AST_FORMAT_G729A;
- static int noncodeccapability = AST_RTP_DTMF;
+ static char default_language[MAX_LANGUAGE] = "";
  
- static char ourhost[256];
-@@ -176,6 +176,7 @@
+-static char default_callerid[AST_MAX_EXTENSION] = "asterisk";
++static char default_callerid[AST_MAX_EXTENSION] = "Unknown";
+ 
+ static char default_fromdomain[AST_MAX_EXTENSION] = "";
+ 
+@@ -244,6 +244,7 @@
  struct sip_route {
  	struct sip_route *next;
  	char hop[0];
 +	int lr;
  };
  
- static struct sip_pvt {
-@@ -3417,6 +3418,10 @@
+ struct sip_history {
+@@ -4573,6 +4574,10 @@
  			/* Make a struct route */
  			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
  			if (thishop) {
@@ -28,17 +28,17 @@ $FreeBSD$
 +					thishop->lr = 1;
 +				else
 +					thishop->lr = 0;
- 				strncpy(thishop->hop, rr, len);
+ 				strncpy(thishop->hop, rr, len); /* safe */
  				thishop->hop[len] = '\0';
  				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
-@@ -3440,31 +3445,41 @@
+@@ -4596,31 +4601,41 @@
  			rr += len+1;
  		}
  	}
 -	/* 2nd append the Contact: if there is one */
 -	/* Can be multiple Contact headers, comma separated values - we just take the first */
 -	contact = get_header(req, "Contact");
--	if (strlen(contact)) {
+-	if (!ast_strlen_zero(contact)) {
 -		ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 -		/* Look for <: delimited address */
 -		c = strchr(contact, '<');
@@ -55,7 +55,7 @@ $FreeBSD$
 +	if (head && head->lr) {
 +		thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1);
  		if (thishop) {
--			strncpy(thishop->hop, c, len);
+-			strncpy(thishop->hop, c, len); /* safe */
 -			thishop->hop[len] = '\0';
 -			thishop->next = NULL;
 -			/* Goes at the end */
@@ -71,7 +71,7 @@ $FreeBSD$
 +		/* Append the Contact: if there is one and first route is w/o `lr' param */
 +		/* Can be multiple Contact headers, comma separated values - we just take the first */
 +		contact = get_header(req, "Contact");
-+		if (strlen(contact)) {
++		if (!ast_strlen_zero(contact)) {
 +			ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 +			/* Look for <: delimited address */
 +			c = strchr(contact, '<');
@@ -85,7 +85,7 @@ $FreeBSD$
 +			}
 +			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
 +			if (thishop) {
-+				strncpy(thishop->hop, c, len);
++				strncpy(thishop->hop, c, len); /* safe */
 +				thishop->hop[len] = '\0';
 +				thishop->next = NULL;
 +				/* Goes at the end */
@@ -97,7 +97,7 @@ $FreeBSD$
  		}
  	}
  	/* Store as new route */
-@@ -5143,7 +5158,11 @@
+@@ -7197,7 +7212,11 @@
  			/* Get destination right away */
  			gotdest = get_destination(p, NULL);
  			get_rdnis(p, NULL);
@@ -110,8 +110,8 @@ $FreeBSD$
  			build_contact(p);
  
  			if (gotdest) {
-@@ -5165,7 +5184,6 @@
- 				c = sip_new(p, AST_STATE_DOWN, strlen(p->username) ? p->username : NULL);
+@@ -7225,7 +7244,6 @@
+ 				c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
  				*recount = 1;
  				/* Save Record-Route for any later requests we make on this dialogue */
 -				build_route(p, req, 0);
diff --git a/net/asterisk14/files/patch-channels::chan_zap.c b/net/asterisk14/files/patch-channels::chan_zap.c
index e5a3ffc6afec..965a643bb687 100644
--- a/net/asterisk14/files/patch-channels::chan_zap.c
+++ b/net/asterisk14/files/patch-channels::chan_zap.c
@@ -1,14 +1,15 @@
 
 $FreeBSD$
 
---- channels/chan_zap.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_zap.c	2004/04/29 21:37:17
-@@ -45,7 +45,7 @@
+--- channels/chan_zap.c
++++ channels/chan_zap.c
+@@ -42,7 +42,9 @@
+ #include <sys/signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifndef __FreeBSD__
  #include <stdint.h>
++#endif
  #include <unistd.h>
  #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #include <math.h>
- #include <tonezone.h>
- #include <ctype.h>
+ #ifdef __linux__
diff --git a/net/asterisk14/files/patch-channels::h323::Makefile b/net/asterisk14/files/patch-channels::h323::Makefile
index a9159b4441c1..bc34083e2ff3 100644
--- a/net/asterisk14/files/patch-channels::h323::Makefile
+++ b/net/asterisk14/files/patch-channels::h323::Makefile
@@ -1,64 +1,38 @@
 
 $FreeBSD$
 
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+--- channels/h323/Makefile.orig	Tue Aug 31 16:32:11 2004
++++ channels/h323/Makefile	Sun Oct 10 15:25:42 2004
+@@ -53,7 +53,7 @@
+ LIBS+=-lpthread
+ endif
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS += -pthread
++CFLAGS += $(PTHREAD_LIBS)
+ endif
+ CFLAGS += -D_REENTRANT -D_GNU_SOURCE
  CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
+@@ -74,19 +74,19 @@
   
  
  ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
+-	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
++	$(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $<
  
  libchanh323.a:	ast_h323.o
  	ar cr libchanh323.a ast_h323.o
  
  chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB)
  
  chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)     -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB)
  
  chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
+-	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB)
  clean:
  	rm -f *.o *.so core.* libchanh323.a
  
diff --git a/net/asterisk14/files/patch-codecs::Makefile b/net/asterisk14/files/patch-codecs::Makefile
index b802dc1233e8..de9aff4c34fe 100644
--- a/net/asterisk14/files/patch-codecs::Makefile
+++ b/net/asterisk14/files/patch-codecs::Makefile
@@ -1,22 +1,23 @@
 
 $FreeBSD$
 
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
+--- codecs/Makefile.orig	Mon Jul 19 18:52:57 2004
++++ codecs/Makefile	Sun Oct 10 15:28:35 2004
+@@ -17,23 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+-MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
 +MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
++MODILBC=codec_ilbc.so
+ CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
++CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
  LIBG723B=g723.1b/libg723b.a
@@ -30,11 +31,11 @@ $FreeBSD$
  
 -CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
 +CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
+         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
+ 	codec_g726.so
  
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
+@@ -91,7 +91,7 @@
+ endif
  
  install: all
 -	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
diff --git a/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c
index 661ff2d88602..3ce9571013ec 100644
--- a/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c
+++ b/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g723_1_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g723_1_dummy.c	Sun Oct 10 16:07:05 2004
 @@ -0,0 +1,308 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -44,7 +44,7 @@ $FreeBSD$
 +#include "slin_g723_ex.h"
 +#include "g723_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
diff --git a/net/asterisk14/files/patch-codecs::codec_g729_dummy.c b/net/asterisk14/files/patch-codecs::codec_g729_dummy.c
index c3e27d98e27e..9fcc7b19ca35 100644
--- a/net/asterisk14/files/patch-codecs::codec_g729_dummy.c
+++ b/net/asterisk14/files/patch-codecs::codec_g729_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g729_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g729_dummy.c	Sun Oct 10 16:07:12 2004
 @@ -0,0 +1,275 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -38,7 +38,7 @@ $FreeBSD$
 +#include "slin_g729_ex.h"
 +#include "g729_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
diff --git a/net/asterisk14/files/patch-codecs::gsm::Makefile b/net/asterisk14/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk14/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk14/files/patch-codecs::lpc10::Makefile b/net/asterisk14/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 1674119a4836..000000000000
--- a/net/asterisk14/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Mon Mar 15 18:52:28 2004
-+++ codecs/lpc10/Makefile	Wed Apr 14 22:13:47 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,7 +22,7 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors and ALPHA too
-@@ -30,7 +30,7 @@
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
- ifneq ($(PROC),alpha)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+=
- endif
- endif
- endif
diff --git a/net/asterisk14/files/patch-db.c b/net/asterisk14/files/patch-db.c
index 59e5cef87770..6c2bdcd443c8 100644
--- a/net/asterisk14/files/patch-db.c
+++ b/net/asterisk14/files/patch-db.c
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
+--- db.c.orig	Fri Jul  9 13:08:09 2004
++++ db.c	Sun Oct 10 15:32:33 2004
+@@ -33,7 +33,7 @@
  #include <asterisk/cli.h>
+ #include <asterisk/utils.h>
+ #include <asterisk/lock.h>
 -#include "db1-ast/include/db.h"
 +#include <db.h>
  #include "asterisk.h"
diff --git a/net/asterisk14/files/patch-formats::format_g723_1.c b/net/asterisk14/files/patch-formats::format_g723_1.c
index 8d0755e14205..fb5eb12833dc 100644
--- a/net/asterisk14/files/patch-formats::format_g723_1.c
+++ b/net/asterisk14/files/patch-formats::format_g723_1.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
+--- formats/format_g723_1.c.orig	Sun Oct 10 15:59:18 2004
++++ formats/format_g723_1.c	Sun Oct 10 16:05:05 2004
 @@ -0,0 +1,345 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -57,7 +57,7 @@ $FreeBSD$
 +
 +static long g723_tell(struct ast_filestream *);
 +
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(g723_lock);
 +static int glistcnt = 0;
 +
 +static char *name = "g723";
diff --git a/net/asterisk14/files/patch-include::asterisk::utils.h b/net/asterisk14/files/patch-include::asterisk::utils.h
new file mode 100644
index 000000000000..a06f7d065c84
--- /dev/null
+++ b/net/asterisk14/files/patch-include::asterisk::utils.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- include/asterisk/utils.h	2004/10/10 12:55:50	1.1
++++ include/asterisk/utils.h	2004/10/10 12:56:43
+@@ -37,7 +37,6 @@
+ #ifdef inet_ntoa
+ #undef inet_ntoa
+ #endif
+-#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
+ 
+ #ifdef LINUX
+ #define ast_pthread_create pthread_create
diff --git a/net/asterisk14/files/patch-res::Makefile b/net/asterisk14/files/patch-res::Makefile
index ccd0a35dd59d..5700f04ea1ef 100644
--- a/net/asterisk14/files/patch-res::Makefile
+++ b/net/asterisk14/files/patch-res::Makefile
@@ -1,12 +1,21 @@
 
 $FreeBSD$
 
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
+--- res/Makefile.orig	Sat Jul 17 23:58:01 2004
++++ res/Makefile	Thu Oct 14 19:15:00 2004
+@@ -21,7 +21,7 @@
  
- install: all
+ CFLAGS+=
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
++CFLAGS+=-DZAPATA_MOH -I$(LOCALBASE)/include
+ #
+ # Work around buggy RedHat 9.0
+ #
+@@ -34,7 +34,7 @@
+ 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
 -	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
  
diff --git a/net/asterisk14/files/patch-rtp.c b/net/asterisk14/files/patch-rtp.c
index 11767dca198f..06289f357208 100644
--- a/net/asterisk14/files/patch-rtp.c
+++ b/net/asterisk14/files/patch-rtp.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- rtp.c.orig	Tue Nov 25 23:15:28 2003
-+++ rtp.c	Fri Jan 30 01:47:34 2004
-@@ -114,7 +114,7 @@
+--- rtp.c.orig	Sat Sep 18 16:56:28 2004
++++ rtp.c	Sun Oct 10 15:57:22 2004
+@@ -127,7 +127,7 @@
  {
  	switch(buf & TYPE_MASK) {
  	case TYPE_DONTSEND:
@@ -12,31 +12,15 @@ $FreeBSD$
  		break;
  	case TYPE_SILENCE:
  		return 4;
-@@ -1028,19 +1028,6 @@
- 		while((f = ast_smoother_read(rtp->smoother)))
- 			ast_rtp_raw_write(rtp, f, codec);
- 		break;
--	case AST_FORMAT_G729A:
--		if (!rtp->smoother) {
--			rtp->smoother = ast_smoother_new(20);
--		}
--		if (!rtp->smoother) {
--			ast_log(LOG_WARNING, "Unable to create g729 smoother :(\n");
--			return -1;
--		}
--		ast_smoother_feed(rtp->smoother, _f);
--		
--		while((f = ast_smoother_read(rtp->smoother)))
--			ast_rtp_raw_write(rtp, f, codec);
--		break;
- 	case AST_FORMAT_GSM:
- 		if (!rtp->smoother) {
- 			rtp->smoother = ast_smoother_new(33);
-@@ -1071,6 +1058,7 @@
- 	case AST_FORMAT_H261:
- 	case AST_FORMAT_H263:
- 	case AST_FORMAT_G723_1:
-+	case AST_FORMAT_G729A:
- 	case AST_FORMAT_SPEEX:
- 	        // Don't buffer outgoing frames; send them one-per-packet:
- 		if (_f->offset < hdrlen) {
+@@ -841,8 +841,10 @@
+ 		/* Must be an even port number by RTP spec */
+ 		rtp->us.sin_port = htons(x);
+ 		rtp->us.sin_addr = addr;
+-		if (rtp->rtcp)
++		if (rtp->rtcp) {
+ 			rtp->rtcp->us.sin_port = htons(x + 1);
++			rtp->rtcp->us.sin_addr = addr;
++		}
+ 		if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
+ 			(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
+ 			break;
diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist
index eb427fa04447..f1519b3f3a39 100644
--- a/net/asterisk14/pkg-plist
+++ b/net/asterisk14/pkg-plist
@@ -7,6 +7,9 @@ etc/asterisk/adtranvofr.conf-dist
 @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
 etc/asterisk/agents.conf-dist
 @exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
+@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
+etc/asterisk/alarmreceiver.conf-dist
+@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf
 @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
 etc/asterisk/alsa.conf-dist
 @exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
@@ -16,18 +19,30 @@ etc/asterisk/asterisk.adsi-dist
 @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
 etc/asterisk/asterisk.conf-dist
 @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
+etc/asterisk/cdr_manager.conf-dist
+@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
 etc/asterisk/cdr_odbc.conf-dist
 @exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
 etc/asterisk/cdr_pgsql.conf-dist
 @exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
+etc/asterisk/cdr_tds.conf-dist
+@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf
 @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
 etc/asterisk/enum.conf-dist
 @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
+@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
+etc/asterisk/extconfig.conf-dist
+@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf
 @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
 etc/asterisk/extensions.conf-dist
 @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
+@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
+etc/asterisk/features.conf-dist
+@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
@@ -37,6 +52,9 @@ etc/asterisk/h323.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
+@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
+etc/asterisk/iaxprov.conf-dist
+@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf
 @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
 etc/asterisk/indications.conf-dist
 @exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
@@ -61,12 +79,12 @@ etc/asterisk/modules.conf-dist
 @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
 etc/asterisk/musiconhold.conf-dist
 @exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
+@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
+etc/asterisk/osp.conf-dist
+@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf
 @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
 etc/asterisk/oss.conf-dist
 @exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
 @unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
 etc/asterisk/phone.conf-dist
 @exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
@@ -76,6 +94,12 @@ etc/asterisk/privacy.conf-dist
 @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
 etc/asterisk/queues.conf-dist
 @exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
+@unexec if cmp -s %D/etc/asterisk/res_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi
+etc/asterisk/res_config_odbc.conf-dist
+@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.conf
+@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
+etc/asterisk/res_odbc.conf-dist
+@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
 etc/asterisk/rpt.conf-dist
 @exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
@@ -103,11 +127,13 @@ etc/asterisk/zapata.conf-dist
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
+include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/app.h
 include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
+include/asterisk/astosp.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
@@ -116,12 +142,14 @@ include/asterisk/channel_pvt.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/config.h
+include/asterisk/config_pvt.h
 include/asterisk/crypto.h
 include/asterisk/cvsid.h
 include/asterisk/dlfcn-compat.h
 include/asterisk/dns.h
 include/asterisk/dsp.h
 include/asterisk/enum.h
+include/asterisk/features.h
 include/asterisk/file.h
 include/asterisk/frame.h
 include/asterisk/fskmodem.h
@@ -138,10 +166,10 @@ include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
 include/asterisk/options.h
-include/asterisk/parking.h
 include/asterisk/pbx.h
 include/asterisk/poll-compat.h
 include/asterisk/privacy.h
+include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -150,30 +178,39 @@ include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/translate.h
 include/asterisk/ulaw.h
+include/asterisk/utils.h
 include/asterisk/vmodem.h
 lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
+lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
+lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
 lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_enumlookup.so
+lib/asterisk/modules/app_eval.so
+lib/asterisk/modules/app_exec.so
 lib/asterisk/modules/app_festival.so
+lib/asterisk/modules/app_flash.so
+lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
+lib/asterisk/modules/app_groupcount.so
 lib/asterisk/modules/app_hasnewvoicemail.so
+lib/asterisk/modules/app_ices.so
 lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_intercom.so
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+lib/asterisk/modules/app_meetme.so
 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_playback.so
 lib/asterisk/modules/app_privacy.so
@@ -184,20 +221,31 @@ lib/asterisk/modules/app_read.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
+lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so
 lib/asterisk/modules/app_setcdruserfield.so
 lib/asterisk/modules/app_setcidname.so
 lib/asterisk/modules/app_setcidnum.so
+lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_striplsd.so
 lib/asterisk/modules/app_substring.so
 lib/asterisk/modules/app_system.so
+lib/asterisk/modules/app_talkdetect.so
+lib/asterisk/modules/app_test.so
 lib/asterisk/modules/app_transfer.so
+lib/asterisk/modules/app_txtcidname.so
 lib/asterisk/modules/app_url.so
+lib/asterisk/modules/app_userevent.so
+lib/asterisk/modules/app_verbose.so
 lib/asterisk/modules/app_voicemail.so
 lib/asterisk/modules/app_waitforring.so
 lib/asterisk/modules/app_zapateller.so
+lib/asterisk/modules/app_zapbarge.so
+lib/asterisk/modules/app_zapras.so
+lib/asterisk/modules/app_zapscan.so
 lib/asterisk/modules/cdr_csv.so
+lib/asterisk/modules/cdr_manager.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax2.so
@@ -210,11 +258,12 @@ lib/asterisk/modules/chan_modem_i4l.so
 lib/asterisk/modules/chan_oss.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
-%%ZAPTEL%%lib/asterisk/modules/chan_zap.so
+lib/asterisk/modules/chan_zap.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g723_1_dummy.so
+lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_g729_dummy.so
 lib/asterisk/modules/codec_gsm.so
 lib/asterisk/modules/codec_ilbc.so
@@ -222,12 +271,15 @@ lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723_1.so
+lib/asterisk/modules/format_g726.so
 lib/asterisk/modules/format_g729.so
 lib/asterisk/modules/format_gsm.so
 lib/asterisk/modules/format_h263.so
+lib/asterisk/modules/format_ilbc.so
 lib/asterisk/modules/format_jpeg.so
 lib/asterisk/modules/format_pcm.so
 lib/asterisk/modules/format_pcm_alaw.so
+lib/asterisk/modules/format_sln.so
 lib/asterisk/modules/format_vox.so
 lib/asterisk/modules/format_wav.so
 lib/asterisk/modules/format_wav_gsm.so
@@ -235,20 +287,25 @@ lib/asterisk/modules/pbx_config.so
 lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/pbx_wilcalu.so
 lib/asterisk/modules/res_adsi.so
+lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_features.so
 lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
 sbin/asterisk
 sbin/astgenkey
 sbin/safe_asterisk
 share/asterisk/agi-bin/agi-test.agi
 share/asterisk/agi-bin/eagi-sphinx-test
 share/asterisk/agi-bin/eagi-test
+share/asterisk/firmware/iax/iaxy.bin
 share/asterisk/images/asterisk-intro.jpg
+share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
+share/asterisk/mohmp3/fpm-calm-river.mp3
+share/asterisk/mohmp3/fpm-sunshine.mp3
+share/asterisk/mohmp3/fpm-world-mix.mp3
 share/asterisk/sounds/agent-alreadyon.gsm
 share/asterisk/sounds/agent-incorrect.gsm
 share/asterisk/sounds/agent-loggedoff.gsm
@@ -259,12 +316,23 @@ share/asterisk/sounds/agent-user.gsm
 share/asterisk/sounds/auth-incorrect.gsm
 share/asterisk/sounds/auth-thankyou.gsm
 share/asterisk/sounds/beep.gsm
+share/asterisk/sounds/conf-adminmenu.gsm
+share/asterisk/sounds/conf-enteringno.gsm
+share/asterisk/sounds/conf-errormenu.gsm
 share/asterisk/sounds/conf-getchannel.gsm
 share/asterisk/sounds/conf-getconfno.gsm
 share/asterisk/sounds/conf-getpin.gsm
 share/asterisk/sounds/conf-invalid.gsm
 share/asterisk/sounds/conf-invalidpin.gsm
+share/asterisk/sounds/conf-kicked.gsm
+share/asterisk/sounds/conf-locked.gsm
+share/asterisk/sounds/conf-lockednow.gsm
+share/asterisk/sounds/conf-muted.gsm
+share/asterisk/sounds/conf-noempty.gsm
 share/asterisk/sounds/conf-onlyperson.gsm
+share/asterisk/sounds/conf-unlockednow.gsm
+share/asterisk/sounds/conf-unmuted.gsm
+share/asterisk/sounds/conf-usermenu.gsm
 share/asterisk/sounds/demo-abouttotry.gsm
 share/asterisk/sounds/demo-congrats.gsm
 share/asterisk/sounds/demo-echodone.gsm
@@ -359,16 +427,88 @@ share/asterisk/sounds/digits/tomorrow.gsm
 share/asterisk/sounds/digits/yesterday.gsm
 share/asterisk/sounds/dir-instr.gsm
 share/asterisk/sounds/dir-intro.gsm
+share/asterisk/sounds/dir-intro-fn.gsm
 share/asterisk/sounds/dir-nomatch.gsm
 share/asterisk/sounds/dir-nomore.gsm
 share/asterisk/sounds/invalid.gsm
+share/asterisk/sounds/letters/a.gsm
+share/asterisk/sounds/letters/at.gsm
+share/asterisk/sounds/letters/b.gsm
+share/asterisk/sounds/letters/c.gsm
+share/asterisk/sounds/letters/d.gsm
+share/asterisk/sounds/letters/dash.gsm
+share/asterisk/sounds/letters/dollar.gsm
+share/asterisk/sounds/letters/dot.gsm
+share/asterisk/sounds/letters/e.gsm
+share/asterisk/sounds/letters/equals.gsm
+share/asterisk/sounds/letters/exclaimation-point.gsm
+share/asterisk/sounds/letters/f.gsm
+share/asterisk/sounds/letters/g.gsm
+share/asterisk/sounds/letters/h.gsm
+share/asterisk/sounds/letters/i.gsm
+share/asterisk/sounds/letters/j.gsm
+share/asterisk/sounds/letters/k.gsm
+share/asterisk/sounds/letters/l.gsm
+share/asterisk/sounds/letters/m.gsm
+share/asterisk/sounds/letters/n.gsm
+share/asterisk/sounds/letters/o.gsm
+share/asterisk/sounds/letters/p.gsm
+share/asterisk/sounds/letters/plus.gsm
+share/asterisk/sounds/letters/q.gsm
+share/asterisk/sounds/letters/r.gsm
+share/asterisk/sounds/letters/s.gsm
+share/asterisk/sounds/letters/slash.gsm
+share/asterisk/sounds/letters/space.gsm
+share/asterisk/sounds/letters/t.gsm
+share/asterisk/sounds/letters/u.gsm
+share/asterisk/sounds/letters/v.gsm
+share/asterisk/sounds/letters/w.gsm
+share/asterisk/sounds/letters/x.gsm
+share/asterisk/sounds/letters/y.gsm
+share/asterisk/sounds/letters/z.gsm
+share/asterisk/sounds/letters/zed.gsm
 share/asterisk/sounds/pbx-invalid.gsm
 share/asterisk/sounds/pbx-invalidpark.gsm
 share/asterisk/sounds/pbx-transfer.gsm
+share/asterisk/sounds/phonetic/9_p.gsm
+share/asterisk/sounds/phonetic/a_p.gsm
+share/asterisk/sounds/phonetic/b_p.gsm
+share/asterisk/sounds/phonetic/c_p.gsm
+share/asterisk/sounds/phonetic/d_p.gsm
+share/asterisk/sounds/phonetic/e_p.gsm
+share/asterisk/sounds/phonetic/f_p.gsm
+share/asterisk/sounds/phonetic/g_p.gsm
+share/asterisk/sounds/phonetic/h_p.gsm
+share/asterisk/sounds/phonetic/i_p.gsm
+share/asterisk/sounds/phonetic/j_p.gsm
+share/asterisk/sounds/phonetic/k_p.gsm
+share/asterisk/sounds/phonetic/l_p.gsm
+share/asterisk/sounds/phonetic/m_p.gsm
+share/asterisk/sounds/phonetic/n_p.gsm
+share/asterisk/sounds/phonetic/o_p.gsm
+share/asterisk/sounds/phonetic/p_p.gsm
+share/asterisk/sounds/phonetic/q_p.gsm
+share/asterisk/sounds/phonetic/r_p.gsm
+share/asterisk/sounds/phonetic/s_p.gsm
+share/asterisk/sounds/phonetic/t_p.gsm
+share/asterisk/sounds/phonetic/u_p.gsm
+share/asterisk/sounds/phonetic/v_p.gsm
+share/asterisk/sounds/phonetic/w_p.gsm
+share/asterisk/sounds/phonetic/x_p.gsm
+share/asterisk/sounds/phonetic/y_p.gsm
+share/asterisk/sounds/phonetic/z_p.gsm
 share/asterisk/sounds/privacy-incorrect.gsm
 share/asterisk/sounds/privacy-prompt.gsm
 share/asterisk/sounds/privacy-thankyou.gsm
 share/asterisk/sounds/privacy-unident.gsm
+share/asterisk/sounds/queue-callswaiting.gsm
+share/asterisk/sounds/queue-holdtime.gsm
+share/asterisk/sounds/queue-less-than.gsm
+share/asterisk/sounds/queue-minutes.gsm
+share/asterisk/sounds/queue-seconds.gsm
+share/asterisk/sounds/queue-thankyou.gsm
+share/asterisk/sounds/queue-thereare.gsm
+share/asterisk/sounds/queue-youarenext.gsm
 share/asterisk/sounds/ss-noservice.gsm
 share/asterisk/sounds/transfer.gsm
 share/asterisk/sounds/tt-allbusy.gsm
@@ -387,22 +527,31 @@ share/asterisk/sounds/vm-Friends.gsm
 share/asterisk/sounds/vm-INBOX.gsm
 share/asterisk/sounds/vm-Old.gsm
 share/asterisk/sounds/vm-Work.gsm
+share/asterisk/sounds/vm-advopts.gsm
 share/asterisk/sounds/vm-and.gsm
+share/asterisk/sounds/vm-calldiffnum.gsm
 share/asterisk/sounds/vm-changeto.gsm
 share/asterisk/sounds/vm-delete.gsm
 share/asterisk/sounds/vm-deleted.gsm
+share/asterisk/sounds/vm-dialout.gsm
+share/asterisk/sounds/vm-enter-num-to-call.gsm
 share/asterisk/sounds/vm-extension.gsm
 share/asterisk/sounds/vm-first.gsm
 share/asterisk/sounds/vm-for.gsm
 share/asterisk/sounds/vm-forwardoptions.gsm
+share/asterisk/sounds/vm-from-extension.gsm
+share/asterisk/sounds/vm-from-phonenumber.gsm
+share/asterisk/sounds/vm-from.gsm
 share/asterisk/sounds/vm-goodbye.gsm
 share/asterisk/sounds/vm-helpexit.gsm
 share/asterisk/sounds/vm-incorrect.gsm
+share/asterisk/sounds/vm-incorrect-mailbox.gsm
 share/asterisk/sounds/vm-instructions.gsm
 share/asterisk/sounds/vm-intro.gsm
 share/asterisk/sounds/vm-isonphone.gsm
 share/asterisk/sounds/vm-isunavail.gsm
 share/asterisk/sounds/vm-last.gsm
+share/asterisk/sounds/vm-leavemsg.gsm
 share/asterisk/sounds/vm-login.gsm
 share/asterisk/sounds/vm-mailboxfull.gsm
 share/asterisk/sounds/vm-message.gsm
@@ -414,7 +563,10 @@ share/asterisk/sounds/vm-newpassword.gsm
 share/asterisk/sounds/vm-next.gsm
 share/asterisk/sounds/vm-no.gsm
 share/asterisk/sounds/vm-nobodyavail.gsm
+share/asterisk/sounds/vm-nobox.gsm
 share/asterisk/sounds/vm-nomore.gsm
+share/asterisk/sounds/vm-nonumber.gsm
+share/asterisk/sounds/vm-num-i-have.gsm
 share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-options.gsm
 share/asterisk/sounds/vm-opts.gsm
@@ -422,30 +574,49 @@ share/asterisk/sounds/vm-passchanged.gsm
 share/asterisk/sounds/vm-password.gsm
 share/asterisk/sounds/vm-press.gsm
 share/asterisk/sounds/vm-prev.gsm
+share/asterisk/sounds/vm-reachoper.gsm
 share/asterisk/sounds/vm-rec-busy.gsm
 share/asterisk/sounds/vm-rec-name.gsm
 share/asterisk/sounds/vm-rec-unv.gsm
 share/asterisk/sounds/vm-received.gsm
 share/asterisk/sounds/vm-reenterpassword.gsm
 share/asterisk/sounds/vm-repeat.gsm
+share/asterisk/sounds/vm-review.gsm
 share/asterisk/sounds/vm-saved.gsm
 share/asterisk/sounds/vm-savedto.gsm
 share/asterisk/sounds/vm-savefolder.gsm
 share/asterisk/sounds/vm-savemessage.gsm
 share/asterisk/sounds/vm-sorry.gsm
+share/asterisk/sounds/vm-star-cancel.gsm
+share/asterisk/sounds/vm-starmain.gsm
+share/asterisk/sounds/vm-then-pound.gsm
 share/asterisk/sounds/vm-theperson.gsm
+share/asterisk/sounds/vm-tocallback.gsm
+share/asterisk/sounds/vm-tocallnum.gsm
 share/asterisk/sounds/vm-tocancel.gsm
+share/asterisk/sounds/vm-tocancelmsg.gsm
+share/asterisk/sounds/vm-toenternumber.gsm
 share/asterisk/sounds/vm-toforward.gsm
+share/asterisk/sounds/vm-tohearenv.gsm
+share/asterisk/sounds/vm-tomakecall.gsm
+share/asterisk/sounds/vm-tooshort.gsm
+share/asterisk/sounds/vm-toreply.gsm
+share/asterisk/sounds/vm-torerecord.gsm
 share/asterisk/sounds/vm-undelete.gsm
 share/asterisk/sounds/vm-undeleted.gsm
+share/asterisk/sounds/vm-unknown-caller.gsm
 share/asterisk/sounds/vm-whichbox.gsm
 share/asterisk/sounds/vm-youhave.gsm
 share/asterisk/sounds/voicemail
+@dirrm share/asterisk/sounds/phonetic
+@dirrm share/asterisk/sounds/letters
 @dirrm share/asterisk/sounds/digits
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/mohmp3
 @dirrm share/asterisk/keys
 @dirrm share/asterisk/images
+@dirrm share/asterisk/firmware/iax
+@dirrm share/asterisk/firmware
 @dirrm share/asterisk/agi-bin
 @dirrm share/asterisk
 @dirrm lib/asterisk/modules
@@ -463,6 +634,7 @@ spool/asterisk/voicemail/default/1234/unavail.gsm
 @dirrm spool/asterisk/voicemail/default/1234
 @dirrm spool/asterisk/voicemail/default
 @dirrm spool/asterisk/voicemail
+@dirrm spool/asterisk/tmp
 @dirrm spool/asterisk
 @dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 420c2dcfe4e7..3f24e2ef57a9 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -17,11 +16,13 @@ COMMENT=	An Open Source PBX and telephony toolkit
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
 		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex
-RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
@@ -35,14 +36,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
-.include <bsd.port.pre.mk>
+MAN8=		asterisk.8
 
-.if defined(WITH_ZAPTEL) || exists(${LOCALBASE}/include/zaptel.h)
-BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-PLIST_SUB=	ZAPTEL=""
-.else
-PLIST_SUB=	ZAPTEL="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index a12f4a79e431..d7661cced0c6 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,2 +1,2 @@
-MD5 (asterisk-0.9.0.tar.gz) = cb0fbb5185fdf2356ee30bdcf4ad9b9c
-SIZE (asterisk-0.9.0.tar.gz) = 2787458
+MD5 (asterisk-1.0.1.tar.gz) = cb55b1a0be8ff6e94179db0cdc7e074d
+SIZE (asterisk-1.0.1.tar.gz) = 9558497
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index 94155a666be0..43bf910fe669 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- Makefile.orig	Thu Apr  1 01:43:10 2004
-+++ Makefile	Wed Apr 14 22:08:43 2004
-@@ -43,10 +43,10 @@
+--- Makefile.orig	Tue Sep 28 20:11:30 2004
++++ Makefile	Thu Oct 14 19:48:30 2004
+@@ -62,10 +62,10 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the asterisk's code
--OPTIMIZE=-O6
-+#OPTIMIZE=-O6
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
  
  #Include debug symbols in the executables (-g) and profiling info (-pg)
 -DEBUG=-g #-pg
 +#DEBUG=-g #-pg
  
- # New hangup routines for chan_zap.c
- # If this flag is uncommented then you need to have new libpri code in your system
-@@ -68,7 +68,7 @@
+ # If you are running a radio application, define RADIO_RELAX so that the DTMF
+ # will be received more reliably
+@@ -90,7 +90,7 @@
  
  # Where to install asterisk after compiling
  # Default -> leave empty
@@ -25,7 +25,7 @@ $FreeBSD$
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -88,28 +88,27 @@
+@@ -110,23 +110,23 @@
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
@@ -44,36 +44,45 @@ $FreeBSD$
 -ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
 -ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
 -ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+-ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 +ASTBINDIR=$(INSTALL_PREFIX)/bin
 +ASTSBINDIR=$(INSTALL_PREFIX)/sbin
 +ASTVARRUNDIR=/var/run
++ASTMANDIR=$(INSTALL_PREFIX)/man
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
- INCLUDE=-Iinclude -I../include 
+ INCLUDE=-Iinclude -I../include
 -CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
- CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ 
+ ifneq ($(PROC),ultrasparc)
+@@ -137,11 +137,8 @@
+ CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
+ 
  ifeq (${OSARCH},FreeBSD)
--CFLAGS+=-pthread
+-OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 -INCLUDE+=-I/usr/local/include
+-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 +CFLAGS+=$(PTHREAD_CFLAGS)
- endif
- ifeq (${OSARCH},OpenBSD)
- CFLAGS+=-pthread
-@@ -151,7 +150,7 @@
- LIBS=-pthread
- else
- ifeq (${OSARCH},FreeBSD)
--LIBS=-pthread
-+LIBS=$(PTHREAD_LIBS)
- else
- endif
- endif
-@@ -179,7 +178,7 @@
++LIBS+=$(PTHREAD_LIBS)
+ endif # FreeBSD
+ 
+ ifeq (${OSARCH},NetBSD)
+@@ -157,7 +154,7 @@
+ #CFLAGS+=-DOLD_DSP_ROUTINES
+ 
+ CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
++CFLAGS+=-I$(LOCALBASE)/include -DZAPTEL_OPTIMIZATIONS
+ 
+ LIBEDIT=editline/libedit.a
+ 
+@@ -219,7 +216,7 @@
  SOLINK=-shared -Xlinker -x
  endif
  
@@ -82,7 +91,16 @@ $FreeBSD$
  INSTALL=install
  
  _all: all
-@@ -200,13 +199,13 @@
+@@ -231,7 +228,7 @@
+ 	@echo " +               $(MAKE) install                +"  
+ 	@echo " +-------------------------------------------+"  
+ 
+-all: depend asterisk subdirs 
++all: depend asterisk subdirs manpage
+ 
+ editline/config.h:
+ 	cd editline && unset CFLAGS LIBS && ./configure ; \
+@@ -240,13 +237,13 @@
  	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  	$(MAKE) -C editline libedit.a
  
@@ -103,18 +121,35 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
  include .depend
-@@ -244,8 +243,8 @@
+@@ -268,13 +265,10 @@
+ 
+ asterisk.o: asterisk.c build.h
+ 
+-manpage: asterisk.8.gz
++manpage: asterisk.8
+ 
+-asterisk.8.gz: asterisk.sgml
+-	rm -f asterisk.8
+-	docbook2man asterisk.sgml
+-	mv ./*.8 asterisk.8
+-	gzip asterisk.8
++asterisk.8: asterisk.8.gz
++	gzcat asterisk.8.gz > asterisk.8
+ 
+ ifneq ($(strip $(ASTERISKVERSION)),)
+ build.h: .version
+@@ -292,8 +286,8 @@
  		exit 1; \
  	fi
  
 -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
--	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+-	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
 +asterisk: editline/libedit.a stdtime/libtime.a $(OBJS)
-+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) stdtime/libtime.a
++	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS)
  
- subdirs: 
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-@@ -260,10 +259,10 @@
+ muted: muted.o
+ 	$(CC) -o muted muted.o
+@@ -312,28 +306,28 @@
  	$(MAKE) -C stdtime clean
  
  datafiles: all
@@ -127,9 +162,31 @@ $FreeBSD$
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -271,18 +270,18 @@
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ 	for x in sounds/letters/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+ 		fi; \
+ 	done
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ 	for x in sounds/phonetic/*.gsm; do \
+ 		if grep -q "^%`basename $$x`%" sounds.txt; then \
+-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
+@@ -341,18 +335,18 @@
  	done
- 	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
+ 	for x in 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-*; do \
  		if grep -q "^%`basename $$x`%" sounds.txt; then \
 -			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 +			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
@@ -151,7 +208,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -294,105 +293,74 @@
+@@ -364,111 +358,86 @@
  	fi
  
  bininstall: all
@@ -162,6 +219,7 @@ $FreeBSD$
 -	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
@@ -171,6 +229,7 @@ $FreeBSD$
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
@@ -191,19 +250,34 @@ $FreeBSD$
 -		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
 -	fi
 -	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
--	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 -	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+-	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
++	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	if [ -d contrib/firmware/iax ]; then \
+-		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ 	else \
+ 		echo "You need to do cvs update -d not just cvs update" ; \
+ 	fi 
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
+-	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -225,13 +299,8 @@ $FreeBSD$
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
-+	ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/vm . )
-+	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds; ln -sf $(ASTSPOOLDIR)/voicemail . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
++	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
@@ -294,8 +363,31 @@ $FreeBSD$
 -		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
  	done
+ 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	:> $(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 ; \
+@@ -483,7 +452,7 @@
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
+ 	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
+ 	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
+-	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk
++	$(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk
+ 	for x in images/*.gif; do \
+ 		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
+ 	done
+@@ -503,10 +472,10 @@
+ 
+ __rpm: _version
+ 	rm -rf /tmp/asterisk ; \
+-	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++	$(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
+ 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
+-	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++	$(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+ 	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
+ 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
diff --git a/net/asterisk16/files/patch-agi::Makefile b/net/asterisk16/files/patch-agi::Makefile
index 567c30f5624e..32efb5d2b101 100644
--- a/net/asterisk16/files/patch-agi::Makefile
+++ b/net/asterisk16/files/patch-agi::Makefile
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- agi/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ agi/Makefile	Fri Jan 30 02:31:07 2004
-@@ -11,21 +11,24 @@
+--- agi/Makefile.orig	Tue Jun 22 20:42:13 2004
++++ agi/Makefile	Tue Oct  5 21:03:40 2004
+@@ -11,15 +11,18 @@
  # the GNU General Public License
  #
  
@@ -24,12 +24,4 @@ $FreeBSD$
 +	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
  
  eagi-test: eagi-test.o
--	$(CC) -o eagi-test eagi-test.o
-+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
- 	
- eagi-sphinx-test: eagi-sphinx-test.o
--	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
-+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
- 
- clean:
- 	rm -f *.so *.o look .depend
+ 	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
diff --git a/net/asterisk16/files/patch-apps::Makefile b/net/asterisk16/files/patch-apps::Makefile
index 901ba694c33a..00b77dfe2434 100644
--- a/net/asterisk16/files/patch-apps::Makefile
+++ b/net/asterisk16/files/patch-apps::Makefile
@@ -1,22 +1,24 @@
 
 $FreeBSD$
 
---- apps/Makefile.orig	Mon Jan 12 03:56:38 2004
-+++ apps/Makefile	Fri Jan 30 01:47:34 2004
-@@ -59,17 +59,17 @@
+--- apps/Makefile.orig	Sat Sep 25 00:32:56 2004
++++ apps/Makefile	Sun Oct 10 16:20:06 2004
+@@ -40,7 +40,7 @@
+ #APPS+=app_rpt.so
+ 
+ APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+-APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
++APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+ APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+ 
+ CFLAGS+=-fPIC
+@@ -65,12 +65,12 @@
  	$(CC) $(SOLINK) -o $@ $< -ltonezone
  
  install: all
 -	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
- 
- app_todd.o: app_todd.c
--	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-+	$(CC) $(CFLAGS) -Iinclude -I../include -D_REENTRANT -DDO_CRASH -c -o  app_todd.o app_todd.c
- 
- app_todd.so: app_todd.o
--	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
-+	$(CC) $(SOLINK) -o $@ $< -lssl -lcrypto
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
  
  app_voicemail.so : app_voicemail.o
  ifeq ($(USE_MYSQL_VM_INTERFACE),1)
@@ -25,11 +27,22 @@ $FreeBSD$
  else
  ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
  	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
-@@ -88,7 +88,7 @@
+@@ -80,16 +80,16 @@
+ endif
+ 
+ app_sql_postgres.o: app_sql_postgres.c
+-	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
++	$(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ 
+ app_sql_postgres.so: app_sql_postgres.o
+-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/pgsql/lib -lpq
++	$(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq
+ 
+ app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ $< -lodbc
  
  look:	look.c
--	gcc -pipe -O6 -g look.c -o look -lncurses
+-	$(CC) -pipe -O6 -g look.c -o look -lncurses
 +	$(CC) $(CFLAGS) look.c -o look -lncurses
  
  ifneq ($(wildcard .depend),)
diff --git a/net/asterisk16/files/patch-apps::app_intercom.c b/net/asterisk16/files/patch-apps::app_intercom.c
deleted file mode 100644
index e4ac57f8e31b..000000000000
--- a/net/asterisk16/files/patch-apps::app_intercom.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- apps/app_intercom.c.orig	Wed Oct 22 06:10:24 2003
-+++ apps/app_intercom.c	Fri Jan 30 01:52:03 2004
-@@ -29,7 +29,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk16/files/patch-astman::Makefile b/net/asterisk16/files/patch-astman::Makefile
index cf31005257cf..2745860cdd36 100644
--- a/net/asterisk16/files/patch-astman::Makefile
+++ b/net/asterisk16/files/patch-astman::Makefile
@@ -1,9 +1,20 @@
 
 $FreeBSD$
 
---- astman/Makefile.orig	Sat Oct 25 20:27:53 2003
-+++ astman/Makefile	Fri Jan 30 01:47:34 2004
-@@ -8,7 +8,7 @@
+--- astman/Makefile.orig	Sat Jun 26 22:25:39 2004
++++ astman/Makefile	Thu Oct 14 19:14:22 2004
+@@ -5,16 +5,16 @@
+ 
+ OSARCH=$(shell uname -s)
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS+=-I/usr/local/include -L/usr/local/lib
++CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib
+ endif
+ 
+-TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi)
++TARGET=astman
+ all: depend $(TARGET)
+ 
  install:
  	if [ "$(TARGET)" != "none" ]; then \
  		for x in $(TARGET); do \
diff --git a/net/asterisk16/files/patch-cdr::Makefile b/net/asterisk16/files/patch-cdr::Makefile
index 2ede608f9019..f646d2c9a3dc 100644
--- a/net/asterisk16/files/patch-cdr::Makefile
+++ b/net/asterisk16/files/patch-cdr::Makefile
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- cdr/Makefile.orig	Sun Jan 11 21:17:02 2004
-+++ cdr/Makefile	Fri Jan 30 01:47:34 2004
-@@ -43,7 +43,7 @@
+--- cdr/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ cdr/Makefile	Thu Oct 14 19:13:38 2004
+@@ -21,7 +21,7 @@
+ OSARCH=$(shell uname -s)
+ 
+ ifeq (${OSARCH},FreeBSD)
+-SOLINK+=-L/usr/local/lib
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+@@ -71,7 +71,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile
index fd855e7a2710..98caab3a33d6 100644
--- a/net/asterisk16/files/patch-channels::Makefile
+++ b/net/asterisk16/files/patch-channels::Makefile
@@ -1,53 +1,62 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Thu Mar 25 11:43:36 2004
-+++ channels/Makefile	Thu Apr 29 14:36:36 2004
-@@ -33,12 +33,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
+--- channels/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ channels/Makefile	Sun Oct 10 16:18:05 2004
+@@ -57,10 +57,10 @@
+ 
+ endif
+ ifeq (${OSARCH},FreeBSD)
+-PTLIB=-lpt_FreeBSD_x86_r
+-H323LIB=-lh323_FreeBSD_x86_r
+-CHANH323LIB=-pthread
+-SOLINK+=-L/usr/local/lib
++PTLIB=-lpt_FreeBSD_x86_r_s
++H323LIB=-lh323_FreeBSD_x86_r_s
++CHANH323LIB=
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ ifeq (${OSARCH},NetBSD)
+ PTLIB=-lpt_NetBSD_x86_r
+@@ -72,8 +72,8 @@
+ endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so)
 +CHANNEL_LIBS+=chan_h323.so
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -48,7 +46,7 @@
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+@@ -84,7 +84,7 @@
  ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 +CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
  CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
  
-@@ -69,7 +67,7 @@
- 
+@@ -107,7 +107,7 @@
  ZAPDIR=/usr/lib
  
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so")
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
  
-@@ -110,10 +108,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
+@@ -156,6 +156,8 @@
  chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
+ 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+ endif
++chan_oss.so: chan_oss.o
 +	$(CC) $(SOLINK) -o $@ chan_oss.o
  
- chan_iax2.so: chan_iax2.o iax2-parser.o
+ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -133,7 +129,7 @@
+@@ -175,7 +177,7 @@
  	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
  
  chan_zap.so: chan_zap.o
@@ -55,15 +64,15 @@ $FreeBSD$
 +	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone
  
  chan_sip.so: chan_sip.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -157,16 +153,17 @@
+ ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+@@ -199,15 +201,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
+-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(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
++	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
@@ -73,8 +82,7 @@ $FreeBSD$
  
  install: all
 -	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 +	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
+ 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
  
  depend: .depend
- 
diff --git a/net/asterisk16/files/patch-channels::chan_h323.c b/net/asterisk16/files/patch-channels::chan_h323.c
index e413bd8ecec8..de2ed3978663 100644
--- a/net/asterisk16/files/patch-channels::chan_h323.c
+++ b/net/asterisk16/files/patch-channels::chan_h323.c
@@ -1,13 +1,14 @@
 
 $FreeBSD$
 
---- channels/chan_h323.c.orig	Tue Jan 13 11:24:26 2004
-+++ channels/chan_h323.c	Fri Jan 30 01:47:34 2004
-@@ -54,6 +54,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <sys/signal.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
+--- channels/chan_h323.c	2004/10/10 13:00:17	1.1
++++ channels/chan_h323.c	2004/10/10 13:00:39
+@@ -26,7 +26,7 @@
+  * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $
+  */
  
+-
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
diff --git a/net/asterisk16/files/patch-channels::chan_iax2.c b/net/asterisk16/files/patch-channels::chan_iax2.c
deleted file mode 100644
index 9127bee41cb6..000000000000
--- a/net/asterisk16/files/patch-channels::chan_iax2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_iax2.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_iax2.c	2004/04/29 21:37:10
-@@ -52,7 +52,7 @@
- #include <sys/stat.h>
- #ifdef IAX_TRUNKING
- #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #endif
- #ifdef MYSQL_FRIENDS
- #include <mysql/mysql.h>
diff --git a/net/asterisk16/files/patch-channels::chan_oss.c b/net/asterisk16/files/patch-channels::chan_oss.c
deleted file mode 100644
index 1006b377874e..000000000000
--- a/net/asterisk16/files/patch-channels::chan_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/chan_oss.c.orig	Wed Oct 22 06:10:34 2003
-+++ channels/chan_oss.c	Fri Jan 30 01:50:35 2004
-@@ -36,7 +36,7 @@
- #ifdef __linux
- #include <linux/soundcard.h>
- #elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <soundcard.h>
- #endif
diff --git a/net/asterisk16/files/patch-channels::chan_sip.c b/net/asterisk16/files/patch-channels::chan_sip.c
index b98f9d185009..521d6a46d256 100644
--- a/net/asterisk16/files/patch-channels::chan_sip.c
+++ b/net/asterisk16/files/patch-channels::chan_sip.c
@@ -1,26 +1,26 @@
 
 $FreeBSD$
 
---- channels/chan_sip.c.orig	Wed Jan 14 08:10:53 2004
-+++ channels/chan_sip.c	Fri Jan 30 01:47:34 2004
-@@ -124,7 +124,7 @@
- static int restart_monitor(void);
+--- channels/chan_sip.c.orig
++++ channels/chan_sip.c
+@@ -139,7 +139,7 @@
  
- /* Codecs that we support by default: */
--static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
-+static int capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263 | AST_FORMAT_G723_1 | AST_FORMAT_G729A;
- static int noncodeccapability = AST_RTP_DTMF;
+ static char default_language[MAX_LANGUAGE] = "";
  
- static char ourhost[256];
-@@ -176,6 +176,7 @@
+-static char default_callerid[AST_MAX_EXTENSION] = "asterisk";
++static char default_callerid[AST_MAX_EXTENSION] = "Unknown";
+ 
+ static char default_fromdomain[AST_MAX_EXTENSION] = "";
+ 
+@@ -244,6 +244,7 @@
  struct sip_route {
  	struct sip_route *next;
  	char hop[0];
 +	int lr;
  };
  
- static struct sip_pvt {
-@@ -3417,6 +3418,10 @@
+ struct sip_history {
+@@ -4573,6 +4574,10 @@
  			/* Make a struct route */
  			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
  			if (thishop) {
@@ -28,17 +28,17 @@ $FreeBSD$
 +					thishop->lr = 1;
 +				else
 +					thishop->lr = 0;
- 				strncpy(thishop->hop, rr, len);
+ 				strncpy(thishop->hop, rr, len); /* safe */
  				thishop->hop[len] = '\0';
  				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
-@@ -3440,31 +3445,41 @@
+@@ -4596,31 +4601,41 @@
  			rr += len+1;
  		}
  	}
 -	/* 2nd append the Contact: if there is one */
 -	/* Can be multiple Contact headers, comma separated values - we just take the first */
 -	contact = get_header(req, "Contact");
--	if (strlen(contact)) {
+-	if (!ast_strlen_zero(contact)) {
 -		ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 -		/* Look for <: delimited address */
 -		c = strchr(contact, '<');
@@ -55,7 +55,7 @@ $FreeBSD$
 +	if (head && head->lr) {
 +		thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1);
  		if (thishop) {
--			strncpy(thishop->hop, c, len);
+-			strncpy(thishop->hop, c, len); /* safe */
 -			thishop->hop[len] = '\0';
 -			thishop->next = NULL;
 -			/* Goes at the end */
@@ -71,7 +71,7 @@ $FreeBSD$
 +		/* Append the Contact: if there is one and first route is w/o `lr' param */
 +		/* Can be multiple Contact headers, comma separated values - we just take the first */
 +		contact = get_header(req, "Contact");
-+		if (strlen(contact)) {
++		if (!ast_strlen_zero(contact)) {
 +			ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact);
 +			/* Look for <: delimited address */
 +			c = strchr(contact, '<');
@@ -85,7 +85,7 @@ $FreeBSD$
 +			}
 +			thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1);
 +			if (thishop) {
-+				strncpy(thishop->hop, c, len);
++				strncpy(thishop->hop, c, len); /* safe */
 +				thishop->hop[len] = '\0';
 +				thishop->next = NULL;
 +				/* Goes at the end */
@@ -97,7 +97,7 @@ $FreeBSD$
  		}
  	}
  	/* Store as new route */
-@@ -5143,7 +5158,11 @@
+@@ -7197,7 +7212,11 @@
  			/* Get destination right away */
  			gotdest = get_destination(p, NULL);
  			get_rdnis(p, NULL);
@@ -110,8 +110,8 @@ $FreeBSD$
  			build_contact(p);
  
  			if (gotdest) {
-@@ -5165,7 +5184,6 @@
- 				c = sip_new(p, AST_STATE_DOWN, strlen(p->username) ? p->username : NULL);
+@@ -7225,7 +7244,6 @@
+ 				c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
  				*recount = 1;
  				/* Save Record-Route for any later requests we make on this dialogue */
 -				build_route(p, req, 0);
diff --git a/net/asterisk16/files/patch-channels::chan_zap.c b/net/asterisk16/files/patch-channels::chan_zap.c
index e5a3ffc6afec..965a643bb687 100644
--- a/net/asterisk16/files/patch-channels::chan_zap.c
+++ b/net/asterisk16/files/patch-channels::chan_zap.c
@@ -1,14 +1,15 @@
 
 $FreeBSD$
 
---- channels/chan_zap.c	2004/04/29 21:36:51	1.1
-+++ channels/chan_zap.c	2004/04/29 21:37:17
-@@ -45,7 +45,7 @@
+--- channels/chan_zap.c
++++ channels/chan_zap.c
+@@ -42,7 +42,9 @@
+ #include <sys/signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifndef __FreeBSD__
  #include <stdint.h>
++#endif
  #include <unistd.h>
  #include <sys/ioctl.h>
--#include <linux/zaptel.h>
-+#include <zaptel.h>
- #include <math.h>
- #include <tonezone.h>
- #include <ctype.h>
+ #ifdef __linux__
diff --git a/net/asterisk16/files/patch-channels::h323::Makefile b/net/asterisk16/files/patch-channels::h323::Makefile
index a9159b4441c1..bc34083e2ff3 100644
--- a/net/asterisk16/files/patch-channels::h323::Makefile
+++ b/net/asterisk16/files/patch-channels::h323::Makefile
@@ -1,64 +1,38 @@
 
 $FreeBSD$
 
---- channels/h323/Makefile.orig	Sun Jan 11 04:22:32 2004
-+++ channels/h323/Makefile	Fri Jan 30 01:47:34 2004
-@@ -19,7 +19,7 @@
- #
- # This needs to be updated to deal with more than just little endian machines
- #
--CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
-+CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
- 
- 
- #############################################
-@@ -27,38 +27,39 @@
- # Only change below if you know WTF your doing
- #
- CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
--CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
--CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
-+CFLAGS += -Wall -fPIC
-+CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+--- channels/h323/Makefile.orig	Tue Aug 31 16:32:11 2004
++++ channels/h323/Makefile	Sun Oct 10 15:25:42 2004
+@@ -53,7 +53,7 @@
+ LIBS+=-lpthread
+ endif
+ ifeq ($(findstring BSD,${OSARCH}),BSD)
+-CFLAGS += -pthread
++CFLAGS += $(PTHREAD_LIBS)
+ endif
+ CFLAGS += -D_REENTRANT -D_GNU_SOURCE
  CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
- CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
- CFLAGS += -I../../include
- CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
--CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
-+CFLAGS += -I$(OPENH323DIR)/include
- 
- 
- all:   	libchanh323.a
- 
- samples: 
--	if [ -f $(ASTETCDIR)/h323.conf ]; then \
--		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
-+	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
-+	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
-+		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
- 	fi ; 
--	install h323.conf.sample $(ASTETCDIR)/h323.conf
+@@ -74,19 +74,19 @@
   
  
  ast_h323.o:	ast_h323.cpp
--	g++ -g -c -o $@ $(CFLAGS) $<
-+	$(CXX) -c -o $@ $(CFLAGS) $<
+-	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
++	$(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $<
  
  libchanh323.a:	ast_h323.o
  	ar cr libchanh323.a ast_h323.o
  
  chan_h323.so:	
--	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB)
  
  chan_h323_d.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+-	$(CXX)     -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB)
  
  chan_h323_s.so:	chan_h323.o ast_h323.o
--	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
-+	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
-+
+-	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
++	$(CXX)  $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB)
  clean:
  	rm -f *.o *.so core.* libchanh323.a
  
diff --git a/net/asterisk16/files/patch-codecs::Makefile b/net/asterisk16/files/patch-codecs::Makefile
index b802dc1233e8..de9aff4c34fe 100644
--- a/net/asterisk16/files/patch-codecs::Makefile
+++ b/net/asterisk16/files/patch-codecs::Makefile
@@ -1,22 +1,23 @@
 
 $FreeBSD$
 
---- codecs/Makefile.orig	Tue Nov  4 04:40:09 2003
-+++ codecs/Makefile	Fri Jan 30 01:47:34 2004
-@@ -17,23 +17,22 @@
+--- codecs/Makefile.orig	Mon Jul 19 18:52:57 2004
++++ codecs/Makefile	Sun Oct 10 15:28:35 2004
+@@ -17,23 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+-MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
 +MODSPEEX=codec_speex.so
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
++MODILBC=codec_ilbc.so
+ CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
-+CFLAGS+=-fPIC -I$(LOCALBASE)/include
++CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
  LIBG723B=g723.1b/libg723b.a
@@ -30,11 +31,11 @@ $FreeBSD$
  
 -CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
 +CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
+         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
+ 	codec_g726.so
  
- all: depend $(CODECS)
-@@ -88,7 +87,7 @@
- include .depend
+@@ -91,7 +91,7 @@
+ endif
  
  install: all
 -	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
diff --git a/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c
index 661ff2d88602..3ce9571013ec 100644
--- a/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c
+++ b/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g723_1_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g723_1_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g723_1_dummy.c	Sun Oct 10 16:07:05 2004
 @@ -0,0 +1,308 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -44,7 +44,7 @@ $FreeBSD$
 +#include "slin_g723_ex.h"
 +#include "g723_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator";
diff --git a/net/asterisk16/files/patch-codecs::codec_g729_dummy.c b/net/asterisk16/files/patch-codecs::codec_g729_dummy.c
index c3e27d98e27e..9fcc7b19ca35 100644
--- a/net/asterisk16/files/patch-codecs::codec_g729_dummy.c
+++ b/net/asterisk16/files/patch-codecs::codec_g729_dummy.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ codecs/codec_g729_dummy.c	Fri Jan 30 01:57:59 2004
+--- codecs/codec_g729_dummy.c.orig	Sun Oct 10 16:05:56 2004
++++ codecs/codec_g729_dummy.c	Sun Oct 10 16:07:12 2004
 @@ -0,0 +1,275 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -38,7 +38,7 @@ $FreeBSD$
 +#include "slin_g729_ex.h"
 +#include "g729_slin_ex.h"
 +
-+static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(localuser_lock);
 +static int localusecnt=0;
 +
 +static char *tdesc = "Dummy G.729/PCM16 Codec Translator";
diff --git a/net/asterisk16/files/patch-codecs::gsm::Makefile b/net/asterisk16/files/patch-codecs::gsm::Makefile
deleted file mode 100644
index d60ed11f3298..000000000000
--- a/net/asterisk16/files/patch-codecs::gsm::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- codecs/gsm/Makefile.orig	Thu Jan  8 18:52:11 2004
-+++ codecs/gsm/Makefile	Fri Jan 30 01:47:34 2004
-@@ -60,8 +60,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
--CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
-+CC		?= gcc
-+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
- 
- LD 		= $(CC)
- 
-@@ -146,7 +146,7 @@
- DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
-+CFLAGS	+= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
- 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
diff --git a/net/asterisk16/files/patch-codecs::lpc10::Makefile b/net/asterisk16/files/patch-codecs::lpc10::Makefile
deleted file mode 100644
index 1674119a4836..000000000000
--- a/net/asterisk16/files/patch-codecs::lpc10::Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- codecs/lpc10/Makefile.orig	Mon Mar 15 18:52:28 2004
-+++ codecs/lpc10/Makefile	Wed Apr 14 22:13:47 2004
-@@ -3,7 +3,7 @@
- # 
- 
- # default C compiler
--CC= gcc
-+CC?= gcc
- 
- # 
- # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
-@@ -22,7 +22,7 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors and ALPHA too
-@@ -30,7 +30,7 @@
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
- ifneq ($(PROC),alpha)
--	CFLAGS+= -march=$(PROC)
-+	CFLAGS+=
- endif
- endif
- endif
diff --git a/net/asterisk16/files/patch-db.c b/net/asterisk16/files/patch-db.c
index 59e5cef87770..6c2bdcd443c8 100644
--- a/net/asterisk16/files/patch-db.c
+++ b/net/asterisk16/files/patch-db.c
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- db.c.orig	Tue Dec  2 17:12:56 2003
-+++ db.c	Fri Jan 30 01:47:34 2004
-@@ -32,7 +32,7 @@
- #include <asterisk/options.h>
- #include <asterisk/astdb.h>
+--- db.c.orig	Fri Jul  9 13:08:09 2004
++++ db.c	Sun Oct 10 15:32:33 2004
+@@ -33,7 +33,7 @@
  #include <asterisk/cli.h>
+ #include <asterisk/utils.h>
+ #include <asterisk/lock.h>
 -#include "db1-ast/include/db.h"
 +#include <db.h>
  #include "asterisk.h"
diff --git a/net/asterisk16/files/patch-formats::format_g723_1.c b/net/asterisk16/files/patch-formats::format_g723_1.c
index 8d0755e14205..fb5eb12833dc 100644
--- a/net/asterisk16/files/patch-formats::format_g723_1.c
+++ b/net/asterisk16/files/patch-formats::format_g723_1.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- /dev/null	Fri Jan 30 01:52:11 2004
-+++ formats/format_g723_1.c	Fri Jan 30 01:58:19 2004
+--- formats/format_g723_1.c.orig	Sun Oct 10 15:59:18 2004
++++ formats/format_g723_1.c	Sun Oct 10 16:05:05 2004
 @@ -0,0 +1,345 @@
 +/*
 + * Asterisk -- A telephony toolkit for Linux.
@@ -57,7 +57,7 @@ $FreeBSD$
 +
 +static long g723_tell(struct ast_filestream *);
 +
-+static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
++AST_MUTEX_DEFINE_STATIC(g723_lock);
 +static int glistcnt = 0;
 +
 +static char *name = "g723";
diff --git a/net/asterisk16/files/patch-include::asterisk::utils.h b/net/asterisk16/files/patch-include::asterisk::utils.h
new file mode 100644
index 000000000000..a06f7d065c84
--- /dev/null
+++ b/net/asterisk16/files/patch-include::asterisk::utils.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- include/asterisk/utils.h	2004/10/10 12:55:50	1.1
++++ include/asterisk/utils.h	2004/10/10 12:56:43
+@@ -37,7 +37,6 @@
+ #ifdef inet_ntoa
+ #undef inet_ntoa
+ #endif
+-#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
+ 
+ #ifdef LINUX
+ #define ast_pthread_create pthread_create
diff --git a/net/asterisk16/files/patch-res::Makefile b/net/asterisk16/files/patch-res::Makefile
index ccd0a35dd59d..5700f04ea1ef 100644
--- a/net/asterisk16/files/patch-res::Makefile
+++ b/net/asterisk16/files/patch-res::Makefile
@@ -1,12 +1,21 @@
 
 $FreeBSD$
 
---- res/Makefile.orig	Sun Oct 26 20:50:49 2003
-+++ res/Makefile	Fri Jan 30 01:47:34 2004
-@@ -25,7 +25,7 @@
- all: depend $(MODS)
+--- res/Makefile.orig	Sat Jul 17 23:58:01 2004
++++ res/Makefile	Thu Oct 14 19:15:00 2004
+@@ -21,7 +21,7 @@
  
- install: all
+ CFLAGS+=
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
++CFLAGS+=-DZAPATA_MOH -I$(LOCALBASE)/include
+ #
+ # Work around buggy RedHat 9.0
+ #
+@@ -34,7 +34,7 @@
+ 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
+ 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
 -	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 +	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
  
diff --git a/net/asterisk16/files/patch-rtp.c b/net/asterisk16/files/patch-rtp.c
index 11767dca198f..06289f357208 100644
--- a/net/asterisk16/files/patch-rtp.c
+++ b/net/asterisk16/files/patch-rtp.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- rtp.c.orig	Tue Nov 25 23:15:28 2003
-+++ rtp.c	Fri Jan 30 01:47:34 2004
-@@ -114,7 +114,7 @@
+--- rtp.c.orig	Sat Sep 18 16:56:28 2004
++++ rtp.c	Sun Oct 10 15:57:22 2004
+@@ -127,7 +127,7 @@
  {
  	switch(buf & TYPE_MASK) {
  	case TYPE_DONTSEND:
@@ -12,31 +12,15 @@ $FreeBSD$
  		break;
  	case TYPE_SILENCE:
  		return 4;
-@@ -1028,19 +1028,6 @@
- 		while((f = ast_smoother_read(rtp->smoother)))
- 			ast_rtp_raw_write(rtp, f, codec);
- 		break;
--	case AST_FORMAT_G729A:
--		if (!rtp->smoother) {
--			rtp->smoother = ast_smoother_new(20);
--		}
--		if (!rtp->smoother) {
--			ast_log(LOG_WARNING, "Unable to create g729 smoother :(\n");
--			return -1;
--		}
--		ast_smoother_feed(rtp->smoother, _f);
--		
--		while((f = ast_smoother_read(rtp->smoother)))
--			ast_rtp_raw_write(rtp, f, codec);
--		break;
- 	case AST_FORMAT_GSM:
- 		if (!rtp->smoother) {
- 			rtp->smoother = ast_smoother_new(33);
-@@ -1071,6 +1058,7 @@
- 	case AST_FORMAT_H261:
- 	case AST_FORMAT_H263:
- 	case AST_FORMAT_G723_1:
-+	case AST_FORMAT_G729A:
- 	case AST_FORMAT_SPEEX:
- 	        // Don't buffer outgoing frames; send them one-per-packet:
- 		if (_f->offset < hdrlen) {
+@@ -841,8 +841,10 @@
+ 		/* Must be an even port number by RTP spec */
+ 		rtp->us.sin_port = htons(x);
+ 		rtp->us.sin_addr = addr;
+-		if (rtp->rtcp)
++		if (rtp->rtcp) {
+ 			rtp->rtcp->us.sin_port = htons(x + 1);
++			rtp->rtcp->us.sin_addr = addr;
++		}
+ 		if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
+ 			(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
+ 			break;
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index eb427fa04447..f1519b3f3a39 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -7,6 +7,9 @@ etc/asterisk/adtranvofr.conf-dist
 @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
 etc/asterisk/agents.conf-dist
 @exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf
+@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
+etc/asterisk/alarmreceiver.conf-dist
+@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf
 @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
 etc/asterisk/alsa.conf-dist
 @exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf
@@ -16,18 +19,30 @@ etc/asterisk/asterisk.adsi-dist
 @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
 etc/asterisk/asterisk.conf-dist
 @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
+etc/asterisk/cdr_manager.conf-dist
+@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
 etc/asterisk/cdr_odbc.conf-dist
 @exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
 etc/asterisk/cdr_pgsql.conf-dist
 @exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf
+@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
+etc/asterisk/cdr_tds.conf-dist
+@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf
 @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
 etc/asterisk/enum.conf-dist
 @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf
+@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
+etc/asterisk/extconfig.conf-dist
+@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf
 @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
 etc/asterisk/extensions.conf-dist
 @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf
+@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
+etc/asterisk/features.conf-dist
+@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
@@ -37,6 +52,9 @@ etc/asterisk/h323.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
+@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
+etc/asterisk/iaxprov.conf-dist
+@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf
 @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
 etc/asterisk/indications.conf-dist
 @exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf
@@ -61,12 +79,12 @@ etc/asterisk/modules.conf-dist
 @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
 etc/asterisk/musiconhold.conf-dist
 @exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf
+@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
+etc/asterisk/osp.conf-dist
+@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf
 @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
 etc/asterisk/oss.conf-dist
 @exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf
-@unexec if cmp -s %D/etc/asterisk/parking.conf %D/etc/asterisk/parking.conf-dist; then rm -f %D/etc/asterisk/parking.conf; fi
-etc/asterisk/parking.conf-dist
-@exec [ -f %B/parking.conf ] || cp %B/%f %B/parking.conf
 @unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
 etc/asterisk/phone.conf-dist
 @exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf
@@ -76,6 +94,12 @@ etc/asterisk/privacy.conf-dist
 @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
 etc/asterisk/queues.conf-dist
 @exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf
+@unexec if cmp -s %D/etc/asterisk/res_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi
+etc/asterisk/res_config_odbc.conf-dist
+@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.conf
+@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
+etc/asterisk/res_odbc.conf-dist
+@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf
 @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
 etc/asterisk/rpt.conf-dist
 @exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf
@@ -103,11 +127,13 @@ etc/asterisk/zapata.conf-dist
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
+include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/app.h
 include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
+include/asterisk/astosp.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
@@ -116,12 +142,14 @@ include/asterisk/channel_pvt.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/config.h
+include/asterisk/config_pvt.h
 include/asterisk/crypto.h
 include/asterisk/cvsid.h
 include/asterisk/dlfcn-compat.h
 include/asterisk/dns.h
 include/asterisk/dsp.h
 include/asterisk/enum.h
+include/asterisk/features.h
 include/asterisk/file.h
 include/asterisk/frame.h
 include/asterisk/fskmodem.h
@@ -138,10 +166,10 @@ include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
 include/asterisk/options.h
-include/asterisk/parking.h
 include/asterisk/pbx.h
 include/asterisk/poll-compat.h
 include/asterisk/privacy.h
+include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -150,30 +178,39 @@ include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/translate.h
 include/asterisk/ulaw.h
+include/asterisk/utils.h
 include/asterisk/vmodem.h
 lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_agi.so
+lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
+lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
-lib/asterisk/modules/app_datetime.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
 lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_enumlookup.so
+lib/asterisk/modules/app_eval.so
+lib/asterisk/modules/app_exec.so
 lib/asterisk/modules/app_festival.so
+lib/asterisk/modules/app_flash.so
+lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
+lib/asterisk/modules/app_groupcount.so
 lib/asterisk/modules/app_hasnewvoicemail.so
+lib/asterisk/modules/app_ices.so
 lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_intercom.so
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+lib/asterisk/modules/app_meetme.so
 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_playback.so
 lib/asterisk/modules/app_privacy.so
@@ -184,20 +221,31 @@ lib/asterisk/modules/app_read.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
+lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so
 lib/asterisk/modules/app_setcdruserfield.so
 lib/asterisk/modules/app_setcidname.so
 lib/asterisk/modules/app_setcidnum.so
+lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_striplsd.so
 lib/asterisk/modules/app_substring.so
 lib/asterisk/modules/app_system.so
+lib/asterisk/modules/app_talkdetect.so
+lib/asterisk/modules/app_test.so
 lib/asterisk/modules/app_transfer.so
+lib/asterisk/modules/app_txtcidname.so
 lib/asterisk/modules/app_url.so
+lib/asterisk/modules/app_userevent.so
+lib/asterisk/modules/app_verbose.so
 lib/asterisk/modules/app_voicemail.so
 lib/asterisk/modules/app_waitforring.so
 lib/asterisk/modules/app_zapateller.so
+lib/asterisk/modules/app_zapbarge.so
+lib/asterisk/modules/app_zapras.so
+lib/asterisk/modules/app_zapscan.so
 lib/asterisk/modules/cdr_csv.so
+lib/asterisk/modules/cdr_manager.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax2.so
@@ -210,11 +258,12 @@ lib/asterisk/modules/chan_modem_i4l.so
 lib/asterisk/modules/chan_oss.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
-%%ZAPTEL%%lib/asterisk/modules/chan_zap.so
+lib/asterisk/modules/chan_zap.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g723_1_dummy.so
+lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_g729_dummy.so
 lib/asterisk/modules/codec_gsm.so
 lib/asterisk/modules/codec_ilbc.so
@@ -222,12 +271,15 @@ lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723_1.so
+lib/asterisk/modules/format_g726.so
 lib/asterisk/modules/format_g729.so
 lib/asterisk/modules/format_gsm.so
 lib/asterisk/modules/format_h263.so
+lib/asterisk/modules/format_ilbc.so
 lib/asterisk/modules/format_jpeg.so
 lib/asterisk/modules/format_pcm.so
 lib/asterisk/modules/format_pcm_alaw.so
+lib/asterisk/modules/format_sln.so
 lib/asterisk/modules/format_vox.so
 lib/asterisk/modules/format_wav.so
 lib/asterisk/modules/format_wav_gsm.so
@@ -235,20 +287,25 @@ lib/asterisk/modules/pbx_config.so
 lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/pbx_wilcalu.so
 lib/asterisk/modules/res_adsi.so
+lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_features.so
 lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_parking.so
 sbin/asterisk
 sbin/astgenkey
 sbin/safe_asterisk
 share/asterisk/agi-bin/agi-test.agi
 share/asterisk/agi-bin/eagi-sphinx-test
 share/asterisk/agi-bin/eagi-test
+share/asterisk/firmware/iax/iaxy.bin
 share/asterisk/images/asterisk-intro.jpg
+share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/mohmp3/sample-hold.mp3
+share/asterisk/mohmp3/fpm-calm-river.mp3
+share/asterisk/mohmp3/fpm-sunshine.mp3
+share/asterisk/mohmp3/fpm-world-mix.mp3
 share/asterisk/sounds/agent-alreadyon.gsm
 share/asterisk/sounds/agent-incorrect.gsm
 share/asterisk/sounds/agent-loggedoff.gsm
@@ -259,12 +316,23 @@ share/asterisk/sounds/agent-user.gsm
 share/asterisk/sounds/auth-incorrect.gsm
 share/asterisk/sounds/auth-thankyou.gsm
 share/asterisk/sounds/beep.gsm
+share/asterisk/sounds/conf-adminmenu.gsm
+share/asterisk/sounds/conf-enteringno.gsm
+share/asterisk/sounds/conf-errormenu.gsm
 share/asterisk/sounds/conf-getchannel.gsm
 share/asterisk/sounds/conf-getconfno.gsm
 share/asterisk/sounds/conf-getpin.gsm
 share/asterisk/sounds/conf-invalid.gsm
 share/asterisk/sounds/conf-invalidpin.gsm
+share/asterisk/sounds/conf-kicked.gsm
+share/asterisk/sounds/conf-locked.gsm
+share/asterisk/sounds/conf-lockednow.gsm
+share/asterisk/sounds/conf-muted.gsm
+share/asterisk/sounds/conf-noempty.gsm
 share/asterisk/sounds/conf-onlyperson.gsm
+share/asterisk/sounds/conf-unlockednow.gsm
+share/asterisk/sounds/conf-unmuted.gsm
+share/asterisk/sounds/conf-usermenu.gsm
 share/asterisk/sounds/demo-abouttotry.gsm
 share/asterisk/sounds/demo-congrats.gsm
 share/asterisk/sounds/demo-echodone.gsm
@@ -359,16 +427,88 @@ share/asterisk/sounds/digits/tomorrow.gsm
 share/asterisk/sounds/digits/yesterday.gsm
 share/asterisk/sounds/dir-instr.gsm
 share/asterisk/sounds/dir-intro.gsm
+share/asterisk/sounds/dir-intro-fn.gsm
 share/asterisk/sounds/dir-nomatch.gsm
 share/asterisk/sounds/dir-nomore.gsm
 share/asterisk/sounds/invalid.gsm
+share/asterisk/sounds/letters/a.gsm
+share/asterisk/sounds/letters/at.gsm
+share/asterisk/sounds/letters/b.gsm
+share/asterisk/sounds/letters/c.gsm
+share/asterisk/sounds/letters/d.gsm
+share/asterisk/sounds/letters/dash.gsm
+share/asterisk/sounds/letters/dollar.gsm
+share/asterisk/sounds/letters/dot.gsm
+share/asterisk/sounds/letters/e.gsm
+share/asterisk/sounds/letters/equals.gsm
+share/asterisk/sounds/letters/exclaimation-point.gsm
+share/asterisk/sounds/letters/f.gsm
+share/asterisk/sounds/letters/g.gsm
+share/asterisk/sounds/letters/h.gsm
+share/asterisk/sounds/letters/i.gsm
+share/asterisk/sounds/letters/j.gsm
+share/asterisk/sounds/letters/k.gsm
+share/asterisk/sounds/letters/l.gsm
+share/asterisk/sounds/letters/m.gsm
+share/asterisk/sounds/letters/n.gsm
+share/asterisk/sounds/letters/o.gsm
+share/asterisk/sounds/letters/p.gsm
+share/asterisk/sounds/letters/plus.gsm
+share/asterisk/sounds/letters/q.gsm
+share/asterisk/sounds/letters/r.gsm
+share/asterisk/sounds/letters/s.gsm
+share/asterisk/sounds/letters/slash.gsm
+share/asterisk/sounds/letters/space.gsm
+share/asterisk/sounds/letters/t.gsm
+share/asterisk/sounds/letters/u.gsm
+share/asterisk/sounds/letters/v.gsm
+share/asterisk/sounds/letters/w.gsm
+share/asterisk/sounds/letters/x.gsm
+share/asterisk/sounds/letters/y.gsm
+share/asterisk/sounds/letters/z.gsm
+share/asterisk/sounds/letters/zed.gsm
 share/asterisk/sounds/pbx-invalid.gsm
 share/asterisk/sounds/pbx-invalidpark.gsm
 share/asterisk/sounds/pbx-transfer.gsm
+share/asterisk/sounds/phonetic/9_p.gsm
+share/asterisk/sounds/phonetic/a_p.gsm
+share/asterisk/sounds/phonetic/b_p.gsm
+share/asterisk/sounds/phonetic/c_p.gsm
+share/asterisk/sounds/phonetic/d_p.gsm
+share/asterisk/sounds/phonetic/e_p.gsm
+share/asterisk/sounds/phonetic/f_p.gsm
+share/asterisk/sounds/phonetic/g_p.gsm
+share/asterisk/sounds/phonetic/h_p.gsm
+share/asterisk/sounds/phonetic/i_p.gsm
+share/asterisk/sounds/phonetic/j_p.gsm
+share/asterisk/sounds/phonetic/k_p.gsm
+share/asterisk/sounds/phonetic/l_p.gsm
+share/asterisk/sounds/phonetic/m_p.gsm
+share/asterisk/sounds/phonetic/n_p.gsm
+share/asterisk/sounds/phonetic/o_p.gsm
+share/asterisk/sounds/phonetic/p_p.gsm
+share/asterisk/sounds/phonetic/q_p.gsm
+share/asterisk/sounds/phonetic/r_p.gsm
+share/asterisk/sounds/phonetic/s_p.gsm
+share/asterisk/sounds/phonetic/t_p.gsm
+share/asterisk/sounds/phonetic/u_p.gsm
+share/asterisk/sounds/phonetic/v_p.gsm
+share/asterisk/sounds/phonetic/w_p.gsm
+share/asterisk/sounds/phonetic/x_p.gsm
+share/asterisk/sounds/phonetic/y_p.gsm
+share/asterisk/sounds/phonetic/z_p.gsm
 share/asterisk/sounds/privacy-incorrect.gsm
 share/asterisk/sounds/privacy-prompt.gsm
 share/asterisk/sounds/privacy-thankyou.gsm
 share/asterisk/sounds/privacy-unident.gsm
+share/asterisk/sounds/queue-callswaiting.gsm
+share/asterisk/sounds/queue-holdtime.gsm
+share/asterisk/sounds/queue-less-than.gsm
+share/asterisk/sounds/queue-minutes.gsm
+share/asterisk/sounds/queue-seconds.gsm
+share/asterisk/sounds/queue-thankyou.gsm
+share/asterisk/sounds/queue-thereare.gsm
+share/asterisk/sounds/queue-youarenext.gsm
 share/asterisk/sounds/ss-noservice.gsm
 share/asterisk/sounds/transfer.gsm
 share/asterisk/sounds/tt-allbusy.gsm
@@ -387,22 +527,31 @@ share/asterisk/sounds/vm-Friends.gsm
 share/asterisk/sounds/vm-INBOX.gsm
 share/asterisk/sounds/vm-Old.gsm
 share/asterisk/sounds/vm-Work.gsm
+share/asterisk/sounds/vm-advopts.gsm
 share/asterisk/sounds/vm-and.gsm
+share/asterisk/sounds/vm-calldiffnum.gsm
 share/asterisk/sounds/vm-changeto.gsm
 share/asterisk/sounds/vm-delete.gsm
 share/asterisk/sounds/vm-deleted.gsm
+share/asterisk/sounds/vm-dialout.gsm
+share/asterisk/sounds/vm-enter-num-to-call.gsm
 share/asterisk/sounds/vm-extension.gsm
 share/asterisk/sounds/vm-first.gsm
 share/asterisk/sounds/vm-for.gsm
 share/asterisk/sounds/vm-forwardoptions.gsm
+share/asterisk/sounds/vm-from-extension.gsm
+share/asterisk/sounds/vm-from-phonenumber.gsm
+share/asterisk/sounds/vm-from.gsm
 share/asterisk/sounds/vm-goodbye.gsm
 share/asterisk/sounds/vm-helpexit.gsm
 share/asterisk/sounds/vm-incorrect.gsm
+share/asterisk/sounds/vm-incorrect-mailbox.gsm
 share/asterisk/sounds/vm-instructions.gsm
 share/asterisk/sounds/vm-intro.gsm
 share/asterisk/sounds/vm-isonphone.gsm
 share/asterisk/sounds/vm-isunavail.gsm
 share/asterisk/sounds/vm-last.gsm
+share/asterisk/sounds/vm-leavemsg.gsm
 share/asterisk/sounds/vm-login.gsm
 share/asterisk/sounds/vm-mailboxfull.gsm
 share/asterisk/sounds/vm-message.gsm
@@ -414,7 +563,10 @@ share/asterisk/sounds/vm-newpassword.gsm
 share/asterisk/sounds/vm-next.gsm
 share/asterisk/sounds/vm-no.gsm
 share/asterisk/sounds/vm-nobodyavail.gsm
+share/asterisk/sounds/vm-nobox.gsm
 share/asterisk/sounds/vm-nomore.gsm
+share/asterisk/sounds/vm-nonumber.gsm
+share/asterisk/sounds/vm-num-i-have.gsm
 share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-options.gsm
 share/asterisk/sounds/vm-opts.gsm
@@ -422,30 +574,49 @@ share/asterisk/sounds/vm-passchanged.gsm
 share/asterisk/sounds/vm-password.gsm
 share/asterisk/sounds/vm-press.gsm
 share/asterisk/sounds/vm-prev.gsm
+share/asterisk/sounds/vm-reachoper.gsm
 share/asterisk/sounds/vm-rec-busy.gsm
 share/asterisk/sounds/vm-rec-name.gsm
 share/asterisk/sounds/vm-rec-unv.gsm
 share/asterisk/sounds/vm-received.gsm
 share/asterisk/sounds/vm-reenterpassword.gsm
 share/asterisk/sounds/vm-repeat.gsm
+share/asterisk/sounds/vm-review.gsm
 share/asterisk/sounds/vm-saved.gsm
 share/asterisk/sounds/vm-savedto.gsm
 share/asterisk/sounds/vm-savefolder.gsm
 share/asterisk/sounds/vm-savemessage.gsm
 share/asterisk/sounds/vm-sorry.gsm
+share/asterisk/sounds/vm-star-cancel.gsm
+share/asterisk/sounds/vm-starmain.gsm
+share/asterisk/sounds/vm-then-pound.gsm
 share/asterisk/sounds/vm-theperson.gsm
+share/asterisk/sounds/vm-tocallback.gsm
+share/asterisk/sounds/vm-tocallnum.gsm
 share/asterisk/sounds/vm-tocancel.gsm
+share/asterisk/sounds/vm-tocancelmsg.gsm
+share/asterisk/sounds/vm-toenternumber.gsm
 share/asterisk/sounds/vm-toforward.gsm
+share/asterisk/sounds/vm-tohearenv.gsm
+share/asterisk/sounds/vm-tomakecall.gsm
+share/asterisk/sounds/vm-tooshort.gsm
+share/asterisk/sounds/vm-toreply.gsm
+share/asterisk/sounds/vm-torerecord.gsm
 share/asterisk/sounds/vm-undelete.gsm
 share/asterisk/sounds/vm-undeleted.gsm
+share/asterisk/sounds/vm-unknown-caller.gsm
 share/asterisk/sounds/vm-whichbox.gsm
 share/asterisk/sounds/vm-youhave.gsm
 share/asterisk/sounds/voicemail
+@dirrm share/asterisk/sounds/phonetic
+@dirrm share/asterisk/sounds/letters
 @dirrm share/asterisk/sounds/digits
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/mohmp3
 @dirrm share/asterisk/keys
 @dirrm share/asterisk/images
+@dirrm share/asterisk/firmware/iax
+@dirrm share/asterisk/firmware
 @dirrm share/asterisk/agi-bin
 @dirrm share/asterisk
 @dirrm lib/asterisk/modules
@@ -463,6 +634,7 @@ spool/asterisk/voicemail/default/1234/unavail.gsm
 @dirrm spool/asterisk/voicemail/default/1234
 @dirrm spool/asterisk/voicemail/default
 @dirrm spool/asterisk/voicemail
+@dirrm spool/asterisk/tmp
 @dirrm spool/asterisk
 @dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk
author	sobomax <sobomax@FreeBSD.org>	2004-10-18 02:00:02 +0800
committer	sobomax <sobomax@FreeBSD.org>	2004-10-18 02:00:02 +0800
commit	7ff2f405ce157c058154a45ecdaca5a63315aff7 (patch)
tree	49c5befe7ad728e927609cb504b3f10285bd7b52 /net
parent	5afb7d5be8fcbc46177741e082bc45849839f973 (diff)
download	freebsd-ports-gnome-7ff2f405ce157c058154a45ecdaca5a63315aff7.tar.gz freebsd-ports-gnome-7ff2f405ce157c058154a45ecdaca5a63315aff7.tar.zst freebsd-ports-gnome-7ff2f405ce157c058154a45ecdaca5a63315aff7.zip