o Update zaptel to 1.4.1;

Submitted by:	Oleksandr Tymoshenko <gonzo@pbxpress.com>

o update libpri to 1.4.0;

PR:		111555
Submitted by:	"Phillip N." <pneumann@gmail.com>

o update asterisk12 to 1.2.7.

Sponsored by:	Sippy Software, Inc. ( http://www.sippysoft.com/ )

The reason it all is going in together is that they are interdependent.

41 files changed, 352 insertions, 371 deletions

diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile
index c2a3c46dd8f8..e69e0974749b 100644
--- a/misc/libpri/Makefile
+++ b/misc/libpri/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.2.4
+PORTVERSION=	1.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.digium.com/pub/libpri/ \
 		ftp://ftp.digium.com/pub/libpri/old/
@@ -14,15 +14,9 @@ MASTER_SITES=	ftp://ftp.digium.com/pub/libpri/ \
 MAINTAINER=	gonzo@univ.kiev.ua
 COMMENT=	A C implementation of the Primary Rate ISDN specification
 
-#PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
-#PATCH_SITES=	${MASTER_SITE_LOCAL}
-#PATCH_SITE_SUBDIR=	fjoe
-#PATCH_DIST_STRIP=	-p1
-#BRIVER=		bristuff-0.3.0-PRE-1l
-
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-PLIST_FILES=	include/libpri.h lib/libpri.a lib/libpri.a lib/libpri.so \
+PLIST_FILES=	include/libpri.h lib/libpri.a lib/libpri.so \
 		lib/libpri.so.1
 
 NOT_FOR_ARCHS=	alpha
diff --git a/misc/libpri/distinfo b/misc/libpri/distinfo
index ce8a16520eb0..736952fb9803 100644
--- a/misc/libpri/distinfo
+++ b/misc/libpri/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpri-1.2.4.tar.gz) = 2bc348d8363027736ccbf5998d85d317
-SHA256 (libpri-1.2.4.tar.gz) = bbfaf5dff54934d844b3785e3fbd19817f0d80b1aa84153e5be40802c6b00d93
-SIZE (libpri-1.2.4.tar.gz) = 76663
+MD5 (libpri-1.4.0.tar.gz) = 09b039226e43a810d523bc076823c6a9
+SHA256 (libpri-1.4.0.tar.gz) = 9f4db10a105545e68cbe0620795d2e11278828fa281ad339eeb72087125eeaf9
+SIZE (libpri-1.4.0.tar.gz) = 80021
diff --git a/misc/libpri/files/patch-mkdep b/misc/libpri/files/patch-mkdep
deleted file mode 100644
index 3d8849b88e37..000000000000
--- a/misc/libpri/files/patch-mkdep
+++ /dev/null
@@ -1,8 +0,0 @@
---- mkdep.orig	Wed Nov 30 22:55:54 2005
-+++ mkdep	Wed Nov 30 22:56:00 2005
-@@ -1,4 +1,4 @@
--#!/bin/bash -
-+#!/bin/sh -
- #
- #	$OpenBSD: mkdep.gcc.sh,v 1.8 1998/09/02 06:40:07 deraadt Exp $
- #	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile
index e0854c59d557..c022c0f98f05 100644
--- a/misc/zaptel/Makefile
+++ b/misc/zaptel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zaptel
-PORTVERSION=	1.2.13
+PORTVERSION=	1.4.1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.pbxpress.com/~gonzo/
 DISTNAME=	${PORTNAME}-bsd-${PORTVERSION}
@@ -46,7 +46,6 @@ pre-su-install:
 	@${MKDIR} ${PREFIX}/lib/zaptel
 
 post-install:
-	@${LN} -sfh ${PREFIX}/include ${PREFIX}/include/zaptel
 	@${TOUCH} ${PREFIX}/lib/zaptel/linker.hints
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/misc/zaptel/distinfo b/misc/zaptel/distinfo
index 2d4f7187a634..bb24aad7d558 100644
--- a/misc/zaptel/distinfo
+++ b/misc/zaptel/distinfo
@@ -1,3 +1,3 @@
-MD5 (zaptel-bsd-1.2.13.tar.gz) = d5d01a5c367969c302d1d70620e9c236
-SHA256 (zaptel-bsd-1.2.13.tar.gz) = c2032a94514016df28f788986aef7d099987aa1d4a62c4ea232af79c3b42a4c4
-SIZE (zaptel-bsd-1.2.13.tar.gz) = 363975
+MD5 (zaptel-bsd-1.4.1.tar.gz) = 34af06241beee361b6a696b20d294d36
+SHA256 (zaptel-bsd-1.4.1.tar.gz) = 9da4724c1a5a269e0b89d791fa5cc0758d4de48ce7b3e6cc0c0aad4427ccc37f
+SIZE (zaptel-bsd-1.4.1.tar.gz) = 1009671
diff --git a/misc/zaptel/files/patch-Makefile b/misc/zaptel/files/patch-Makefile
new file mode 100644
index 000000000000..66912ce6d81e
--- /dev/null
+++ b/misc/zaptel/files/patch-Makefile
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- Makefile
++++ Makefile
+@@ -1,5 +1,5 @@
+ # $Id: Makefile,v 1.1 2007/04/25 23:15:33 root Exp root $
+-HWMODULES=zaptel tools oct612x qozap zaphfc wcfxs wcfxo wct1xxp wcte11xp wct4xxp ztdummy 
++HWMODULES=zaptel tools qozap zaphfc wcfxs wcfxo wct1xxp wcte11xp wct4xxp ztdummy 
+ USERLAND=ztcfg test
+ HWMODULES+=tau32pci
+ # This is for testing purposes
diff --git a/misc/zaptel/files/patch-qozap::Makefile b/misc/zaptel/files/patch-qozap::Makefile
deleted file mode 100644
index 96e2efe5d9da..000000000000
--- a/misc/zaptel/files/patch-qozap::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- qozap/Makefile
-+++ qozap/Makefile
-@@ -7,7 +7,7 @@
- KMOD=	qozap
- SRCS=	qozap.c qozap_freebsd.c
- SRCS+=	device_if.h bus_if.h isa_if.h pci_if.h 
--CFLAGS+=-I../zaptel
-+CFLAGS+=-I../zaptel -DCONFIG_PCI=1
- WERROR=	-Wall
- 
- #DEBUG_FLAGS=	-g
diff --git a/misc/zaptel/files/patch-qozap::qozap_freebsd.c b/misc/zaptel/files/patch-qozap::qozap_freebsd.c
deleted file mode 100644
index db868dcbd5f1..000000000000
--- a/misc/zaptel/files/patch-qozap::qozap_freebsd.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- qozap/qozap_freebsd.c
-+++ qozap/qozap_freebsd.c
-@@ -175,9 +175,15 @@
- 		qozap_free(sc);
- 		return (ENXIO);
- 	}
-+#if __FreeBSD_version < 700031
- 	error = bus_setup_intr(
- 	    dev, sc->irq_res, INTR_TYPE_CLK | INTR_FAST, qoz_interrupt,
- 	    sc, &sc->irq_handle);
-+#else
-+	error = bus_setup_intr(
-+	    dev, sc->irq_res, INTR_TYPE_CLK | INTR_FAST, NULL, qoz_interrupt,
-+	    sc, &sc->irq_handle);
-+#endif
- 	if (error) {
- 		device_printf(dev, "Can't setup interrupt handler (error %d)\n",
- 		    error);
diff --git a/misc/zaptel/files/patch-tau32pci::tau32pci.c b/misc/zaptel/files/patch-tau32pci::tau32pci.c
deleted file mode 100644
index 5267618eb052..000000000000
--- a/misc/zaptel/files/patch-tau32pci::tau32pci.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- tau32pci/tau32pci.c
-+++ tau32pci/tau32pci.c
-@@ -2785,10 +2785,18 @@
- 	}
- 
- 	/* set interrupt handler */
-+#if __FreeBSD_version < 700031
- 	error  = bus_setup_intr (dev, board->tau32_irq, INTR_TYPE_CLK | INTR_FAST, tau32_intr, board, &board->tau32_intrhand);
-+#else
-+	error  = bus_setup_intr (dev, board->tau32_irq, INTR_TYPE_CLK | INTR_FAST, NULL, tau32_intr, board, &board->tau32_intrhand);
-+#endif
- 	if(error) {
- 		printf ("tau32_%d: Can't use fast interrupts, switching to generic\n", unit);
-+#if __FreeBSD_version < 700031
- 		error  = bus_setup_intr (dev, board->tau32_irq, INTR_TYPE_CLK, tau32_intr, board, &(board->tau32_intrhand));
-+#else
-+		error  = bus_setup_intr (dev, board->tau32_irq, INTR_TYPE_CLK, NULL, tau32_intr, board, &(board->tau32_intrhand));
-+#endif
- 	}
- 
- 
diff --git a/misc/zaptel/files/patch-test::Makefile b/misc/zaptel/files/patch-test::Makefile
new file mode 100644
index 000000000000..bcfcca2f2809
--- /dev/null
+++ b/misc/zaptel/files/patch-test::Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- test/Makefile
++++ test/Makefile
+@@ -1,7 +1,7 @@
+ # $Id: Makefile,v 1.1 2007/04/25 23:17:23 root Exp root $ 
+ 
+ LOCALBASE?=/usr/local
+-CFLAGS+=-I../zaptel -I../ztcfg -I${LOCALBASE}/include 
++CFLAGS+=-I../ -I../zaptel -I../ztcfg -I${LOCALBASE}/include 
+ PREFIX?=/usr/local
+ BSD_INSTALL_PROGRAM?=${INSTALL} -o root -g wheel -m 755 -s
+ 
diff --git a/misc/zaptel/files/patch-wcfxo::wcfxo.c b/misc/zaptel/files/patch-wcfxo::wcfxo.c
deleted file mode 100644
index 2a79e3aff51c..000000000000
--- a/misc/zaptel/files/patch-wcfxo::wcfxo.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- wcfxo/wcfxo.c
-+++ wcfxo/wcfxo.c
-@@ -1285,14 +1285,25 @@
- 
- 	/* Now we should set up the interrupt handler */
- 
-+#if __FreeBSD_version < 700031
- 	error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST,
- 		(void (*)(void *))wcfxo_interrupt, sc, &(sc->irq_handler));
-+#else
-+	error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL,
-+		(void (*)(void *))wcfxo_interrupt, sc, &(sc->irq_handler));
-+#endif
- 
- 	if(error)
- 	{
- 		printf("Can't use fast interrupts, falling back to normal\n");
-+#if __FreeBSD_version < 700031
- 		error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK,
- 			(void (*)(void *))wcfxo_interrupt, sc, &(sc->irq_handler));
-+#else
-+		error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, NULL,
-+			(void (*)(void *))wcfxo_interrupt, sc, &(sc->irq_handler));
-+#endif
-+
- 	}
- 
- 	if (error) {
diff --git a/misc/zaptel/files/patch-wcfxs::wcfxs.c b/misc/zaptel/files/patch-wcfxs::wcfxs.c
deleted file mode 100644
index 201d03a59753..000000000000
--- a/misc/zaptel/files/patch-wcfxs::wcfxs.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- wcfxs/wcfxs.c
-+++ wcfxs/wcfxs.c
-@@ -2764,12 +2764,23 @@
- 
- 	/* Now we should set up the interrupt handler */
- 
-+#if __FreeBSD_version < 700031
- 	error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST,
- 		(void (*)(void *))wcfxs_interrupt, sc, &(sc->irq_handler));
-+#else
-+	error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL,
-+		(void (*)(void *))wcfxs_interrupt, sc, &(sc->irq_handler));
-+#endif
-+
- 	if (error) {
- 		printf("Can't use fast interrupts, falling back to normal\n");
-+#if __FreeBSD_version < 700031
- 		error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK,
- 			(void (*)(void *))wcfxs_interrupt, sc, &(sc->irq_handler));
-+#else
-+		error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, NULL,
-+			(void (*)(void *))wcfxs_interrupt, sc, &(sc->irq_handler));
-+#endif
- 		if(error)
- 		{
- 			printf("Couldn't set up irq\n");
diff --git a/misc/zaptel/files/patch-wct1xxp::wct1xxp.c b/misc/zaptel/files/patch-wct1xxp::wct1xxp.c
deleted file mode 100644
index 99b2d0642341..000000000000
--- a/misc/zaptel/files/patch-wct1xxp::wct1xxp.c
+++ /dev/null
@@ -1,30 +0,0 @@
-
-$FreeBSD$
-
---- wct1xxp/wct1xxp.c
-+++ wct1xxp/wct1xxp.c
-@@ -1746,14 +1746,24 @@
- 
- 	/* Now we should set up the interrupt handler */
- 
-+#if __FreeBSD_version < 700031
- 	error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST,
- 		(void (*)(void *))wct1xxp_interrupt, sc, &(sc->irq_handler));
-+#else
-+	error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL,
-+		(void (*)(void *))wct1xxp_interrupt, sc, &(sc->irq_handler));
-+#endif
- 
- 	if(error)
- 	{
- 		printf("Can not use fast interrupts, switching to generic\n");
-+#if __FreeBSD_version < 700031
- 		error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK,
- 			(void (*)(void *))wct1xxp_interrupt, sc, &(sc->irq_handler));
-+#else
-+		error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, NULL,
-+			(void (*)(void *))wct1xxp_interrupt, sc, &(sc->irq_handler));
-+#endif
- 	}
- 
- 
diff --git a/misc/zaptel/files/patch-wct4xxp::wct4xxp.c b/misc/zaptel/files/patch-wct4xxp::wct4xxp.c
deleted file mode 100644
index ac7129627565..000000000000
--- a/misc/zaptel/files/patch-wct4xxp::wct4xxp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- wct4xxp/wct4xxp.c
-+++ wct4xxp/wct4xxp.c
-@@ -3800,15 +3800,29 @@
- 	    return ENXIO;
- 	}
- 
-+#if __FreeBSD_version < 700031
- 	error = bus_setup_intr(dev, wc->wc_irq, INTR_TYPE_CLK | INTR_FAST,
- 	    (void (*)(void *)) ((ident->device_info->flags & FLAG_2NDGEN) ?  
- 	    t4_interrupt_gen2 : t4_interrupt), wc, &(wc->irq_handler));
-+#else
-+	error = bus_setup_intr(dev, wc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL,
-+	    (void (*)(void *)) ((ident->device_info->flags & FLAG_2NDGEN) ?
-+	    t4_interrupt_gen2 : t4_interrupt), wc, &(wc->irq_handler));
-+#endif
-+
- 	if(error)
- 	{
- 		printf("Can't use fast interrupts falling back to normal\n");
-+#if __FreeBSD_version < 700031
- 		error = bus_setup_intr(dev, wc->wc_irq, INTR_TYPE_CLK,
- 	    		(void (*)(void *)) ((ident->device_info->flags & FLAG_2NDGEN) ?  
- 	    		t4_interrupt_gen2 : t4_interrupt), wc, &(wc->irq_handler));
-+#else
-+		error = bus_setup_intr(dev, wc->wc_irq, INTR_TYPE_CLK, NULL,
-+			(void (*)(void *)) ((ident->device_info->flags & FLAG_2NDGEN) ?
-+			t4_interrupt_gen2 : t4_interrupt), wc, &(wc->irq_handler));
-+#endif
-+
- 
- 	}
- 
diff --git a/misc/zaptel/files/patch-wcte11xp::wcte11xp.c b/misc/zaptel/files/patch-wcte11xp::wcte11xp.c
deleted file mode 100644
index bf2da4cf83e1..000000000000
--- a/misc/zaptel/files/patch-wcte11xp::wcte11xp.c
+++ /dev/null
@@ -1,30 +0,0 @@
-
-$FreeBSD$
-
---- wcte11xp/wcte11xp.c
-+++ wcte11xp/wcte11xp.c
-@@ -1953,14 +1953,24 @@
- 
- 	/* Now we should set up the interrupt handler */
- 
-+#if __FreeBSD_version < 700031
- 	error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST,
- 		(void (*)(void *))wcte11xp_interrupt, sc, &(sc->irq_handler));
-+#else
-+	error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK | INTR_FAST, NULL,
-+		(void (*)(void *))wcte11xp_interrupt, sc, &(sc->irq_handler));
-+#endif
- 
- 	if(error)
- 	{
- 		printf("Can not use fast interrupts, switching to generic\n");
-+#if __FreeBSD_version < 700031
- 		error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK,
- 			(void (*)(void *))wcte11xp_interrupt, sc, &(sc->irq_handler));
-+#else
-+		error = bus_setup_intr(dev, sc->wc_irq, INTR_TYPE_CLK, NULL,
-+			(void (*)(void *))wcte11xp_interrupt, sc, &(sc->irq_handler));
-+#endif
- 	}
- 
- 	if (error) {
diff --git a/misc/zaptel/files/patch-zaphfc::Makefile b/misc/zaptel/files/patch-zaphfc::Makefile
deleted file mode 100644
index b25a413eb9bb..000000000000
--- a/misc/zaptel/files/patch-zaphfc::Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- zaphfc/Makefile.orig
-+++ zaphfc/Makefile
-@@ -7,9 +7,7 @@
- KMOD=	zaphfc
- SRCS=	zaphfc.c zaphfc_freebsd.c
- SRCS+=	device_if.h bus_if.h isa_if.h pci_if.h 
--CFLAGS+=-I../zaptel
-+CFLAGS+=-I../zaptel -DCONFIG_PCI=1 -g
- WERROR=	-Wall
--
--DEBUG_FLAGS=	-g
- 
- .include <bsd.kmod.mk>
diff --git a/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c b/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c
deleted file mode 100644
index 00741ab87f3b..000000000000
--- a/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- zaphfc/zaphfc_freebsd.c
-+++ zaphfc/zaphfc_freebsd.c
-@@ -328,14 +328,26 @@
- 		zaphfc_free(sc);
- 		return (ENXIO);
- 	}
-+#if __FreeBSD_version < 700031
- 	error = bus_setup_intr(
- 	    dev, sc->irq_res, INTR_TYPE_CLK | INTR_FAST,
- 	    hfc_interrupt, sc, &sc->irq_handle);
-+#else
-+	error = bus_setup_intr(
-+	    dev, sc->irq_res, INTR_TYPE_CLK | INTR_FAST, NULL,
-+	    hfc_interrupt, sc, &sc->irq_handle);
-+#endif
- 
-     if(error)
-+#if __FreeBSD_version < 700031
- 	    error = bus_setup_intr(
- 	        dev, sc->irq_res, INTR_TYPE_CLK,
- 	        hfc_interrupt, sc, &sc->irq_handle);
-+#else
-+	     error = bus_setup_intr(
-+		dev, sc->irq_res, INTR_TYPE_CLK, NULL,
-+		hfc_interrupt, sc, &sc->irq_handle);
-+#endif
- 
- 	if (error) {
- 		device_printf(dev, "Can't setup interrupt handler (error %d)\n",
diff --git a/misc/zaptel/pkg-plist b/misc/zaptel/pkg-plist
index c13f9ca84f5c..88d65f3b8609 100644
--- a/misc/zaptel/pkg-plist
+++ b/misc/zaptel/pkg-plist
@@ -1,11 +1,12 @@
 bin/fxo_test
+bin/fxotune
 bin/ztcfg
 bin/ztmonitor
 bin/zttest
 bin/zttool
-include/tonezone.h
-include/zaptel
-include/zaptel.h
+etc/zaptel.conf.sample
+include/zaptel/tonezone.h
+include/zaptel/zaptel.h
 lib/libtonezone.a
 lib/zaptel/linker.hints
 lib/zaptel/qozap.ko
@@ -19,3 +20,4 @@ lib/zaptel/zaphfc.ko
 lib/zaptel/zaptel.ko
 lib/zaptel/ztdummy.ko
 @dirrm lib/zaptel
+@dirrm include/zaptel
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index 02700bb0c64a..f4a07ae31c5f 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.2.13
-PORTREVISION=	4
+PORTVERSION=	1.2.17
 PKGNAMESUFFIX=	12
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
 
-PATCHFILES=	asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz
-PATCH_SITES=	http://unofficial.portaone.com/~bamby/public/
+PATCHFILES=	asterisk-1.2.17-codec-negotiation-20070416.diff.gz
+PATCH_SITES=	http://sobomax.homeunix.org/~sobomax/
 
 #		${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff
 #		${MASTER_SITE_LOCAL:S,$,:bristuff,}
@@ -67,9 +66,9 @@ PLIST_SUB+=	WITH_ZAPTEL="@comment "
 MAKE_ENV+=	WITHOUT_ZAPTEL=1
 .else
 BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \
-		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
+		${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS+=	pri.1:${PORTSDIR}/misc/libpri
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
+RUN_DEPENDS+=	${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel
 PLIST_SUB+=	WITH_ZAPTEL=""
 MAKE_ENV+=	WITH_ZAPTEL=1
 .endif
diff --git a/net/asterisk12/distinfo b/net/asterisk12/distinfo
index a34e55175d0e..55327d278c85 100644
--- a/net/asterisk12/distinfo
+++ b/net/asterisk12/distinfo
@@ -1,6 +1,6 @@
-MD5 (asterisk-1.2.13.tar.gz) = ad8fbe2198568f55c254045ecb3b7926
-SHA256 (asterisk-1.2.13.tar.gz) = 8d197b118d9ee25bc8793b37d1daa6b54fd6074e6738f462368361e5698d98f8
-SIZE (asterisk-1.2.13.tar.gz) = 10584113
-MD5 (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) = 026e8448febfc83a458fc1a667e10541
-SHA256 (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) = 9b97de229778898297d5aaed1df5530c2ae850543c1af0343105c2286395f7c5
-SIZE (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) = 32863
+MD5 (asterisk-1.2.17.tar.gz) = 1a41a1f4a535813b1272bae0545c7990
+SHA256 (asterisk-1.2.17.tar.gz) = ab20ada37e0f2874a0c59ac7d5395c5980419da6344cbb78b60874e9b8631cf1
+SIZE (asterisk-1.2.17.tar.gz) = 10615354
+MD5 (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = 9e31b80a8a9ca26afe9c62f62e6401f7
+SHA256 (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = c715dd17259902ee1068ef2b1844f726570598e2d945f92233c42b0702abc2c6
+SIZE (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = 32987
diff --git a/net/asterisk12/files/patch-Makefile b/net/asterisk12/files/patch-Makefile
index 876ddddd5cd6..432d517b4956 100644
--- a/net/asterisk12/files/patch-Makefile
+++ b/net/asterisk12/files/patch-Makefile
@@ -1,5 +1,8 @@
---- Makefile.orig	Tue Sep 26 18:41:55 2006
-+++ Makefile	Tue Sep 26 18:47:32 2006
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
 @@ -19,8 +19,8 @@
  # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
  # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
@@ -144,7 +147,7 @@
  ifndef WITHOUT_ZAPTEL
  
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
    ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
  endif
  
@@ -219,13 +222,15 @@
  
  muted: muted.o
  	$(CC) $(AUDIO_LIBS) -o muted muted.o
-@@ -552,38 +549,38 @@
+@@ -552,12 +549,12 @@
  
  datafiles: all
  	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
+-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 +	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
++	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
 +	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
  	for x in sounds/digits/*.gsm; do \
  		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
@@ -234,6 +239,15 @@
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
+@@ -565,34 +562,34 @@
+ 	done
+ 	for x in sounds/silence/*.gsm; do \
+ 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
++			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
+ 		else \
+ 			echo "No description for $$x"; \
+ 			exit 1; \
  		fi; \
  	done
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
@@ -267,7 +281,7 @@
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -591,18 +588,18 @@
+@@ -600,18 +597,18 @@
  	done
  	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \
  		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
@@ -291,7 +305,7 @@
  
  update: 
  	@if [ -d .svn ]; then \
-@@ -631,47 +628,47 @@
+@@ -640,47 +637,47 @@
  OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
  
  bininstall: all
@@ -371,7 +385,7 @@
  	else \
  		echo "You need to do cvs update -d not just cvs update" ; \
  	fi 
-@@ -701,46 +698,28 @@
+@@ -710,46 +707,28 @@
  		echo " WARNING WARNING WARNING" ;\
  	fi
  
@@ -425,7 +439,7 @@
  		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
-@@ -753,7 +732,7 @@
+@@ -762,7 +741,7 @@
  				continue; \
  			fi ;\
  		fi ; \
@@ -434,7 +448,7 @@
  	done
  	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
  		( \
-@@ -813,25 +792,25 @@
+@@ -822,25 +801,25 @@
  		echo "; Default: strict"; \
  		echo ";"; \
  		echo ";translation_algorithm = strict"; \
@@ -466,7 +480,7 @@
  	:> $(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 ; \
-@@ -845,9 +824,9 @@
+@@ -854,9 +833,9 @@
  	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
  	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
@@ -478,7 +492,7 @@
  	done
  	@echo " +--------- Asterisk Web Voicemail ----------+"  
  	@echo " +                                           +"
-@@ -874,10 +853,10 @@
+@@ -883,10 +862,10 @@
  
  __rpm: include/asterisk/version.h spec
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk12/files/patch-apps::Makefile b/net/asterisk12/files/patch-apps::Makefile
index 9881ae1f3831..2c930213bc47 100644
--- a/net/asterisk12/files/patch-apps::Makefile
+++ b/net/asterisk12/files/patch-apps::Makefile
@@ -1,11 +1,14 @@
---- apps/Makefile.orig	Sun Apr 30 16:38:22 2006
-+++ apps/Makefile	Wed Jun 14 14:03:42 2006
+
+$FreeBSD$
+
+--- apps/Makefile.orig
++++ apps/Makefile
 @@ -45,25 +45,27 @@
  #APPS+=app_rpt.so
  
  ifndef WITHOUT_ZAPTEL
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h),)
    APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so
  endif
  endif # WITHOUT_ZAPTEL
diff --git a/net/asterisk12/files/patch-apps::app_flash.c b/net/asterisk12/files/patch-apps::app_flash.c
new file mode 100644
index 000000000000..e17165340745
--- /dev/null
+++ b/net/asterisk12/files/patch-apps::app_flash.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- apps/app_flash.c
++++ apps/app_flash.c
+@@ -31,7 +31,7 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ 
+ #include "asterisk.h"
diff --git a/net/asterisk12/files/patch-apps::app_meetme.c b/net/asterisk12/files/patch-apps::app_meetme.c
new file mode 100644
index 000000000000..fbb0a6bfd663
--- /dev/null
+++ b/net/asterisk12/files/patch-apps::app_meetme.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- apps/app_meetme.c
++++ apps/app_meetme.c
+@@ -32,7 +32,7 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ 
+ #include "asterisk.h"
diff --git a/net/asterisk12/files/patch-apps::app_rpt.c b/net/asterisk12/files/patch-apps::app_rpt.c
new file mode 100644
index 000000000000..074b94fa53c2
--- /dev/null
+++ b/net/asterisk12/files/patch-apps::app_rpt.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- apps/app_rpt.c
++++ apps/app_rpt.c
+@@ -176,7 +176,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/io.h>
+ #include <math.h>
+-#include <tonezone.h>
++#include <zaptel/tonezone.h>
+ #include <linux/zaptel.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/net/asterisk12/files/patch-apps::app_zapbarge.c b/net/asterisk12/files/patch-apps::app_zapbarge.c
new file mode 100644
index 000000000000..eb3f757b17dd
--- /dev/null
+++ b/net/asterisk12/files/patch-apps::app_zapbarge.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- apps/app_zapbarge.c
++++ apps/app_zapbarge.c
+@@ -36,7 +36,7 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ 
+ #include "asterisk.h"
diff --git a/net/asterisk12/files/patch-apps::app_zapras.c b/net/asterisk12/files/patch-apps::app_zapras.c
new file mode 100644
index 000000000000..5d32407347d7
--- /dev/null
+++ b/net/asterisk12/files/patch-apps::app_zapras.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- apps/app_zapras.c
++++ apps/app_zapras.c
+@@ -43,7 +43,7 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ 
+ #include "asterisk.h"
diff --git a/net/asterisk12/files/patch-apps::app_zapscan.c b/net/asterisk12/files/patch-apps::app_zapscan.c
new file mode 100644
index 000000000000..081bad2a8ef1
--- /dev/null
+++ b/net/asterisk12/files/patch-apps::app_zapscan.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- apps/app_zapscan.c
++++ apps/app_zapscan.c
+@@ -38,7 +38,7 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ 
+ #include "asterisk.h"
diff --git a/net/asterisk12/files/patch-cdr::Makefile b/net/asterisk12/files/patch-cdr::Makefile
index ff9bae81cfd4..8628383461d2 100644
--- a/net/asterisk12/files/patch-cdr::Makefile
+++ b/net/asterisk12/files/patch-cdr::Makefile
@@ -1,5 +1,8 @@
---- cdr/Makefile.orig	Thu Sep 21 17:18:19 2006
-+++ cdr/Makefile	Thu Oct 19 10:52:51 2006
+
+$FreeBSD$
+
+--- cdr/Makefile.orig
++++ cdr/Makefile
 @@ -21,8 +21,8 @@
  endif
  
@@ -11,14 +14,16 @@
  endif
  
  #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
-@@ -38,21 +38,21 @@
+@@ -38,21 +38,23 @@
  #
  # unixODBC stuff...
  #
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
++ifdef WITH_ODBC
 +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),)
    MODS+=cdr_odbc.so
  endif
++endif
  
  #
  # FreeTDS stuff...
@@ -38,16 +43,29 @@
          CFLAGS += -DFREETDS_0_62
        else
          CFLAGS += -DFREETDS_PRE_0_62
-@@ -65,7 +65,7 @@
+@@ -65,7 +67,7 @@
  #
  # PGSQL stuff...  Autoconf anyone??
  #
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
    MODS+=cdr_pgsql.so
  endif
  
-@@ -86,9 +86,9 @@
+@@ -76,9 +78,9 @@
+   MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/postgresql
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include),)
+-  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include
+-  MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/pgsql/lib
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include),)
++  CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include
++  MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/lib
+ endif
+ 
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql),)
+@@ -86,9 +88,9 @@
    MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql
  endif
  
@@ -60,7 +78,7 @@
  endif
  
  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)
-@@ -114,7 +114,7 @@
+@@ -114,7 +116,7 @@
  all: depend $(MODS)
  
  install: all
diff --git a/net/asterisk12/files/patch-channel.c b/net/asterisk12/files/patch-channel.c
new file mode 100644
index 000000000000..8b3c313ad9d5
--- /dev/null
+++ b/net/asterisk12/files/patch-channel.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- channel.c.orig
++++ channel.c
+@@ -36,7 +36,7 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ #ifndef ZT_TIMERPING
+ #error "You need newer zaptel!  Please svn update zaptel"
diff --git a/net/asterisk12/files/patch-channels::Makefile b/net/asterisk12/files/patch-channels::Makefile
index 872026dfdca2..b80c1bfdf134 100644
--- a/net/asterisk12/files/patch-channels::Makefile
+++ b/net/asterisk12/files/patch-channels::Makefile
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- channels/Makefile.orig
 +++ channels/Makefile
-@@ -48,8 +48,8 @@
+@@ -50,8 +50,8 @@
  endif
  
  ifeq (${OSARCH},FreeBSD)
@@ -14,7 +14,7 @@ $FreeBSD$
    CHANH323LIB=-pthread
  endif
  
-@@ -73,11 +73,11 @@
+@@ -75,11 +75,11 @@
    SOLINK+=-lrt
  endif
  
@@ -28,7 +28,7 @@ $FreeBSD$
    CHANNEL_LIBS+=chan_h323.so
  endif
  
-@@ -91,12 +91,12 @@
+@@ -94,12 +94,12 @@
    CHANNEL_LIBS+=chan_alsa.so
  endif
  
@@ -43,12 +43,12 @@ $FreeBSD$
    CFLAGS+=-DZAPATA_R2
    ZAPR2=-lmfcr2
  endif
-@@ -109,12 +109,12 @@
+@@ -112,12 +112,12 @@
  endif
  
  ifndef WITHOUT_ZAPTEL
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
    ifeq (${OSARCH},NetBSD)
      SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
    endif
@@ -58,7 +58,7 @@ $FreeBSD$
    endif
    CFLAGS+=-DIAX_TRUNKING
    CHANNEL_LIBS+=chan_zap.so
-@@ -229,8 +229,10 @@
+@@ -233,8 +233,10 @@
  chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
  	$(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
  else
@@ -70,8 +70,8 @@ $FreeBSD$
 +	$(MAKE) -C h323 ast_h323.o
  endif
  
- chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a
-@@ -244,8 +246,7 @@
+ misdn/chan_misdn_lib.a:
+@@ -253,8 +255,7 @@
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk12/files/patch-channels::chan_iax2.c b/net/asterisk12/files/patch-channels::chan_iax2.c
new file mode 100644
index 000000000000..5057e3e8304b
--- /dev/null
+++ b/net/asterisk12/files/patch-channels::chan_iax2.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- channels/chan_iax2.c
++++ channels/chan_iax2.c
+@@ -52,7 +52,7 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ #endif
+ 
diff --git a/net/asterisk12/files/patch-channels::chan_zap.c b/net/asterisk12/files/patch-channels::chan_zap.c
index ab02c02af962..aee5be4ece57 100644
--- a/net/asterisk12/files/patch-channels::chan_zap.c
+++ b/net/asterisk12/files/patch-channels::chan_zap.c
@@ -1,9 +1,22 @@
 
 $FreeBSD$
 
---- channels/chan_zap.c.orig	Tue Nov 29 20:24:39 2005
-+++ channels/chan_zap.c	Fri Jan 13 13:28:33 2006
-@@ -638,6 +638,7 @@ static struct zt_pvt {
+--- channels/chan_zap.c.orig
++++ channels/chan_zap.c
+@@ -51,10 +51,10 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ #include <math.h>
+-#include <tonezone.h>
++#include <zaptel/tonezone.h>
+ #include <ctype.h>
+ #ifdef ZAPATA_PRI
+ #include <libpri.h>
+@@ -792,6 +792,7 @@
  	int cidlen;
  	int ringt;
  	int ringt_base;
@@ -11,7 +24,7 @@ $FreeBSD$
  	int stripmsd;
  	int callwaitcas;
  	int callwaitrings;
-@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel 
+@@ -2464,6 +2465,19 @@
  	}
  	
  	ast_mutex_lock(&p->lock);
@@ -31,7 +44,7 @@ $FreeBSD$
  	
  	index = zt_get_index(ast, p, 1);
  
-@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data)
+@@ -6323,7 +6337,37 @@
  		ast_setstate(chan, AST_STATE_RING);
  		chan->rings = 1;
  		p->ringt = p->ringt_base;
@@ -69,7 +82,7 @@ $FreeBSD$
  		if (res) {
  			ast_hangup(chan);
  			ast_log(LOG_WARNING, "PBX exited non-zero\n");
-@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data)
+@@ -6628,7 +6672,7 @@
  		i = iflist;
  		while(i) {
  			if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) {
diff --git a/net/asterisk12/files/patch-channels::h323::Makefile b/net/asterisk12/files/patch-channels::h323::Makefile
new file mode 100644
index 000000000000..3081dd98cf36
--- /dev/null
+++ b/net/asterisk12/files/patch-channels::h323::Makefile
@@ -0,0 +1,20 @@
+--- channels/h323/Makefile.orig	Mon Apr 16 17:28:08 2007
++++ channels/h323/Makefile	Mon Apr 16 17:28:21 2007
+@@ -21,8 +21,7 @@
+ OPENH323DIR=$(HOME)/openh323
+ endif
+ 
+-clean:
+-	rm -f *.so *.o .depend
++include $(OPENH323DIR)/openh323u.mak
+ 
+ $(SOURCES)::	$(SOURCES:.cxx=.cpp)
+ 	ln -f $< $@
+@@ -31,7 +30,6 @@
+ 	touch $(SOURCES)
+ 
+ libchanh323.a:	$(OBJS)
+-	include $(OPENH323DIR)/openh323u.mak
+ 	ar crv $@ $(OBJS)
+ 
+ Makefile.ast:	FORCE
diff --git a/net/asterisk12/files/patch-codecs::Makefile b/net/asterisk12/files/patch-codecs::Makefile
index ab5cbc4aef2c..646028d6b444 100644
--- a/net/asterisk12/files/patch-codecs::Makefile
+++ b/net/asterisk12/files/patch-codecs::Makefile
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- codecs/Makefile.orig	Tue Nov 29 20:24:39 2005
-+++ codecs/Makefile	Fri Jan 13 10:33:21 2006
-@@ -30,8 +30,8 @@
+--- codecs/Makefile.orig
++++ codecs/Makefile
+@@ -29,7 +29,7 @@
+ endif
+ 
+ ifndef WITHOUT_ZAPTEL
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
+   ifeq (${OSARCH},NetBSD)
+     SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
+   endif
+@@ -43,8 +43,8 @@
  
  UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h)
  UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h)
@@ -14,7 +23,7 @@ $FreeBSD$
  ifneq (${UI_SPEEX},)
    MODSPEEX=codec_speex.so
    LIBSPEEX+=-lspeex -lm
-@@ -43,14 +43,14 @@
+@@ -56,14 +56,14 @@
  endif
  ifneq (${ULI_SPEEX},)
    MODSPEEX=codec_speex.so
@@ -33,7 +42,7 @@ $FreeBSD$
    LIBSPEEX+=-lspeex -lm
  endif
  
-@@ -65,7 +65,7 @@
+@@ -78,7 +78,7 @@
  LIBLPC10=lpc10/liblpc10.a
  
  ifeq ($(findstring BSD,${OSARCH}),BSD)
@@ -42,7 +51,7 @@ $FreeBSD$
  endif
  
  CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
-@@ -126,7 +126,7 @@
+@@ -139,7 +139,7 @@
  endif
  
  install: all
diff --git a/net/asterisk12/files/patch-codecs::codec_zap.c b/net/asterisk12/files/patch-codecs::codec_zap.c
new file mode 100644
index 000000000000..3aab7443d8df
--- /dev/null
+++ b/net/asterisk12/files/patch-codecs::codec_zap.c
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- codecs/codec_zap.c
++++ codecs/codec_zap.c
+@@ -39,7 +39,11 @@
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ #include <sys/mman.h>
++#if defined(__linux__)
+ #include <linux/zaptel.h>
++#else
++#include <zaptel/zaptel.h>
++#endif
+ 
+ #include "asterisk/lock.h"
+ #include "asterisk/translate.h"
diff --git a/net/asterisk12/files/patch-res::Makefile b/net/asterisk12/files/patch-res::Makefile
index de5c365db34d..2930b1cb3e32 100644
--- a/net/asterisk12/files/patch-res::Makefile
+++ b/net/asterisk12/files/patch-res::Makefile
@@ -1,9 +1,27 @@
 
 $FreeBSD$
 
---- res/Makefile
+--- res/Makefile.orig
 +++ res/Makefile
-@@ -37,8 +37,8 @@
+@@ -13,7 +13,8 @@
+ 
+ MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
++ifdef WITH_ODBC
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)${LOCALBASE}/include/odbcinst.h),)
+   ifneq (${OSARCH},FreeBSD)
+     MODS+=res_config_odbc.so
+   else
+@@ -21,6 +22,7 @@
+   endif
+   MODS+=res_odbc.so
+ endif
++endif
+ 
+ ifneq ($(NOCRYPTO),yes)
+   MODS+=res_crypto.so
+@@ -37,8 +39,8 @@
  endif
  
  ifeq ($(findstring BSD,${OSARCH}),BSD)
@@ -14,7 +32,7 @@ $FreeBSD$
  endif
  
  ifeq (${OSARCH},CYGWIN)
-@@ -55,9 +55,7 @@
+@@ -55,9 +57,7 @@
  CFLAGS+=
  
  ifndef WITHOUT_ZAPTEL
@@ -24,7 +42,7 @@ $FreeBSD$
  endif # WITHOUT_ZAPTEL
  
  #
-@@ -75,7 +73,7 @@
+@@ -75,7 +75,7 @@
  	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
  	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
  	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
diff --git a/net/asterisk12/files/patch-res::res_musiconhold.c b/net/asterisk12/files/patch-res::res_musiconhold.c
new file mode 100644
index 000000000000..352fb814def9
--- /dev/null
+++ b/net/asterisk12/files/patch-res::res_musiconhold.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- res/res_musiconhold.c
++++ res/res_musiconhold.c
+@@ -40,7 +40,7 @@
+ #ifdef __linux__
+ #include <linux/zaptel.h>
+ #else
+-#include <zaptel.h>
++#include <zaptel/zaptel.h>
+ #endif /* __linux__ */
+ #endif
+ #include <unistd.h>
diff --git a/net/asterisk12/files/patch-rtp.c b/net/asterisk12/files/patch-rtp.c
deleted file mode 100644
index bbc2649929f9..000000000000
--- a/net/asterisk12/files/patch-rtp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- rtp.c.orig	Fri Jan 13 13:38:01 2006
-+++ rtp.c	Fri Jan 13 13:40:50 2006
-@@ -950,8 +950,10 @@ struct ast_rtp *ast_rtp_new_with_bindadd
- 		rtp->us.sin_port = htons(x);
- 		rtp->us.sin_addr = addr;
- 		/* If there's rtcp, initialize it as well. */
--		if (rtp->rtcp)
-+		if (rtp->rtcp) {
- 			rtp->rtcp->us.sin_port = htons(x + 1);
-+			rtp->rtcp->us.sin_addr = addr;
-+		}
- 		/* Try to bind it/them. */
- 		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))))
diff --git a/net/asterisk12/files/patch-utils::Makefile b/net/asterisk12/files/patch-utils::Makefile
index f3164c0f478a..d2c61cc0664b 100644
--- a/net/asterisk12/files/patch-utils::Makefile
+++ b/net/asterisk12/files/patch-utils::Makefile
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- utils/Makefile
-+++ utils/Makefile
-@@ -17,16 +17,16 @@
+--- utils/Makefile.orig	Wed Jan 24 19:43:50 2007
++++ utils/Makefile	Mon Apr 16 16:37:31 2007
+@@ -17,17 +17,17 @@
  CFLAGS+=-DNO_AST_MM
  
  ifeq ($(findstring BSD,${OSARCH}),BSD)
@@ -11,6 +8,7 @@ $FreeBSD$
 +  CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
  endif
  
+ # to get check_expr, add it to the TARGET list
  TARGET=stereorize streamplayer
  
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
@@ -23,7 +21,7 @@ $FreeBSD$
    TARGET+=astman
  endif
  
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
  install:
  	for x in $(TARGET); do \
  		if [ "$$x" != "none" ]; then \
diff --git a/net/asterisk12/pkg-plist b/net/asterisk12/pkg-plist
index 731cebb260f0..43d4c5d4d553 100644
--- a/net/asterisk12/pkg-plist
+++ b/net/asterisk12/pkg-plist
@@ -329,6 +329,7 @@ lib/asterisk/modules/codec_ilbc.so
 lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
+%%WITH_ZAPTEL%%lib/asterisk/modules/codec_zap.so
 lib/asterisk/modules/format_au.so
 lib/asterisk/modules/format_g723_1.so
 lib/asterisk/modules/format_g726.so
@@ -621,6 +622,16 @@ sbin/streamplayer
 %%DATADIR%%/sounds/queue-youarenext.gsm
 %%DATADIR%%/sounds/screen-callee-options.gsm
 %%DATADIR%%/sounds/seconds.gsm
+%%DATADIR%%/sounds/silence/1.gsm
+%%DATADIR%%/sounds/silence/10.gsm
+%%DATADIR%%/sounds/silence/2.gsm
+%%DATADIR%%/sounds/silence/3.gsm
+%%DATADIR%%/sounds/silence/4.gsm
+%%DATADIR%%/sounds/silence/5.gsm
+%%DATADIR%%/sounds/silence/6.gsm
+%%DATADIR%%/sounds/silence/7.gsm
+%%DATADIR%%/sounds/silence/8.gsm
+%%DATADIR%%/sounds/silence/9.gsm
 %%DATADIR%%/sounds/spy-agent.gsm
 %%DATADIR%%/sounds/spy-h323.gsm
 %%DATADIR%%/sounds/spy-iax.gsm
@@ -735,6 +746,7 @@ sbin/streamplayer
 %%DATADIR%%/sounds/vm-whichbox.gsm
 %%DATADIR%%/sounds/vm-youhave.gsm
 @exec mkdir -p %%DATADIR%%/sounds/priv-callerintros
+@dirrm %%DATADIR%%/sounds/silence
 @dirrm %%DATADIR%%/sounds/priv-callerintros
 @dirrm %%DATADIR%%/sounds/phonetic
 @dirrm %%DATADIR%%/sounds/letters