6 files changed, 57 insertions, 7 deletions

diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile
index b2409e080eb6..4a09f215790f 100644
--- a/misc/zaptel/Makefile
+++ b/misc/zaptel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	zaptel
-PORTVERSION=	0.11
+PORTVERSION=	1.0
 CATEGORIES=	misc
 MASTER_SITES=	http://www.pbxpress.com/~gonzo/
-DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
+DISTNAME=	${PORTNAME}-bsd-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	A FreeBSD Driver for FXO, FXS, BRI and PRI Telephony Cards
diff --git a/misc/zaptel/distinfo b/misc/zaptel/distinfo
index 02ef95ed65e8..6c159de17652 100644
--- a/misc/zaptel/distinfo
+++ b/misc/zaptel/distinfo
@@ -1,3 +1,3 @@
-MD5 (zaptel-freebsd-0.11.tar.gz) = 0e0c967b720ec7fb64d1bbcd91a6f250
-SHA256 (zaptel-freebsd-0.11.tar.gz) = 1b36597b5a1d87f1bb8b1fc12bdba9edd4b063a3ffc937a9e684842daebaea34
-SIZE (zaptel-freebsd-0.11.tar.gz) = 457064
+MD5 (zaptel-bsd-1.0.tar.gz) = 0c01495e126bb319e3ebcb0cb046e621
+SHA256 (zaptel-bsd-1.0.tar.gz) = 19c8bf1264325c75a6f94533b9ddbeaec6712fc5a9297b44dc83c8cd06af4220
+SIZE (zaptel-bsd-1.0.tar.gz) = 235155
diff --git a/misc/zaptel/files/patch-qozap::Makefile b/misc/zaptel/files/patch-qozap::Makefile
new file mode 100644
index 000000000000..96e2efe5d9da
--- /dev/null
+++ b/misc/zaptel/files/patch-qozap::Makefile
@@ -0,0 +1,14 @@
+
+$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-zaphfc::Makefile b/misc/zaptel/files/patch-zaphfc::Makefile
new file mode 100644
index 000000000000..be960a601cff
--- /dev/null
+++ b/misc/zaptel/files/patch-zaphfc::Makefile
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- zaphfc/Makefile.orig
++++ zaphfc/Makefile
+@@ -1,4 +1,4 @@
+-# $Id$
++# $Id: Makefile,v 1.1 2006/07/06 05:51:19 root Exp root $
+ 
+ 
+ # CWARNFLAGS= -D__nothing_because_have_cplusplus_comments__
+@@ -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-zaptel::Makefile b/misc/zaptel/files/patch-zaptel::Makefile
new file mode 100644
index 000000000000..6d166350a44e
--- /dev/null
+++ b/misc/zaptel/files/patch-zaptel::Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- zaptel/Makefile
++++ zaptel/Makefile
+@@ -3,7 +3,7 @@
+ .PATH: /sys/dev/pci
+ SRCS=zaptel.c zt_chan.c zt_timer.c zt_zone.c zt_conf.c arith.h tones.h zaptel.h zaptel-compat.h
+ KMOD=zaptel
+-CFLAGS+=-g
++CFLAGS+=-g -DZAPATA_DEBUG=0
+ CLEANFILES+=gendigits tones.h
+ WERROR=-Wall
+ 
diff --git a/misc/zaptel/pkg-message b/misc/zaptel/pkg-message
index ede328a91c72..b74305863234 100644
--- a/misc/zaptel/pkg-message
+++ b/misc/zaptel/pkg-message
@@ -14,13 +14,13 @@ To unload it:
 
 It'll also load the driver automatically when the system is started.
 
-Report problems to Alexander Timoshenko <gonzo@portaone.com>. Please note that
+Report problems to Alexander Timoshenko <gonzo@pbxpress.com>. Please note that
 it is still "work in progress" so that your bug reports are welcome and will
 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, Max Khon, LF.net, Luigi Rizzo and others contributors.
+PBXpress, Inc, Max Khon, LF.net, Luigi Rizzo and others contributors.
 
 Thanks and enjoy!