(PATCH) asterisk-addons and zaptel ports (for 7-x)

[Ian FREISLICH]

Hi

The net/asterist-addons port is marked as broken for >7.0 because it doesn't compile.  While this is true, the folling patch solves the problem.  It fails to install though with this error:

gmake[1]: Entering directory `/usr/ports/net/asterisk-addons/work/asterisk-addons-1.4.4/asterisk-ooh323c'
cp .libs/libchan_h323.so /usr/local/lib/asterisk/modules/chan_ooh323.so
cp: .libs/libchan_h323.so: No such file or directory
gmake[1]: *** [install] Error 1
gmake[1]: Leaving directory `/usr/ports/net/asterisk-addons/work/asterisk-addons-1.4.4/asterisk-ooh323c'

Simply symlinking .libs/libchan_h323.so.1.1 to .libs/libchan_h323.so
in that diretory allows it to install.  I don't know enough about
gmake/configure to fix this part.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/asterisk-addons/Makefile,v
retrieving revision 1.7
diff -u -d -r1.7 Makefile
--- Makefile    28 Jul 2007 09:16:08 -0000      1.7
+++ Makefile    6 Dec 2007 12:48:09 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      asterisk-addons
-PORTVERSION=   1.4.2
+PORTVERSION=   1.4.4
 CATEGORIES=    net
 MASTER_SITES=  http://ftp.digium.com/pub/asterisk/releases/
 
@@ -26,9 +26,9 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700000
-BROKEN=        Does not build on 7-CURRENT
-.endif
+#.if ${OSVERSION} >= 700000
+#BROKEN=       Does not build on 7-CURRENT
+#.endif
 
 .if defined(WITH_SAMPLE_CONFIG)
 PLIST_SUB+=    SAMPLE_CONFIG=""
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/asterisk-addons/distinfo,v
retrieving revision 1.4
diff -u -d -r1.4 distinfo
--- distinfo    6 Jul 2007 02:24:25 -0000       1.4
+++ distinfo    27 Nov 2007 13:45:59 -0000
@@ -1,3 +1,3 @@
-MD5 (asterisk-addons-1.4.2.tar.gz) = c080b02e6ddc81dab6a64691af890805
-SHA256 (asterisk-addons-1.4.2.tar.gz) = 6d12a1a73cfe0cb14c960e422d0d3c261740857d2a86785f08cf89d44574cc82
-SIZE (asterisk-addons-1.4.2.tar.gz) = 1000286
+MD5 (asterisk-addons-1.4.4.tar.gz) = a25f4908ea122eeee4df7e0697fe5dfb
+SHA256 (asterisk-addons-1.4.4.tar.gz) = 888fe9ac84862b887e78f8ec4a83bc891897702ab123f05309ff117e55b6645b
+SIZE (asterisk-addons-1.4.4.tar.gz) = 1002173


The Zaptel driver locks up on FreeBSD-7.0.  The following patch to
the port fixes the problem:

Index: files/patch-zaptel::zaptel.c
===================================================================
RCS file: /home/ncvs/ports/misc/zaptel/files/patch-zaptel::zaptel.c,v
retrieving revision 1.3
diff -u -d -r1.3 patch-zaptel::zaptel.c
--- files/patch-zaptel::zaptel.c        29 Jan 2007 18:59:51 -0000      1.3
+++ files/patch-zaptel::zaptel.c        6 Dec 2007 10:36:03 -0000
@@ -9,3 +9,14 @@
        switch(rc)
        {
                case EINTR:
+--- zaptel/zaptel.c.orig       2007-12-05 14:39:49.000000000 +0200
++++ zaptel/zaptel.c    2007-12-05 14:40:10.000000000 +0200
+@@ -675,7 +675,7 @@
+       /* Free dev_info, if exist */
+       if(dev->si_drv2) free(dev->si_drv2, M_ZAP);
+       dev->si_drv2 = NULL;
+-      destroy_dev(dev);
++      destroy_dev_sched(dev);
+       return res;
+ }
+ 

Ian

--
Ian Freislich