Update to 1.4.6.

Submitted by:	Oleksandr Tymoshenko

8 files changed, 79 insertions, 19 deletions

diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile
index 89be1a4e4f92..08d2dd1dbda3 100644
--- a/misc/zaptel/Makefile
+++ b/misc/zaptel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zaptel
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.6
 CATEGORIES=	misc kld
 MASTER_SITES=	http://www.pbxpress.com/~gonzo/
 DISTNAME=	${PORTNAME}-bsd-${PORTVERSION}
@@ -18,7 +18,7 @@ LIB_DEPENDS=	newt.51:${PORTSDIR}/devel/newt
 
 NO_PACKAGE=	Should be in sync with the kernel to work correctly
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
 MAKE_ENV=	KMODDIR=${PREFIX}/lib/zaptel
 SUB_FILES=	pkg-message
@@ -26,6 +26,13 @@ USE_RC_SUBR=	zaptel
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "amd64"
+PLIST_SUB+=	WITH_TAU32="@comment "
+.else
+PLIST_SUB+=	WITH_TAU32="@comment "
+MAKE_ARGS+=	WITH_TAU32="yes"
+.endif
+
 pre-everything::
 	@if [ ! -f /usr/src/sys/Makefile ]; then \
 		${ECHO_MSG} ">> The zaptel port needs FreeBSD kernel source code to compile."; \
diff --git a/misc/zaptel/distinfo b/misc/zaptel/distinfo
index bb24aad7d558..43565b934fdf 100644
--- a/misc/zaptel/distinfo
+++ b/misc/zaptel/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (zaptel-bsd-1.4.6.tar.gz) = ca6a29a6eef536aa472a1f9168580dc5
+SHA256 (zaptel-bsd-1.4.6.tar.gz) = ff693908afc1c54123aa8499f1fe839648846dc741f9251947b1d7f06ef3f3e9
+SIZE (zaptel-bsd-1.4.6.tar.gz) = 1028724
diff --git a/misc/zaptel/files/patch-Makefile b/misc/zaptel/files/patch-Makefile
index 66912ce6d81e..bf32362192eb 100644
--- a/misc/zaptel/files/patch-Makefile
+++ b/misc/zaptel/files/patch-Makefile
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- Makefile
+--- Makefile.orig
 +++ 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 
+ # $Id: Makefile 840 2004-06-16 15:23:08Z gonzo $
+-HWMODULES=zaptel tools oct612x qozap zaphfc wcfxs wcfxo wct1xxp wcte11xp wcte12xp wct4xxp ztdummy 
++HWMODULES=zaptel tools qozap zaphfc wcfxs wcfxo wct1xxp wcte11xp wcte12xp wct4xxp ztdummy 
  USERLAND=ztcfg test
+ .if defined(WITH_TAU32)
  HWMODULES+=tau32pci
- # This is for testing purposes
diff --git a/misc/zaptel/files/patch-test::Makefile b/misc/zaptel/files/patch-test::Makefile
index bcfcca2f2809..67487a6ba88e 100644
--- a/misc/zaptel/files/patch-test::Makefile
+++ b/misc/zaptel/files/patch-test::Makefile
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- test/Makefile
+--- test/Makefile.orig
 +++ test/Makefile
 @@ -1,7 +1,7 @@
- # $Id: Makefile,v 1.1 2007/04/25 23:17:23 root Exp root $ 
+ # $Id: Makefile 856 2004-06-22 13:40:16Z gonzo $ 
  
  LOCALBASE?=/usr/local
--CFLAGS+=-I../zaptel -I../ztcfg -I${LOCALBASE}/include 
-+CFLAGS+=-I../ -I../zaptel -I../ztcfg -I${LOCALBASE}/include 
+-CFLAGS+=-I.. -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-zaptel::zt_chan.c b/misc/zaptel/files/patch-zaptel::zt_chan.c
new file mode 100644
index 000000000000..d241f6fe2db7
--- /dev/null
+++ b/misc/zaptel/files/patch-zaptel::zt_chan.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- zaptel/zt_chan.c
++++ zaptel/zt_chan.c
+@@ -1267,7 +1267,7 @@
+ 	struct zt_chan *chan;
+ 	int channo = 0;
+ 	int res;
+-	int flags;
++	unsigned long flags;
+ 
+ 	chan = (struct zt_chan *) (dev->si_drv1);
+ 
+@@ -1282,7 +1282,7 @@
+ 			return EINVAL;
+ 		if (channo > ZT_MAX_CHANNELS)
+ 			return EINVAL;
+-		flags = (int)dev->si_drv1;
++		flags = (unsigned long)dev->si_drv1;
+ 		res = zt_specchan_open(dev, channo, 0);
+ 		if (!res) {
+ 			/* Setup the pointer for future stuff */
diff --git a/misc/zaptel/files/patch-zaptel::zt_zone.c b/misc/zaptel/files/patch-zaptel::zt_zone.c
new file mode 100644
index 000000000000..90eb02ab5761
--- /dev/null
+++ b/misc/zaptel/files/patch-zaptel::zt_zone.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- zaptel/zt_zone.c
++++ zaptel/zt_zone.c
+@@ -326,7 +326,7 @@
+ 	int x;
+ 	int space;
+ 	int res;
+-	int addr;
++	unsigned long addr;
+ 	
+ 	/* XXX Unnecessary XXX */
+ 	memset(samples, 0, sizeof(samples));
+@@ -334,7 +334,7 @@
+ 	memset(next, 0, sizeof(next));
+ 	memset(&th, 0, sizeof(th));
+ 
+-	bcopy((void *)data, &addr, 4);
++	bcopy((void *)data, &addr, sizeof(addr));
+ 	data = addr;
+ 	if(copyin( (caddr_t)addr, &th,  sizeof(th)))
+ 		printf("copyin failed\n");
diff --git a/misc/zaptel/files/zaptel.in b/misc/zaptel/files/zaptel.in
index 6420760a61d7..88f072c4ec26 100644
--- a/misc/zaptel/files/zaptel.in
+++ b/misc/zaptel/files/zaptel.in
@@ -18,8 +18,8 @@
 
 kmod_dir=%%PREFIX%%/lib/zaptel
 
-kmod_load="zaptel.ko qozap.ko tau32pci.ko wcfxo.ko wcfxs.ko wct1xxp.ko wct4xxp.ko wcte11xp.ko"
-kmod_unload="wcte11xp.ko wct4xxp.ko wct1xxp.ko wcfxs.ko wcfxo.ko tau32pci.ko qozap.ko zaptel.ko"
+kmod_load="zaptel.ko qozap.ko tau32pci.ko wcfxo.ko wcfxs.ko wct1xxp.ko wct4xxp.ko wcte11xp.ko wcte12xp.ko"
+kmod_unload="wcte12xp.ko wcte11xp.ko wct4xxp.ko wct1xxp.ko wcfxs.ko wcfxo.ko tau32pci.ko qozap.ko zaptel.ko"
 name="zaptel"
 rcvar=${name}_enable
 
@@ -31,7 +31,10 @@ zaptel_start()
 	echo -n " ${name}"
 	for kmod in ${kmod_load}
 	do
-		kldload ${kmod_dir}/${kmod} || exit 1
+		if [ -e ${kmod_dir}/${kmod} ]
+		then
+			kldload ${kmod_dir}/${kmod} || exit 1
+		fi
 	done
 	%%PREFIX%%/bin/ztcfg
 }
@@ -41,7 +44,10 @@ zaptel_stop()
         echo -n " ${name}"
 	for kmod in ${kmod_unload}
 	do
-	        kldunload ${kmod}
+		if [ -e ${kmod_dir}/${kmod} ]
+		then
+		        kldunload ${kmod}
+		fi
 	done
 }
 load_rc_config $name
diff --git a/misc/zaptel/pkg-plist b/misc/zaptel/pkg-plist
index 88d65f3b8609..08b09bee2ba1 100644
--- a/misc/zaptel/pkg-plist
+++ b/misc/zaptel/pkg-plist
@@ -10,12 +10,13 @@ include/zaptel/zaptel.h
 lib/libtonezone.a
 lib/zaptel/linker.hints
 lib/zaptel/qozap.ko
-lib/zaptel/tau32pci.ko
+%%WITH_TAU32%%lib/zaptel/tau32pci.ko
 lib/zaptel/wcfxo.ko
 lib/zaptel/wcfxs.ko
 lib/zaptel/wct1xxp.ko
 lib/zaptel/wct4xxp.ko
 lib/zaptel/wcte11xp.ko
+lib/zaptel/wcte12xp.ko
 lib/zaptel/zaphfc.ko
 lib/zaptel/zaptel.ko
 lib/zaptel/ztdummy.ko