[pkgsrc/trunk]: pkgsrc/comms/asterisk Update to asterisk 1.2.2

[mjl <mjl%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9aebdb2bd67a
branches:  trunk
changeset: 506513:9aebdb2bd67a
user:      mjl <mjl%pkgsrc.org@localhost>
date:      Wed Jan 18 11:39:54 2006 +0000

description:
Update to asterisk 1.2.2

Changes are bugfixes only.

diffstat:

 comms/asterisk/Makefile         |   4 ++--
 comms/asterisk/distinfo         |  10 +++++-----
 comms/asterisk/patches/patch-ad |  16 +++++++++-------
 3 files changed, 16 insertions(+), 14 deletions(-)

diffs (99 lines):

diff -r a5f1aff1ba86 -r 9aebdb2bd67a comms/asterisk/Makefile
--- a/comms/asterisk/Makefile   Wed Jan 18 03:58:19 2006 +0000
+++ b/comms/asterisk/Makefile   Wed Jan 18 11:39:54 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2006/01/13 20:32:38 riz Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/18 11:39:54 mjl Exp $
 
-DISTNAME=      asterisk-1.2.1
+DISTNAME=      asterisk-1.2.2
 CATEGORIES=    comms net audio
 MASTER_SITES=  http://ftp.digium.com/pub/asterisk/ \
                http://ftp.digium.com/pub/asterisk/old-releases
diff -r a5f1aff1ba86 -r 9aebdb2bd67a comms/asterisk/distinfo
--- a/comms/asterisk/distinfo   Wed Jan 18 03:58:19 2006 +0000
+++ b/comms/asterisk/distinfo   Wed Jan 18 11:39:54 2006 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.7 2006/01/13 20:32:38 riz Exp $
+$NetBSD: distinfo,v 1.8 2006/01/18 11:39:54 mjl Exp $
 
-SHA1 (asterisk-1.2.1.tar.gz) = aab351702d85a37ef9aefb8272f5f5d62fd791a3
-RMD160 (asterisk-1.2.1.tar.gz) = 68c96a098b4c52a096daad45ed19431c75fe1894
-Size (asterisk-1.2.1.tar.gz) = 10517194 bytes
+SHA1 (asterisk-1.2.2.tar.gz) = 0bd7a734da337ebc505350d48e521a5ce82fa996
+RMD160 (asterisk-1.2.2.tar.gz) = c185cc28fc81b92e378133a6fe8f987dec1dbb5c
+Size (asterisk-1.2.2.tar.gz) = 10532437 bytes
 SHA1 (patch-aa) = b5b6dc32051bcf5c0a894e74f2989c9a7923d8e8
 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
-SHA1 (patch-ad) = e1309faffe1aee9c3854cdc5862e52aa6d110305
+SHA1 (patch-ad) = bfc898732884063c6c300b15674e462793588601
 SHA1 (patch-ae) = 9b7b2ed60d79aab3e2653d97409067c17cd342b4
 SHA1 (patch-af) = 33c03a4ae531296b2b4e60713e33d7491fff504d
 SHA1 (patch-ag) = 3e6ce8f463df94fe9cba8fa8dbe03eda408aa581
diff -r a5f1aff1ba86 -r 9aebdb2bd67a comms/asterisk/patches/patch-ad
--- a/comms/asterisk/patches/patch-ad   Wed Jan 18 03:58:19 2006 +0000
+++ b/comms/asterisk/patches/patch-ad   Wed Jan 18 11:39:54 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2006/01/13 20:32:38 riz Exp $
+$NetBSD: patch-ad,v 1.3 2006/01/18 11:39:54 mjl Exp $
 
---- channels/Makefile.orig     2005-11-29 19:24:39.000000000 +0100
-+++ channels/Makefile  2005-12-25 13:13:12.000000000 +0100
+--- channels/Makefile.orig     2005-12-15 11:52:30.000000000 +0100
++++ channels/Makefile  2006-01-18 12:13:57.000000000 +0100
 @@ -22,12 +22,13 @@
  endif
  
@@ -17,7 +17,7 @@
  endif
  
  ifeq (${OSARCH},Linux)
-@@ -73,40 +74,40 @@
+@@ -73,41 +74,41 @@
    SOLINK+=-lrt
  endif
  
@@ -31,6 +31,7 @@
 -
 -ifneq ($(wildcard misdn/chan_misdn_lib.a),)
 -  CHANNEL_LIBS+=chan_misdn.so
+-  CFLAGS+=-Imisdn 
 -endif
 +# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
 +#   CHANNEL_LIBS+=chan_phone.so
@@ -42,6 +43,7 @@
 +
 +# ifneq ($(wildcard misdn/chan_misdn_lib.a),)
 +#   CHANNEL_LIBS+=chan_misdn.so
++#   CFLAGS+=-Imisdn 
 +# endif
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
@@ -86,7 +88,7 @@
  
  ifndef WITHOUT_ZAPTEL
  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
-@@ -121,10 +122,10 @@
+@@ -122,10 +123,10 @@
  endif
  endif # WITHOUT_ZAPTEL
  
@@ -101,7 +103,7 @@
  
  CFLAGS+=-DCRYPTO
  
-@@ -136,9 +137,9 @@
+@@ -137,9 +138,9 @@
  
  ZAPDIR=/usr/lib
  
@@ -114,7 +116,7 @@
  
  ifndef OPENH323DIR
    OPENH323DIR=$(HOME)/openh323
-@@ -163,13 +164,13 @@
+@@ -164,13 +165,13 @@
    include .depend
  endif