Update to 0.5, which brings in TDM400P support (only fxo is tested right now).

Also features some fixes for existing X100P driver.

8 files changed, 64 insertions, 49 deletions

diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile
index e45d810fcbaf..be05f74a4fca 100644
--- a/misc/zaptel/Makefile
+++ b/misc/zaptel/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	zaptel
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.portaone.com/~sobomax/
 DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	A FreeBSD Driver for Digium X100P Telephony Cards
+COMMENT=	A FreeBSD Driver for Digium X100P/TDM400P Telephony Cards
+
+LIB_DEPENDS=	newt.51:${PORTSDIR}/devel/newt
 
 NO_PACKAGE=	Should be in sync with the kernel to work correctly
 
diff --git a/misc/zaptel/distinfo b/misc/zaptel/distinfo
index 92e3f7cd8cfb..e8be51c3536d 100644
--- a/misc/zaptel/distinfo
+++ b/misc/zaptel/distinfo
@@ -1,2 +1,2 @@
-MD5 (zaptel-freebsd-0.4.tar.gz) = c8af539042054e9c3cf1b7de1da37318
-SIZE (zaptel-freebsd-0.4.tar.gz) = 102847
+MD5 (zaptel-freebsd-0.5.tar.gz) = c97dae894768cab9aa65a650082a13a3
+SIZE (zaptel-freebsd-0.5.tar.gz) = 125939
diff --git a/misc/zaptel/files/patch-Makefile b/misc/zaptel/files/patch-Makefile
index 89992b6b0441..5be8536e7de1 100644
--- a/misc/zaptel/files/patch-Makefile
+++ b/misc/zaptel/files/patch-Makefile
@@ -1,44 +1,50 @@
 
 $FreeBSD$
 
---- Makefile.orig	Wed May  5 17:10:37 2004
-+++ Makefile	Fri May 14 17:59:13 2004
-@@ -1,27 +1,27 @@
- # $Id$
+--- Makefile.orig	Thu Jun 17 19:21:57 2004
++++ Makefile	Thu Jun 17 18:26:30 2004
+@@ -1,11 +1,11 @@
+ # $Id: Makefile,v 1.7 2004/06/16 15:58:04 gonzo Exp $
  
  all:
 -	cd zaptel && make 
+-	cd wcfxs && make 
 -	cd wcfxo && make 
 -	cd ztcfg && make 
+-	cd test && make 
 +	cd zaptel && ${MAKE}
++	cd wcfxs && ${MAKE}
 +	cd wcfxo && ${MAKE}
 +	cd ztcfg && ${MAKE}
++	cd test && ${MAKE}
  
  load:
--	cd zaptel && kldload ./zaptel.ko
--	cd wcfxo && kldload ./wcfxo.ko
-+	cd zaptel && kldload ${.CURDIR}/zaptel.ko
-+	cd wcfxo && kldload ${.CURDIR}/wcfxo.ko
- 
- unload:
- 	cd wcfxo && kldunload wcfxo
+ 	cd zaptel && kldload ./zaptel.ko
+@@ -16,17 +16,17 @@
  	cd zaptel && kldunload zaptel
  
  clean:
 -	cd zaptel && make clean
 -	cd wcfxo && make clean
+-	cd wcfxs && make clean
 -	cd ztcfg && make clean
+-	cd test && make clean
 +	cd zaptel && ${MAKE} clean
 +	cd wcfxo && ${MAKE} clean
++	cd wcfxs && ${MAKE} clean
 +	cd ztcfg && ${MAKE} clean
++	cd test && ${MAKE} clean
  
  install:
 -	cd zaptel && make install
 -	cd wcfxo && make install
+-	cd wcfxs && make install
 -	cd ztcfg && make install
+-	cd test && make install
 +	cd zaptel && ${MAKE} install
 +	cd wcfxo && ${MAKE} install
++	cd wcfxs && ${MAKE} install
 +	cd ztcfg && ${MAKE} install
++	cd test && ${MAKE} install
  	
- 
- 
+ reload: unload load
diff --git a/misc/zaptel/files/patch-test::Makefile b/misc/zaptel/files/patch-test::Makefile
index 348b1ffce31b..428438ef75b1 100644
--- a/misc/zaptel/files/patch-test::Makefile
+++ b/misc/zaptel/files/patch-test::Makefile
@@ -1,19 +1,28 @@
 
 $FreeBSD$
 
---- test/Makefile.orig	Wed Apr 28 04:27:36 2004
-+++ test/Makefile	Thu Apr 29 18:00:11 2004
-@@ -1,10 +1,10 @@
- # $Id: Makefile,v 1.1 2004/04/28 11:27:36 gonzo Exp $ 
+--- test/Makefile.orig	Thu Jun 17 19:21:57 2004
++++ test/Makefile	Thu Jun 17 18:37:59 2004
+@@ -1,13 +1,18 @@
+ # $Id: Makefile,v 1.6 2004/06/16 15:58:11 gonzo Exp $ 
 -CFLAGS += -I/usr/local/include -I../zaptel -I../ztcfg
-+CFLAGS+= -I${.CURDIR}/../zaptel -I${.CURDIR}/../ztcfg -I${LOCALBASE}/include
++CFLAGS += -I${LOCALBASE}/include -I../zaptel -I../ztcfg
  
- all: zttool fxo_test 
+ all: zttool fxo_test ztmonitor
  
  fxo_test: fxo_test.o
 -	gcc -o fxo_test fxo_test.o -ltonezone -L../ztcfg
-+	${CC} -o fxo_test fxo_test.o -L${.CURDIR}/../ztcfg -ltonezone
++	${CC} ${CFLAGS} -o fxo_test fxo_test.o -L../ztcfg -ltonezone
+ 
+ ztmonitor: ztmonitor.o
+-	gcc -o ztmonitor ztmonitor.o -ltonezone -L../ztcfg
++	${CC} ${CFLAGS} -o ztmonitor ztmonitor.o -L../ztcfg -ltonezone
  
  zttool: zttool.o
 -	gcc -o zttool zttool.o -ltonezone -L/usr/local/lib -lnewt -L../ztcfg
-+	${CC} -o zttool zttool.o -L${.CURDIR}/../ztcfg -ltonezone -L${LOCALBASE}/lib -lnewt
++	${CC} ${CFLAGS} -o zttool zttool.o -L../ztcfg -ltonezone -L${LOCALBASE}/lib -lnewt
++
++install:
++	${BSD_INSTALL_PROGRAM} fxo_test ${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} ztmonitor ${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} zttool ${PREFIX}/bin
diff --git a/misc/zaptel/files/patch-zaptel::Makefile b/misc/zaptel/files/patch-zaptel::Makefile
index d08ffb911940..07f2395f3571 100644
--- a/misc/zaptel/files/patch-zaptel::Makefile
+++ b/misc/zaptel/files/patch-zaptel::Makefile
@@ -1,30 +1,14 @@
 
 $FreeBSD$
 
---- zaptel/Makefile.orig	Wed Apr 28 04:27:36 2004
-+++ zaptel/Makefile	Thu Apr 29 18:00:11 2004
-@@ -1,16 +1,17 @@
- .PATH: /sys/dev/pci
--SRCS=zaptel.c arith.h tones.h zaptel.h
--KMOD=zaptel
--CFLAGS += -g
- 
--SRCS+=		device_if.h bus_if.h
-+SRCS=	zaptel.c arith.h tones.h zaptel.h
-+KMOD=	zaptel
-+CFLAGS+= -g
-+
-+SRCS+=	device_if.h bus_if.h
+--- zaptel/Makefile.orig	Thu Jun 17 19:22:08 2004
++++ zaptel/Makefile	Thu Jun 17 18:29:36 2004
+@@ -6,7 +6,7 @@
+ SRCS+=		device_if.h bus_if.h vnode_if.h
  
  tones.h: gendigits.c
 -	gcc -o gendigits gendigits.c -lm
--	./gendigits
 +	${CC} ${CFLAGS} -o gendigits gendigits.c -lm
-+	${.CURDIR}/gendigits
+ 	./gendigits
  
  load: zaptel.ko
--	kldload ./zaptel.ko
-+	kldload ${.CURDIR}/zaptel.ko
- 
- unload:
- 	kldunload zaptel
diff --git a/misc/zaptel/files/zaptel.sh b/misc/zaptel/files/zaptel.sh
index ff2753b788ae..de95d990364b 100644
--- a/misc/zaptel/files/zaptel.sh
+++ b/misc/zaptel/files/zaptel.sh
@@ -7,11 +7,21 @@ case "$1" in
 	start)
 		/sbin/kldload ${LIBDIR}/zaptel.ko || exit 1
 		/sbin/kldload ${LIBDIR}/wcfxo.ko || exit 1
-		/usr/sbin/devinfo | /usr/bin/grep -q wcfxo && ${PREFIX}/bin/ztcfg 2> /dev/null
+		/sbin/kldload ${LIBDIR}/wcfxs.ko || exit 1
+		if /usr/sbin/devinfo | /usr/bin/grep -q wcfxo
+		then
+			${PREFIX}/bin/ztcfg 2> /dev/null
+		else
+			if /usr/sbin/devinfo | /usr/bin/grep -q wcfxs
+			then
+				${PREFIX}/bin/ztcfg 2> /dev/null
+			fi
+		fi
 		echo -n " zaptel"
 		;;
 
 	stop)
+		/sbin/kldunload wcfxs.ko || exit 1
 		/sbin/kldunload wcfxo.ko || exit 1
 		/sbin/kldunload zaptel.ko || exit 1
 		echo -n " zaptel"
diff --git a/misc/zaptel/pkg-descr b/misc/zaptel/pkg-descr
index f94c51092e76..a3c2eab71fff 100644
--- a/misc/zaptel/pkg-descr
+++ b/misc/zaptel/pkg-descr
@@ -1,3 +1,3 @@
-A FreeBSD Driver for Digium X100P Telephony Cards.
+A FreeBSD Driver for Digium X100P and TDM400P Telephony Cards.
 
-WWW: http://www.digium.com/index.php?menu=wildcard_x100p
+WWW: http://www.digium.com/index.php?menu=hardware_products
diff --git a/misc/zaptel/pkg-plist b/misc/zaptel/pkg-plist
index 67e259b05965..f9d59cdcedc0 100644
--- a/misc/zaptel/pkg-plist
+++ b/misc/zaptel/pkg-plist
@@ -1,4 +1,7 @@
+bin/fxo_test
 bin/ztcfg
+bin/ztmonitor
+bin/zttool
 etc/rc.d/zaptel.sh.sample
 @unexec if cmp -s %D/etc/zaptel.conf %D/etc/zaptel.conf.sample; then rm -f %D/etc/zaptel.conf; fi
 etc/zaptel.conf.sample
@@ -8,5 +11,6 @@ include/zaptel.h
 lib/libtonezone.a
 lib/zaptel/linker.hints
 lib/zaptel/wcfxo.ko
+lib/zaptel/wcfxs.ko
 lib/zaptel/zaptel.ko
 @dirrm lib/zaptel