6 files changed, 25 insertions, 69 deletions

diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile
index fcda076a1a7f..43ae89f3a9b2 100644
--- a/misc/zaptel/Makefile
+++ b/misc/zaptel/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	zaptel
-PORTVERSION=	0.8
-PORTREVISION=	1
+PORTVERSION=	0.9
 CATEGORIES=	misc
 MASTER_SITES=	http://www.portaone.com/~sobomax/
 DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	A FreeBSD Driver for Digium X100P/TDM400P Telephony Cards
+COMMENT=	A FreeBSD Driver for FXO, FXS, BRI and PRI Telephony Cards
 
 LIB_DEPENDS=	newt.51:${PORTSDIR}/devel/newt
 
@@ -24,6 +23,12 @@ ONLY_FOR_ARCHS=	i386
 PKGMESSAGE=	${WRKSRC}/.MESSAGE
 MAKE_ENV=	KMODDIR=${PREFIX}/lib/zaptel
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=		"FreeBSD versions below 5.x is not supported yet. If you can add support please do it and send your patches to Alexander Timoshenko <gonzo@portaone.com>. We will integrate into the driver. Thanks!"
+.endif
+
 pre-everything::
 	@if [ ! -f /usr/src/sys/Makefile ]; then \
 		${ECHO_MSG} ">> The zaptel port needs FreeBSD kernel source code to compile."; \
@@ -43,4 +48,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/zaptel.sh.sample ${PREFIX}/etc/rc.d
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/zaptel/distinfo b/misc/zaptel/distinfo
index 19b5ccedf4cc..26706997ca1e 100644
--- a/misc/zaptel/distinfo
+++ b/misc/zaptel/distinfo
@@ -1,2 +1,2 @@
-MD5 (zaptel-freebsd-0.8.tar.gz) = 3bad15ca522e4e29728781ff3ae78e39
-SIZE (zaptel-freebsd-0.8.tar.gz) = 131352
+MD5 (zaptel-freebsd-0.9.tar.gz) = bfd61d1cf4ef93e1b75185492c17ea16
+SIZE (zaptel-freebsd-0.9.tar.gz) = 193215
diff --git a/misc/zaptel/files/zaptel.sh b/misc/zaptel/files/zaptel.sh
index 29da7fc86ad4..d2f5e60b61fc 100644
--- a/misc/zaptel/files/zaptel.sh
+++ b/misc/zaptel/files/zaptel.sh
@@ -5,68 +5,24 @@ LIBDIR=${PREFIX}/lib/zaptel
 
 case "$1" in
 	start)
+		/sbin/kldload ${LIBDIR}/qozap.ko || exit 1
 		/sbin/kldload ${LIBDIR}/zaptel.ko || exit 1
 		/sbin/kldload ${LIBDIR}/wcfxo.ko || exit 1
 		/sbin/kldload ${LIBDIR}/wcfxs.ko || exit 1
-		if [ ! -d /dev/zap ]
-		then
-			mkdir -p /dev/zap || exit 1
-		fi
-		if [ ! -c /dev/zap/channel ]
-		then
-			/sbin/mknod /dev/zap/channel c 196 254 || exit 1
-		fi
-		if [ ! -c /dev/zap/ctl ]
-		then
-			/sbin/mknod /dev/zap/ctl c 196 0 || exit 1
-		fi
-		if [ ! -c /dev/zap/pseudo ]
-		then
-			/sbin/mknod /dev/zap/pseudo c 196 255 || exit 1
-		fi
-		if [ ! -c /dev/zap/timer ]
-		then
-			/sbin/mknod /dev/zap/timer c 196 253 || exit 1
-		fi
-		z=" zaptel"
-		if /usr/sbin/pciconf -l | /usr/bin/grep -q ^wcfxo
-		then
-			for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
-			do
-				if /usr/sbin/pciconf -l | /usr/bin/grep -q ^wcfxo${i}
-				then
-					if [ ! -c /dev/wcfxo${i} ]
-					then
-						/sbin/mknod /dev/wcfxo${i} c 197 ${i} || exit 1
-					fi
-				fi
-			done
-			${PREFIX}/bin/ztcfg 2> /dev/null
-		else
-			if /usr/sbin/pciconf -l | /usr/bin/grep -q ^wcfxs
-			then
-				for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
-				do
-					if /usr/sbin/pciconf -l | /usr/bin/grep -q ^wcfxs${i}
-					then
-						if [ ! -c /dev/wcfxs${i} ]
-						then
-							/sbin/mknod /dev/wcfxo${i} c 198 ${i} || exit 1
-						fi
-					fi
-				done
-				${PREFIX}/bin/ztcfg 2> /dev/null
-			else
-				z=""
-			fi
-		fi
+		/sbin/kldload ${LIBDIR}/wct1xxp.ko || exit 1
+		/sbin/kldload ${LIBDIR}/wct4xxp.ko || exit 1
+		/sbin/kldload ${LIBDIR}/wcte11xp.ko || exit 1
 		echo -n ${z}
 		;;
 
 	stop)
+		/sbin/kldunload qozap.ko || exit 1
 		/sbin/kldunload wcfxs.ko || exit 1
 		/sbin/kldunload wcfxo.ko || exit 1
 		/sbin/kldunload zaptel.ko || exit 1
+		/sbin/kldunload wct1xxp.ko || exit 1
+		/sbin/kldunload wct4xxp.ko || exit 1
+		/sbin/kldunload wcte11xp.ko || exit 1
 		echo -n " zaptel"
 		;;
 
diff --git a/misc/zaptel/pkg-descr b/misc/zaptel/pkg-descr
index a3c2eab71fff..aaf4997bb845 100644
--- a/misc/zaptel/pkg-descr
+++ b/misc/zaptel/pkg-descr
@@ -1,3 +1,3 @@
-A FreeBSD Driver for Digium X100P and TDM400P Telephony Cards.
+A FreeBSD Driver for FXO, FXS, BRI and PRI Telephony Cards.
 
 WWW: http://www.digium.com/index.php?menu=hardware_products
diff --git a/misc/zaptel/pkg-message b/misc/zaptel/pkg-message
index 239e4c30b5c0..84bd4e483ea7 100644
--- a/misc/zaptel/pkg-message
+++ b/misc/zaptel/pkg-message
@@ -20,13 +20,7 @@ help to improve quality of the drivers.
 
 Great thanks to all companies and individuals who made this driver happen,
 including but not limited to, John Todd, Chris Coleman, Alexander Timoshenko,
-Porta Software Ltd and others contributors of the bounty project.
-
-Also, we would be grateful if anyone who uses this driver can send a short
-note to DigiumBSD@portaone.com, with brief description of what X100P is used
-for as well as with extimated number of cards deployed under FreeBSD. We will
-use this information to persuage Digium that in the order to sell more
-hardware they have to support FreeBSD drivers along with Linux ones.
+Porta Software Ltd, Max Khon and others contributors.
 
 Thanks and enjoy!
 
diff --git a/misc/zaptel/pkg-plist b/misc/zaptel/pkg-plist
index 84b9f3a9ea77..4bd5036d7dcb 100644
--- a/misc/zaptel/pkg-plist
+++ b/misc/zaptel/pkg-plist
@@ -4,15 +4,16 @@ bin/ztmonitor
 bin/zttest
 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
-@exec [ -f %B/zaptel.conf ] || cp %B/%f %B/zaptel.conf
 include/tonezone.h
 include/zaptel.h
 lib/libtonezone.a
 lib/zaptel/linker.hints
+lib/zaptel/qozap.ko
 lib/zaptel/wcfxo.ko
 lib/zaptel/wcfxs.ko
+lib/zaptel/wct1xxp.ko
+lib/zaptel/wct4xxp.ko
+lib/zaptel/wcte11xp.ko
 lib/zaptel/zaptel.ko
 lib/zaptel/ztdummy.ko
 @dirrm lib/zaptel