From 76121f0f5bc1ed5d84f1ee29a0231613693278c5 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Mon, 15 Mar 2010 20:45:40 +0000 Subject: [PATCH] Update to 2.2.1-rc2 (initial wctdm24xxp support). --- misc/dahdi-kmod/Makefile | 4 ++-- misc/dahdi-kmod/distinfo | 6 +++--- .../patch-freebsd-drivers-dahdi-wct4xxp-base.c | 18 ------------------ misc/dahdi-kmod/pkg-plist | 2 ++ misc/dahdi/Makefile | 4 ++-- misc/dahdi/distinfo | 6 +++--- .../patch-freebsd-drivers-dahdi-wct4xxp-base.c | 18 ------------------ misc/dahdi/pkg-plist | 2 ++ 8 files changed, 14 insertions(+), 46 deletions(-) delete mode 100644 misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c delete mode 100644 misc/dahdi/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile index 1179a73b8765..b5b221246ebf 100644 --- a/misc/dahdi-kmod/Makefile +++ b/misc/dahdi-kmod/Makefile @@ -19,8 +19,8 @@ COMMENT= Digium/Asterisk Hardware Device Interface BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake LIB_DEPENDS= newt.52:${PORTSDIR}/devel/newt -DAHDI_VERSION= 2.2.1-rc1 -DAHDI_TOOLS_VERSION= 2.2.1 +DAHDI_VERSION= 2.2.1-rc2 +DAHDI_TOOLS_VERSION= 2.2.1.1-rc1 NO_PACKAGE= Should be in sync with the kernel to work correctly GNU_CONFIGURE= yes diff --git a/misc/dahdi-kmod/distinfo b/misc/dahdi-kmod/distinfo index 1d28c93948c7..b133f06bcd65 100644 --- a/misc/dahdi-kmod/distinfo +++ b/misc/dahdi-kmod/distinfo @@ -1,3 +1,3 @@ -MD5 (dahdi-freebsd-complete-2.2.1-rc1+2.2.1.tar.gz) = 9f415b27c6fe69717b2346ca6fd28171 -SHA256 (dahdi-freebsd-complete-2.2.1-rc1+2.2.1.tar.gz) = 64884ea20574d03b15588a645300243bed4bf915b2b838f19eb5e13d2a15cbf6 -SIZE (dahdi-freebsd-complete-2.2.1-rc1+2.2.1.tar.gz) = 1936791 +MD5 (dahdi-freebsd-complete-2.2.1-rc2+2.2.1.1-rc1.tar.gz) = fc3c1423336661545fa9218dda392732 +SHA256 (dahdi-freebsd-complete-2.2.1-rc2+2.2.1.1-rc1.tar.gz) = 3f02bb178e0e3fb39497ba5b1f44eba7e3ada0a83628ee649a5a90a1c9712973 +SIZE (dahdi-freebsd-complete-2.2.1-rc2+2.2.1.1-rc1.tar.gz) = 1984887 diff --git a/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c b/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c deleted file mode 100644 index 3838d69fb38f..000000000000 --- a/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c +++ /dev/null @@ -1,18 +0,0 @@ ---- freebsd/drivers/dahdi/wct4xxp/base.c.orig 2010-03-03 19:04:37.000000000 +0600 -+++ freebsd/drivers/dahdi/wct4xxp/base.c 2010-03-03 19:04:51.000000000 +0600 -@@ -3070,7 +3070,6 @@ - { - struct t4 *wc = (struct t4 *)data; - -- DPRINTF(wc->dev, "%s\n", __FUNCTION__); - #ifdef VPM_SUPPORT - if (wc->vpm) { - if (test_and_clear_bit(T4_CHECK_VPM, &wc->checkflag)) { -@@ -3214,7 +3213,6 @@ - res = FILTER_HANDLED; - #endif - if (unlikely(test_bit(T4_CHECK_VPM, &wc->checkflag))) { -- DPRINTF(wc->dev, "scheduling filter thread\n"); - #if defined(__FreeBSD__) - res |= FILTER_SCHEDULE_THREAD; - #else diff --git a/misc/dahdi-kmod/pkg-plist b/misc/dahdi-kmod/pkg-plist index f8493bbaa221..fc589ffe1a5f 100644 --- a/misc/dahdi-kmod/pkg-plist +++ b/misc/dahdi-kmod/pkg-plist @@ -16,10 +16,12 @@ lib/dahdi/dahdi_echocan_sec.ko lib/dahdi/dahdi_echocan_sec2.ko lib/dahdi/dahdi_fw_oct6114_064.ko lib/dahdi/dahdi_fw_oct6114_128.ko +lib/dahdi/dahdi_voicebus.ko lib/dahdi/linker.hints lib/dahdi/ng_dahdi_netdev.ko lib/dahdi/wcb4xxp.ko lib/dahdi/wct4xxp.ko +lib/dahdi/wctdm24xxp.ko lib/libtonezone.a lib/libtonezone.so lib/libtonezone.so.1 diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile index 1179a73b8765..b5b221246ebf 100644 --- a/misc/dahdi/Makefile +++ b/misc/dahdi/Makefile @@ -19,8 +19,8 @@ COMMENT= Digium/Asterisk Hardware Device Interface BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake LIB_DEPENDS= newt.52:${PORTSDIR}/devel/newt -DAHDI_VERSION= 2.2.1-rc1 -DAHDI_TOOLS_VERSION= 2.2.1 +DAHDI_VERSION= 2.2.1-rc2 +DAHDI_TOOLS_VERSION= 2.2.1.1-rc1 NO_PACKAGE= Should be in sync with the kernel to work correctly GNU_CONFIGURE= yes diff --git a/misc/dahdi/distinfo b/misc/dahdi/distinfo index 1d28c93948c7..b133f06bcd65 100644 --- a/misc/dahdi/distinfo +++ b/misc/dahdi/distinfo @@ -1,3 +1,3 @@ -MD5 (dahdi-freebsd-complete-2.2.1-rc1+2.2.1.tar.gz) = 9f415b27c6fe69717b2346ca6fd28171 -SHA256 (dahdi-freebsd-complete-2.2.1-rc1+2.2.1.tar.gz) = 64884ea20574d03b15588a645300243bed4bf915b2b838f19eb5e13d2a15cbf6 -SIZE (dahdi-freebsd-complete-2.2.1-rc1+2.2.1.tar.gz) = 1936791 +MD5 (dahdi-freebsd-complete-2.2.1-rc2+2.2.1.1-rc1.tar.gz) = fc3c1423336661545fa9218dda392732 +SHA256 (dahdi-freebsd-complete-2.2.1-rc2+2.2.1.1-rc1.tar.gz) = 3f02bb178e0e3fb39497ba5b1f44eba7e3ada0a83628ee649a5a90a1c9712973 +SIZE (dahdi-freebsd-complete-2.2.1-rc2+2.2.1.1-rc1.tar.gz) = 1984887 diff --git a/misc/dahdi/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c b/misc/dahdi/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c deleted file mode 100644 index 3838d69fb38f..000000000000 --- a/misc/dahdi/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c +++ /dev/null @@ -1,18 +0,0 @@ ---- freebsd/drivers/dahdi/wct4xxp/base.c.orig 2010-03-03 19:04:37.000000000 +0600 -+++ freebsd/drivers/dahdi/wct4xxp/base.c 2010-03-03 19:04:51.000000000 +0600 -@@ -3070,7 +3070,6 @@ - { - struct t4 *wc = (struct t4 *)data; - -- DPRINTF(wc->dev, "%s\n", __FUNCTION__); - #ifdef VPM_SUPPORT - if (wc->vpm) { - if (test_and_clear_bit(T4_CHECK_VPM, &wc->checkflag)) { -@@ -3214,7 +3213,6 @@ - res = FILTER_HANDLED; - #endif - if (unlikely(test_bit(T4_CHECK_VPM, &wc->checkflag))) { -- DPRINTF(wc->dev, "scheduling filter thread\n"); - #if defined(__FreeBSD__) - res |= FILTER_SCHEDULE_THREAD; - #else diff --git a/misc/dahdi/pkg-plist b/misc/dahdi/pkg-plist index f8493bbaa221..fc589ffe1a5f 100644 --- a/misc/dahdi/pkg-plist +++ b/misc/dahdi/pkg-plist @@ -16,10 +16,12 @@ lib/dahdi/dahdi_echocan_sec.ko lib/dahdi/dahdi_echocan_sec2.ko lib/dahdi/dahdi_fw_oct6114_064.ko lib/dahdi/dahdi_fw_oct6114_128.ko +lib/dahdi/dahdi_voicebus.ko lib/dahdi/linker.hints lib/dahdi/ng_dahdi_netdev.ko lib/dahdi/wcb4xxp.ko lib/dahdi/wct4xxp.ko +lib/dahdi/wctdm24xxp.ko lib/libtonezone.a lib/libtonezone.so lib/libtonezone.so.1