22 files changed, 10 insertions, 266 deletions

diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile
index e30ab6e77158..b934c6215862 100644
--- a/misc/zaptel/Makefile
+++ b/misc/zaptel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	zaptel
-PORTVERSION=	0.9
-PORTREVISION=	1
+PORTVERSION=	0.10
 CATEGORIES=	misc
-MASTER_SITES=	http://www.portaone.com/~sobomax/
+MASTER_SITES=	http://www.portaone.com/~gonzo/
 DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
@@ -24,12 +23,6 @@ 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."; \
@@ -49,4 +42,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/zaptel.sh.sample ${PREFIX}/etc/rc.d
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/zaptel/distinfo b/misc/zaptel/distinfo
index 26706997ca1e..5f95f3089413 100644
--- a/misc/zaptel/distinfo
+++ b/misc/zaptel/distinfo
@@ -1,2 +1,2 @@
-MD5 (zaptel-freebsd-0.9.tar.gz) = bfd61d1cf4ef93e1b75185492c17ea16
-SIZE (zaptel-freebsd-0.9.tar.gz) = 193215
+MD5 (zaptel-freebsd-0.10.tar.gz) = 1e12c17e38070b0b233edba07880c786
+SIZE (zaptel-freebsd-0.10.tar.gz) = 194635
diff --git a/misc/zaptel/files/patch-qozap::Makefile b/misc/zaptel/files/patch-qozap::Makefile
deleted file mode 100644
index eb4604d5a43e..000000000000
--- a/misc/zaptel/files/patch-qozap::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- qozap/Makefile
-+++ qozap/Makefile
-@@ -4,6 +4,7 @@
- SRCS=	qozap.c qozap_freebsd.c
- SRCS+=	device_if.h bus_if.h isa_if.h pci_if.h 
- CFLAGS+=-I../zaptel
-+WERROR=	-Wall
- 
- #DEBUG_FLAGS=	-g
- 
diff --git a/misc/zaptel/files/patch-wcfxo::Makefile b/misc/zaptel/files/patch-wcfxo::Makefile
deleted file mode 100644
index 3f2f9307e1b0..000000000000
--- a/misc/zaptel/files/patch-wcfxo::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wcfxo/Makefile
-+++ wcfxo/Makefile
-@@ -6,6 +6,7 @@
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
- SRCS+=wcfxovar.h 
-+WERROR=	-Wall
- 
- load: wcfxo.ko
- 	kldload ./wcfxo.ko
diff --git a/misc/zaptel/files/patch-wcfxs::Makefile b/misc/zaptel/files/patch-wcfxs::Makefile
deleted file mode 100644
index fafb7be8daa8..000000000000
--- a/misc/zaptel/files/patch-wcfxs::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wcfxs/Makefile
-+++ wcfxs/Makefile
-@@ -6,6 +6,7 @@
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
- SRCS+=wcfxsvar.h 
-+WERROR=	-Wall
- 
- load: wcfxs.ko
- 	kldload ./wcfxs.ko
diff --git a/misc/zaptel/files/patch-wct1xxp::Makefile b/misc/zaptel/files/patch-wct1xxp::Makefile
deleted file mode 100644
index f2fb84034d20..000000000000
--- a/misc/zaptel/files/patch-wct1xxp::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wct1xxp/Makefile
-+++ wct1xxp/Makefile
-@@ -6,6 +6,7 @@
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
- SRCS+=wct1xxp_var.h 
-+WERROR=	-Wall
- 
- load: wct1xxp.ko
- 	kldload ./wct1xxp.ko
diff --git a/misc/zaptel/files/patch-wct4xxp::Makefile b/misc/zaptel/files/patch-wct4xxp::Makefile
deleted file mode 100644
index 2a456d29fdde..000000000000
--- a/misc/zaptel/files/patch-wct4xxp::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wct4xxp/Makefile
-+++ wct4xxp/Makefile
-@@ -5,6 +5,7 @@
- KMOD=wct4xxp
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
-+WERROR=	-Wall
- 
- load: wct4xxp.ko
- 	kldload ./wct4xxp.ko
diff --git a/misc/zaptel/files/patch-wcte11xp::Makefile b/misc/zaptel/files/patch-wcte11xp::Makefile
deleted file mode 100644
index c2309f926dd1..000000000000
--- a/misc/zaptel/files/patch-wcte11xp::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wcte11xp/Makefile
-+++ wcte11xp/Makefile
-@@ -6,6 +6,7 @@
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
- SRCS+=wcte11xp_var.h 
-+WERROR=	-Wall
- 
- load: wcte11xp.ko
- 	kldload ./wcte11xp.ko
diff --git a/misc/zaptel/files/patch-zaptel::Makefile b/misc/zaptel/files/patch-zaptel::Makefile
deleted file mode 100644
index ddf54b3fbc70..000000000000
--- a/misc/zaptel/files/patch-zaptel::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- zaptel/Makefile
-+++ zaptel/Makefile
-@@ -5,6 +5,7 @@
- KMOD=zaptel
- CFLAGS+=-g
- CLEANFILES+=gendigits tones.h
-+WERROR=-Wall
- 
- SRCS+=device_if.h bus_if.h vnode_if.h
- 
diff --git a/misc/zaptel/files/patch-ztcfg::Makefile b/misc/zaptel/files/patch-ztcfg::Makefile
deleted file mode 100644
index 43097359ca78..000000000000
--- a/misc/zaptel/files/patch-ztcfg::Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- ztcfg/Makefile
-+++ ztcfg/Makefile
-@@ -32,10 +32,6 @@
- 	${BSD_INSTALL_DATA} libtonezone.a ${PREFIX}/lib/
- 	${BSD_INSTALL_DATA} tonezone.h ${PREFIX}/include/
- 	${BSD_INSTALL_DATA} ../zaptel/zaptel.h ${PREFIX}/include/
--	${BSD_INSTALL_DATA} zaptel.conf.sample ${PREFIX}/etc/
--	if [ ! -e ${PREFIX}/zaptel.conf ]; then \
--		${BSD_INSTALL_DATA} zaptel.conf.sample ${PREFIX}/etc/zaptel.conf; \
--	fi
- 
- clean: 
- 	rm -f *.o ztcfg *.a
diff --git a/misc/zaptel/files/patch-ztdummy::Makefile b/misc/zaptel/files/patch-ztdummy::Makefile
deleted file mode 100644
index b3672857f58b..000000000000
--- a/misc/zaptel/files/patch-ztdummy::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ztdummy/Makefile
-+++ ztdummy/Makefile
-@@ -4,7 +4,7 @@
- SRCS=ztdummy.c ztdummy.h
- KMOD=ztdummy
- CFLAGS+=-I../zaptel  -g
--
-+WERROR=	-Wall
- SRCS+=ztdummy.h 
- 
- load: ztdummy.ko
diff --git a/net/zaptel12/Makefile b/net/zaptel12/Makefile
index e30ab6e77158..b934c6215862 100644
--- a/net/zaptel12/Makefile
+++ b/net/zaptel12/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	zaptel
-PORTVERSION=	0.9
-PORTREVISION=	1
+PORTVERSION=	0.10
 CATEGORIES=	misc
-MASTER_SITES=	http://www.portaone.com/~sobomax/
+MASTER_SITES=	http://www.portaone.com/~gonzo/
 DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
@@ -24,12 +23,6 @@ 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."; \
@@ -49,4 +42,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/zaptel.sh.sample ${PREFIX}/etc/rc.d
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/zaptel12/distinfo b/net/zaptel12/distinfo
index 26706997ca1e..5f95f3089413 100644
--- a/net/zaptel12/distinfo
+++ b/net/zaptel12/distinfo
@@ -1,2 +1,2 @@
-MD5 (zaptel-freebsd-0.9.tar.gz) = bfd61d1cf4ef93e1b75185492c17ea16
-SIZE (zaptel-freebsd-0.9.tar.gz) = 193215
+MD5 (zaptel-freebsd-0.10.tar.gz) = 1e12c17e38070b0b233edba07880c786
+SIZE (zaptel-freebsd-0.10.tar.gz) = 194635
diff --git a/net/zaptel12/files/patch-qozap::Makefile b/net/zaptel12/files/patch-qozap::Makefile
deleted file mode 100644
index eb4604d5a43e..000000000000
--- a/net/zaptel12/files/patch-qozap::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- qozap/Makefile
-+++ qozap/Makefile
-@@ -4,6 +4,7 @@
- SRCS=	qozap.c qozap_freebsd.c
- SRCS+=	device_if.h bus_if.h isa_if.h pci_if.h 
- CFLAGS+=-I../zaptel
-+WERROR=	-Wall
- 
- #DEBUG_FLAGS=	-g
- 
diff --git a/net/zaptel12/files/patch-wcfxo::Makefile b/net/zaptel12/files/patch-wcfxo::Makefile
deleted file mode 100644
index 3f2f9307e1b0..000000000000
--- a/net/zaptel12/files/patch-wcfxo::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wcfxo/Makefile
-+++ wcfxo/Makefile
-@@ -6,6 +6,7 @@
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
- SRCS+=wcfxovar.h 
-+WERROR=	-Wall
- 
- load: wcfxo.ko
- 	kldload ./wcfxo.ko
diff --git a/net/zaptel12/files/patch-wcfxs::Makefile b/net/zaptel12/files/patch-wcfxs::Makefile
deleted file mode 100644
index fafb7be8daa8..000000000000
--- a/net/zaptel12/files/patch-wcfxs::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wcfxs/Makefile
-+++ wcfxs/Makefile
-@@ -6,6 +6,7 @@
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
- SRCS+=wcfxsvar.h 
-+WERROR=	-Wall
- 
- load: wcfxs.ko
- 	kldload ./wcfxs.ko
diff --git a/net/zaptel12/files/patch-wct1xxp::Makefile b/net/zaptel12/files/patch-wct1xxp::Makefile
deleted file mode 100644
index f2fb84034d20..000000000000
--- a/net/zaptel12/files/patch-wct1xxp::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wct1xxp/Makefile
-+++ wct1xxp/Makefile
-@@ -6,6 +6,7 @@
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
- SRCS+=wct1xxp_var.h 
-+WERROR=	-Wall
- 
- load: wct1xxp.ko
- 	kldload ./wct1xxp.ko
diff --git a/net/zaptel12/files/patch-wct4xxp::Makefile b/net/zaptel12/files/patch-wct4xxp::Makefile
deleted file mode 100644
index 2a456d29fdde..000000000000
--- a/net/zaptel12/files/patch-wct4xxp::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wct4xxp/Makefile
-+++ wct4xxp/Makefile
-@@ -5,6 +5,7 @@
- KMOD=wct4xxp
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
-+WERROR=	-Wall
- 
- load: wct4xxp.ko
- 	kldload ./wct4xxp.ko
diff --git a/net/zaptel12/files/patch-wcte11xp::Makefile b/net/zaptel12/files/patch-wcte11xp::Makefile
deleted file mode 100644
index c2309f926dd1..000000000000
--- a/net/zaptel12/files/patch-wcte11xp::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- wcte11xp/Makefile
-+++ wcte11xp/Makefile
-@@ -6,6 +6,7 @@
- CFLAGS+=-I../zaptel -g
- SRCS+=device_if.h bus_if.h isa_if.h pci_if.h 
- SRCS+=wcte11xp_var.h 
-+WERROR=	-Wall
- 
- load: wcte11xp.ko
- 	kldload ./wcte11xp.ko
diff --git a/net/zaptel12/files/patch-zaptel::Makefile b/net/zaptel12/files/patch-zaptel::Makefile
deleted file mode 100644
index ddf54b3fbc70..000000000000
--- a/net/zaptel12/files/patch-zaptel::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- zaptel/Makefile
-+++ zaptel/Makefile
-@@ -5,6 +5,7 @@
- KMOD=zaptel
- CFLAGS+=-g
- CLEANFILES+=gendigits tones.h
-+WERROR=-Wall
- 
- SRCS+=device_if.h bus_if.h vnode_if.h
- 
diff --git a/net/zaptel12/files/patch-ztcfg::Makefile b/net/zaptel12/files/patch-ztcfg::Makefile
deleted file mode 100644
index 43097359ca78..000000000000
--- a/net/zaptel12/files/patch-ztcfg::Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- ztcfg/Makefile
-+++ ztcfg/Makefile
-@@ -32,10 +32,6 @@
- 	${BSD_INSTALL_DATA} libtonezone.a ${PREFIX}/lib/
- 	${BSD_INSTALL_DATA} tonezone.h ${PREFIX}/include/
- 	${BSD_INSTALL_DATA} ../zaptel/zaptel.h ${PREFIX}/include/
--	${BSD_INSTALL_DATA} zaptel.conf.sample ${PREFIX}/etc/
--	if [ ! -e ${PREFIX}/zaptel.conf ]; then \
--		${BSD_INSTALL_DATA} zaptel.conf.sample ${PREFIX}/etc/zaptel.conf; \
--	fi
- 
- clean: 
- 	rm -f *.o ztcfg *.a
diff --git a/net/zaptel12/files/patch-ztdummy::Makefile b/net/zaptel12/files/patch-ztdummy::Makefile
deleted file mode 100644
index b3672857f58b..000000000000
--- a/net/zaptel12/files/patch-ztdummy::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ztdummy/Makefile
-+++ ztdummy/Makefile
-@@ -4,7 +4,7 @@
- SRCS=ztdummy.c ztdummy.h
- KMOD=ztdummy
- CFLAGS+=-I../zaptel  -g
--
-+WERROR=	-Wall
- SRCS+=ztdummy.h 
- 
- load: ztdummy.ko