3 files changed, 58 insertions, 3 deletions

diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile
index d0ca72a3d186..c8af029fb3ab 100644
--- a/misc/dahdi/Makefile
+++ b/misc/dahdi/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	dahdi
 PORTVERSION=	${DAHDI_VERSION:S/-//g}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	misc kld
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+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}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}\
@@ -27,6 +28,15 @@ DAHDI_TOOLS_VERSION=	2.4.0-rc1
 OSLEC_VERSION=		2.6.35.4
 ZAPHFC_VERSION=		r5
 
+FIRMWARES=		OCT6114_064 OCT6114_128 TC400M HX8 ${_vpmadt032}
+OCT6114_064_VERSION=	1.05.01
+OCT6114_128_VERSION=	1.05.01
+TC400M_VERSION=		MR6.12
+HX8_VERSION=		2.06
+VPMADT032_NAME=		dahdi-fwload-vpmadt032
+VPMADT032_DIR=		dahdi_vpmadt032_loader
+VPMADT032_VERSION=	1.25.0
+
 EXTRA_PATCHES=	${WRKDIR}/zaphfc-${ZAPHFC_VERSION}
 NO_PACKAGE=	Should be in sync with the kernel to work correctly
 GNU_CONFIGURE=	yes
@@ -34,7 +44,7 @@ CONFIGURE_ARGS=	--with-dahdi=../freebsd --sysconfdir=${PREFIX}/etc --with-newt=$
 CONFIGURE_ENV=	WGET=/usr/bin/fetch
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	dahdi
-MAKE_ARGS=	ADDITIONAL_DRIVERS="wcb1xxp"
+MAKE_ARGS=	ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes
 
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 CONFLICTS=	zaptel-[0-9]*
@@ -54,10 +64,18 @@ IGNORE=		requires firmware(9) support for kernel modules with hyphens
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 PLIST_SUB+=	X86=""
+_vpmadt032=	VPMADT032
 .else
 PLIST_SUB+=	X86="@comment "
 .endif
 
+.for _f in ${FIRMWARES}
+${_f}_NAME?=	dahdi-fw-${_f:L:S/_/-/g}
+${_f}_DIR?=	${${_f}_NAME}.bin
+${_f}_DISTFILE=	${${_f}_NAME}-${${_f}_VERSION}.tar.gz
+DISTFILES+=	${${_f}_DISTFILE}:firmware
+.endfor
+
 pre-everything::
 	@if [ ! -f /usr/src/sys/Makefile ]; then \
 		${ECHO_MSG} ">> The dahdi port needs FreeBSD kernel source code to compile."; \
@@ -68,6 +86,9 @@ pre-everything::
 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}
+.for _f in ${FIRMWARES}
+	${CP} ${DISTDIR}/${${_f}_DISTFILE} ${WRKSRC}/freebsd/freebsd/${${_f}_DIR}
+.endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,g'\
@@ -80,4 +101,9 @@ pre-su-install:
 post-install:
 	@${TOUCH} ${PREFIX}/lib/dahdi/linker.hints
 
+fw-versions: extract
+.for _v in ${FIRMWARES:=_VERSION}
+	@${ECHO_CMD} "${_v}=`${MAKE} -V ${_v} -f ${WRKSRC}/freebsd/firmware.mk`"
+.endfor
+
 .include <bsd.port.post.mk>
diff --git a/misc/dahdi/distinfo b/misc/dahdi/distinfo
index 54e4b9788cd5..8ac4b0d5ce97 100644
--- a/misc/dahdi/distinfo
+++ b/misc/dahdi/distinfo
@@ -7,3 +7,18 @@ SIZE (oslec-linux-2.6.35.4.tar.gz) = 12057
 MD5 (zaphfc-r5.tar.gz) = 5fbc6110c01b60e6795b5e8424bb4790
 SHA256 (zaphfc-r5.tar.gz) = 7e809b62dcc2bd3caf2e5a882390051b881eb08d37fea1733d7fb55e80bc6756
 SIZE (zaphfc-r5.tar.gz) = 15639
+MD5 (dahdi-fw-oct6114-064-1.05.01.tar.gz) = 88db9b7a07d8392736171b1b3e6bcc66
+SHA256 (dahdi-fw-oct6114-064-1.05.01.tar.gz) = 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91
+SIZE (dahdi-fw-oct6114-064-1.05.01.tar.gz) = 165869
+MD5 (dahdi-fw-oct6114-128-1.05.01.tar.gz) = c1f1a18d3e20d283f42c71e580a64b5a
+SHA256 (dahdi-fw-oct6114-128-1.05.01.tar.gz) = e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
+SIZE (dahdi-fw-oct6114-128-1.05.01.tar.gz) = 165849
+MD5 (dahdi-fw-tc400m-MR6.12.tar.gz) = 2ea860bb8a9d8ede2858b9557b74ee3c
+SHA256 (dahdi-fw-tc400m-MR6.12.tar.gz) = 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
+SIZE (dahdi-fw-tc400m-MR6.12.tar.gz) = 1750035
+MD5 (dahdi-fw-hx8-2.06.tar.gz) = a7f3886942bb3e9fed349a41b3390c9f
+SHA256 (dahdi-fw-hx8-2.06.tar.gz) = 449ab3fd03d55d808e999efb7677cd04de202b92c9fcb039539a7e48a39a80f5
+SIZE (dahdi-fw-hx8-2.06.tar.gz) = 29252
+MD5 (dahdi-fwload-vpmadt032-1.25.0.tar.gz) = 19a660c2073749641072ca644e983cbc
+SHA256 (dahdi-fwload-vpmadt032-1.25.0.tar.gz) = 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1
+SIZE (dahdi-fwload-vpmadt032-1.25.0.tar.gz) = 149360
diff --git a/misc/dahdi/files/patch-freebsd-freebsd-Makefile.inc b/misc/dahdi/files/patch-freebsd-freebsd-Makefile.inc
new file mode 100644
index 000000000000..a84f479c5094
--- /dev/null
+++ b/misc/dahdi/files/patch-freebsd-freebsd-Makefile.inc
@@ -0,0 +1,14 @@
+--- freebsd/freebsd/Makefile.inc.orig	2010-09-01 13:50:13.000000000 +0700
++++ freebsd/freebsd/Makefile.inc	2010-09-01 13:50:34.000000000 +0700
+@@ -8,7 +8,11 @@
+ #CFLAGS+=	-DINVARIANT_SUPPORT -DINVARIANTS -DDIAGNOSTIC
+ 
+ CP?=		cp
++.if defined(NO_FETCH)
++FETCH?=		@echo Skipping fetch
++.else
+ FETCH?=		fetch
++.endif
+ MKDIR?=		mkdir -p
+ INSTALL_DATA?=	${INSTALL} -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} -c
+ TAR?=		tar