4 files changed, 25 insertions, 72 deletions

diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index 1104fda4a577..a9777d06df65 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	dahdi
+PORTNAME=	dahdi-kmod
 PORTVERSION=	${DAHDI_VERSION:S/-//g}
-PORTREVISION=	4
+PORTREVISION=	0
 CATEGORIES=	misc kld
 MASTER_SITES=	${MASTER_SITE_LOCAL}\
 		http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
 MASTER_SITE_SUBDIR=	fjoe
-DISTNAME=	${PORTNAME}-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
+DISTNAME=	dahdi-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}\
 		oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
 		zaphfc-${ZAPHFC_VERSION}${EXTRACT_SUFX}
@@ -20,8 +20,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}\
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Digium/Asterisk Hardware Device Interface
 
-BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
-LIB_DEPENDS=	newt.52:${PORTSDIR}/devel/newt
+RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:${PORTSDIR}/misc/dahdi
 
 DAHDI_VERSION=		2.4.0-rc5
 DAHDI_TOOLS_VERSION=	2.4.0-rc1
@@ -37,12 +36,11 @@ VPMADT032_NAME=		dahdi-fwload-vpmadt032
 VPMADT032_DIR=		dahdi_vpmadt032_loader
 VPMADT032_VERSION=	1.25.0
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/freebsd
 EXTRA_PATCHES=	${WRKDIR}/zaphfc-${ZAPHFC_VERSION}
+PATCH_STRIP=	-p1
+MAKEFILE=	BSDmakefile
 NO_PACKAGE=	Should be in sync with the kernel to work correctly
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-dahdi=../freebsd --sysconfdir=${PREFIX}/etc --with-newt=${LOCALBASE}
-CONFIGURE_ENV=	WGET=/usr/bin/fetch
-USE_LDCONFIG=	yes
 USE_RC_SUBR=	dahdi
 MAKE_ARGS=	ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes
 GROUPS=		dahdi
@@ -50,13 +48,6 @@ GROUPS=		dahdi
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 CONFLICTS=	zaptel-[0-9]*
 
-MAN8=	dahdi_cfg.8\
-	dahdi_monitor.8\
-	dahdi_scan.8\
-	dahdi_test.8\
-	dahdi_tool.8\
-	fxotune.8
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 703000 || (${OSVERSION} >= 800000 && ${OSVERSION} < 800108)
@@ -85,17 +76,11 @@ pre-everything::
 	fi
 
 post-extract:
-	@${LN} -s ../../../linux-${OSLEC_VERSION}/drivers/staging ${WRKSRC}/freebsd/drivers
-	@${REINPLACE_CMD} -E -e 's,(new|old)/,freebsd/,g' ${WRKDIR}/zaphfc-${ZAPHFC_VERSION}
+	@${LN} -s ../../../linux-${OSLEC_VERSION}/drivers/staging ${WRKSRC}/drivers
 .for _f in ${FIRMWARES}
-	${CP} ${DISTDIR}/${${_f}_DISTFILE} ${WRKSRC}/freebsd/freebsd/${${_f}_DIR}
+	${CP} ${DISTDIR}/${${_f}_DISTFILE} ${WRKSRC}/freebsd/${${_f}_DIR}
 .endfor
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,g'\
-		${WRKSRC}/tools/dahdi_cfg.c ${WRKSRC}/tools/fxotune.c\
-		${WRKSRC}/tools/doc/dahdi_cfg.8 ${WRKSRC}/tools/doc/fxotune.8
-
 pre-su-install:
 	@${MKDIR} ${PREFIX}/lib/dahdi
 
@@ -104,7 +89,7 @@ post-install:
 
 fw-versions: extract
 .for _v in ${FIRMWARES:=_VERSION}
-	@${ECHO_CMD} "${_v}=`${MAKE} -V ${_v} -f ${WRKSRC}/freebsd/firmware.mk`"
+	@${ECHO_CMD} "${_v}=`${MAKE} -V ${_v} -f ${WRKSRC}/firmware.mk`"
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/misc/dahdi-kmod/files/patch-freebsd-freebsd-dahdi-Makefile b/misc/dahdi-kmod/files/patch-freebsd-freebsd-dahdi-Makefile
new file mode 100644
index 000000000000..69250ba41d57
--- /dev/null
+++ b/misc/dahdi-kmod/files/patch-freebsd-freebsd-dahdi-Makefile
@@ -0,0 +1,14 @@
+--- freebsd/freebsd/dahdi/Makefile.orig	2011-04-19 00:31:03.000000000 +0700
++++ freebsd/freebsd/dahdi/Makefile	2011-04-19 00:31:29.000000000 +0700
+@@ -14,11 +14,5 @@
+ 	@if ! cmp -s ${.TARGET}.tmp ${.TARGET}; then echo "Updating ${.TARGET}"; mv ${.TARGET}.tmp ${.TARGET}; fi
+ 	@rm -f ${.TARGET}.tmp
+ 
+-afterinstall:
+-	${MKDIR} ${PREFIX}/include/dahdi/compat
+-.for _h in ${INCS}
+-	${INSTALL_DATA} ${INCLUDEDIR}/dahdi/${_h} ${PREFIX}/include/dahdi/${_h:H}
+-.endfor
+-
+ .include <bsd.kmod.mk>
+ .include <bsd.own.mk>
diff --git a/misc/dahdi-kmod/files/patch-tools-Makefile b/misc/dahdi-kmod/files/patch-tools-Makefile
deleted file mode 100644
index 48028dd64066..000000000000
--- a/misc/dahdi-kmod/files/patch-tools-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- tools/Makefile.orig	2010-04-01 22:45:47.000000000 +0700
-+++ tools/Makefile	2010-06-01 17:18:37.000000000 +0700
-@@ -27,7 +27,7 @@
- endif
- 
- SUBDIRS_UTILS_ALL:= ppp
--SUBDIRS_UTILS := xpp
-+#SUBDIRS_UTILS := xpp
- 
- OPTFLAGS=-O2
- CFLAGS+=-I. $(OPTFLAGS) -g -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-@@ -229,10 +229,8 @@
- 	install -d $(DESTDIR)$(MAN_DIR)
- 	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
- endif
--ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
--	$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
--	$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
--endif
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(CONFIG_DIR)
-+	$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE).sample
- 
- install-libs: libs
- 	$(INSTALL) -d -m 755 $(DESTDIR)/$(LIB_DIR)
diff --git a/misc/dahdi-kmod/pkg-plist b/misc/dahdi-kmod/pkg-plist
index 13f5f6ee148b..9c95ae1806c2 100644
--- a/misc/dahdi-kmod/pkg-plist
+++ b/misc/dahdi-kmod/pkg-plist
@@ -1,8 +1,3 @@
-etc/dahdi/system.conf.sample
-include/dahdi/compat/types.h
-include/dahdi/tonezone.h
-include/dahdi/user.h
-include/dahdi/wctdm_user.h
 lib/dahdi/dahdi-fw-hx8.bin.ko
 lib/dahdi/dahdi-fw-oct6114-064.bin.ko
 lib/dahdi/dahdi-fw-oct6114-128.bin.ko
@@ -14,8 +9,8 @@ lib/dahdi/dahdi_dynamic_ethmf.ko
 lib/dahdi/dahdi_dynamic_loc.ko
 lib/dahdi/dahdi_echocan_jpah.ko
 lib/dahdi/dahdi_echocan_kb1.ko
-lib/dahdi/dahdi_echocan_oslec.ko
 lib/dahdi/dahdi_echocan_mg2.ko
+lib/dahdi/dahdi_echocan_oslec.ko
 lib/dahdi/dahdi_echocan_sec.ko
 lib/dahdi/dahdi_echocan_sec2.ko
 lib/dahdi/dahdi_transcode.ko
@@ -32,21 +27,4 @@ lib/dahdi/wctdm.ko
 lib/dahdi/wctdm24xxp.ko
 lib/dahdi/wcte11xp.ko
 lib/dahdi/wcte12xp.ko
-lib/libtonezone.a
-lib/libtonezone.so
-lib/libtonezone.so.1
-lib/libtonezone.so.1.0
-lib/libtonezone.so.2
-lib/libtonezone.so.2.0
-sbin/dahdi_cfg
-sbin/dahdi_maint
-sbin/dahdi_monitor
-sbin/dahdi_scan
-sbin/dahdi_speed
-sbin/dahdi_test
-sbin/dahdi_tool
-sbin/fxotune
 @dirrm lib/dahdi
-@dirrm include/dahdi/compat
-@dirrm include/dahdi
-@dirrmtry etc/dahdi