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.

18 files changed, 40 insertions, 289 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