9 files changed, 5 insertions, 171 deletions

diff --git a/net/zaptel12/Makefile b/net/zaptel12/Makefile
index be05f74a4fca..67c465625c6a 100644
--- a/net/zaptel12/Makefile
+++ b/net/zaptel12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zaptel
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	misc
 MASTER_SITES=	http://www.portaone.com/~sobomax/
 DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
diff --git a/net/zaptel12/distinfo b/net/zaptel12/distinfo
index e8be51c3536d..f02436b6b9b2 100644
--- a/net/zaptel12/distinfo
+++ b/net/zaptel12/distinfo
@@ -1,2 +1,2 @@
-MD5 (zaptel-freebsd-0.5.tar.gz) = c97dae894768cab9aa65a650082a13a3
-SIZE (zaptel-freebsd-0.5.tar.gz) = 125939
+MD5 (zaptel-freebsd-0.6.tar.gz) = 09b560a33ad139a1c6a3208169870a54
+SIZE (zaptel-freebsd-0.6.tar.gz) = 128402
diff --git a/net/zaptel12/files/patch-Makefile b/net/zaptel12/files/patch-Makefile
deleted file mode 100644
index 5be8536e7de1..000000000000
--- a/net/zaptel12/files/patch-Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-
-$FreeBSD$
-
---- 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
-@@ -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/net/zaptel12/files/patch-test::Makefile b/net/zaptel12/files/patch-test::Makefile
deleted file mode 100644
index 428438ef75b1..000000000000
--- a/net/zaptel12/files/patch-test::Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- 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${LOCALBASE}/include -I../zaptel -I../ztcfg
- 
- all: zttool fxo_test ztmonitor
- 
- fxo_test: fxo_test.o
--	gcc -o fxo_test fxo_test.o -ltonezone -L../ztcfg
-+	${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} ${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/net/zaptel12/files/patch-wcfxo::Makefile b/net/zaptel12/files/patch-wcfxo::Makefile
deleted file mode 100644
index 04623b45aab7..000000000000
--- a/net/zaptel12/files/patch-wcfxo::Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- wcfxo/Makefile.orig	Wed Apr 28 04:27:36 2004
-+++ wcfxo/Makefile	Thu Apr 29 18:00:11 2004
-@@ -1,13 +1,14 @@
- # $Id: Makefile,v 1.1 2004/04/28 11:27:36 gonzo Exp $
- .PATH: /sys/dev/pci
--SRCS=wcfxo.c wcfxovar.h
--KMOD=wcfxo
--CFLAGS+= -I../zaptel/ -g
--SRCS        += device_if.h bus_if.h isa_if.h pci_if.h 
--SRCS        += wcfxovar.h 
-+
-+KMOD=	wcfxo
-+SRCS=	wcfxo.c wcfxovar.h
-+SRCS+=	device_if.h bus_if.h isa_if.h pci_if.h 
-+SRCS+=	wcfxovar.h 
-+CFLAGS+= -I${.CURDIR}/../zaptel/ -g
- 
- load: wcfxo.ko
--	kldload ./wcfxo.ko
-+	kldload ${.CURDIR}/wcfxo.ko
- 
- unload:
- 	kldunload wcfxo
diff --git a/net/zaptel12/files/patch-zaptel::Makefile b/net/zaptel12/files/patch-zaptel::Makefile
deleted file mode 100644
index 07f2395f3571..000000000000
--- a/net/zaptel12/files/patch-zaptel::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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
-+	${CC} ${CFLAGS} -o gendigits gendigits.c -lm
- 	./gendigits
- 
- load: zaptel.ko
diff --git a/net/zaptel12/files/patch-ztcfg::Makefile b/net/zaptel12/files/patch-ztcfg::Makefile
deleted file mode 100644
index 8acfc8400394..000000000000
--- a/net/zaptel12/files/patch-ztcfg::Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-
-$FreeBSD$
-
---- ztcfg/Makefile.orig	Mon May 17 18:00:11 2004
-+++ ztcfg/Makefile	Mon May 17 04:09:57 2004
-@@ -1,10 +1,10 @@
--CFLAGS+= -I/usr/local/include -I. -I../zaptel -DUSE_LOCAL_INCLUDE=1
--INSTALL=/usr/bin/install
-+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../zaptel -I${PREFIX}/include -DUSE_LOCAL_INCLUDE=1 \
-+         -DPREFIX=\"${PREFIX}\"
- 
- all: ztcfg libtonezone.a
- 
- ztcfg: ztcfg.o  tonezone.o zonedata.o
--	$(CC) -o ztcfg ztcfg.o tonezone.o zonedata.o -lm -L. 
-+	$(CC) -o ztcfg ztcfg.o tonezone.o zonedata.o -lm -L${.CURDIR}
- 
- ztcfg.c: ztcfg.h
- 
-@@ -12,9 +12,14 @@
- 	ar r libtonezone.a tonezone.o zonedata.o
- 
- install:
--	$(INSTALL) -o root -g wheel -m 644 libtonezone.a /usr/local/lib/
--	$(INSTALL) -o root -g wheel -m 644 tonezone.h /usr/local/include/
--	$(INSTALL) -o root -g wheel -m 644 ../zaptel/zaptel.h /usr/local/include/
-+	${BSD_INSTALL_PROGRAM} ztcfg ${PREFIX}/bin
-+	${BSD_INSTALL_DATA} libtonezone.a ${PREFIX}/lib
-+	${BSD_INSTALL_DATA} tonezone.h ${PREFIX}/include
-+	${BSD_INSTALL_DATA} ${.CURDIR}/../zaptel/zaptel.h ${PREFIX}/include
-+	${BSD_INSTALL_DATA} zaptel.conf.sample ${PREFIX}/etc
-+	if [ ! -f %B/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-ztcfg::ztcfg.h b/net/zaptel12/files/patch-ztcfg::ztcfg.h
deleted file mode 100644
index 1a83c9154aa7..000000000000
--- a/net/zaptel12/files/patch-ztcfg::ztcfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- ztcfg/ztcfg.h	2004/04/30 01:01:39	1.1
-+++ ztcfg/ztcfg.h	2004/04/30 01:01:48
-@@ -23,6 +23,6 @@
- #ifndef _ZTCFG_H
- #define _ZTCFG_H
- 
--#define CONFIG_FILENAME "/etc/zaptel.conf"
-+#define CONFIG_FILENAME PREFIX "/etc/zaptel.conf"
- #define MASTER_DEVICE   "/dev/zap/ctl"
- #endif
diff --git a/net/zaptel12/pkg-plist b/net/zaptel12/pkg-plist
index f9d59cdcedc0..84b9f3a9ea77 100644
--- a/net/zaptel12/pkg-plist
+++ b/net/zaptel12/pkg-plist
@@ -1,6 +1,7 @@
 bin/fxo_test
 bin/ztcfg
 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
@@ -13,4 +14,5 @@ lib/zaptel/linker.hints
 lib/zaptel/wcfxo.ko
 lib/zaptel/wcfxs.ko
 lib/zaptel/zaptel.ko
+lib/zaptel/ztdummy.ko
 @dirrm lib/zaptel