diff options
Diffstat (limited to 'comms/asterisk')
-rw-r--r-- | comms/asterisk/Makefile | 4 | ||||
-rw-r--r-- | comms/asterisk/distinfo | 10 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-ad | 39 |
3 files changed, 29 insertions, 24 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index 00a2d5bca8b..3dbfb79a2a5 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.36 2007/03/22 12:57:26 mjl Exp $ +# $NetBSD: Makefile,v 1.37 2007/04/26 09:43:15 mjl Exp $ -DISTNAME= asterisk-1.2.17 +DISTNAME= asterisk-1.2.18 CATEGORIES= comms net audio MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo index 989827d79ff..33f257bfc72 100644 --- a/comms/asterisk/distinfo +++ b/comms/asterisk/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.24 2007/03/22 12:57:26 mjl Exp $ +$NetBSD: distinfo,v 1.25 2007/04/26 09:43:15 mjl Exp $ -SHA1 (asterisk-1.2.17.tar.gz) = dc9a6c6923dec93e57744579c50a1abd208f7ae2 -RMD160 (asterisk-1.2.17.tar.gz) = f03fe30312c7e693c4804c40941db942ab092976 -Size (asterisk-1.2.17.tar.gz) = 10615354 bytes +SHA1 (asterisk-1.2.18.tar.gz) = b35beb63c54d8877ed559a64ebcaab40306e1c4c +RMD160 (asterisk-1.2.18.tar.gz) = 5e1e6156d7409a01dc23bdcbf0b18ac6e1b6c715 +Size (asterisk-1.2.18.tar.gz) = 10621790 bytes SHA1 (patch-aa) = e457617cb3fbec6a67971258af145cc25f0ca03e SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127 -SHA1 (patch-ad) = fcd0fe88c5a527d7205344db83a8f195951acf45 +SHA1 (patch-ad) = e1da4d244c03db350e1e9b4315e8e2b947f4068c SHA1 (patch-ae) = d3ff3a6e2340c53814d2e7ac97b798e9905a4c57 SHA1 (patch-af) = 393bfbe218e843039fc9f4bc59a42ba1b9e896bd SHA1 (patch-ag) = 7adec0d05371f6ffa56e067770c04c8acec2d922 diff --git a/comms/asterisk/patches/patch-ad b/comms/asterisk/patches/patch-ad index ce4a85df49e..84f18b7d853 100644 --- a/comms/asterisk/patches/patch-ad +++ b/comms/asterisk/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.5 2006/09/16 15:29:35 hira Exp $ +$NetBSD: patch-ad,v 1.6 2007/04/26 09:43:15 mjl Exp $ ---- channels/Makefile.orig 2006-08-17 23:57:19.000000000 +0200 -+++ channels/Makefile 2006-09-13 10:46:23.000000000 +0200 -@@ -22,12 +22,13 @@ +--- channels/Makefile.orig 2007-03-26 12:21:56.000000000 +0200 ++++ channels/Makefile 2007-04-26 11:23:18.000000000 +0200 +@@ -24,12 +24,13 @@ endif ifeq ($(findstring BSD,${OSARCH}),BSD) @@ -17,45 +17,50 @@ $NetBSD: patch-ad,v 1.5 2006/09/16 15:29:35 hira Exp $ endif ifeq (${OSARCH},Linux) -@@ -74,39 +75,39 @@ +@@ -76,43 +77,43 @@ 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 -+# CHANNEL_LIBS+=chan_phone.so ++# CHANNEL_LIBS+=chan_phone.so endif ifneq ($(wildcard h323/libchanh323.a),) - CHANNEL_LIBS+=chan_h323.so -+# CHANNEL_LIBS+=chan_h323.so ++# CHANNEL_LIBS+=chan_h323.so endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),) - CHANNEL_LIBS+=chan_misdn.so - CFLAGS+=-Imisdn -+# CHANNEL_LIBS+=chan_misdn.so -+# CFLAGS+=-Imisdn ++# CHANNEL_LIBS+=chan_misdn.so ++# CFLAGS+=-Imisdn + endif + + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/mISDNdsp.h),) +- CFLAGS+=-DMISDN_1_2 ++# CFLAGS+=-DMISDN_1_2 endif CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) - CHANNEL_LIBS+=chan_alsa.so -+# CHANNEL_LIBS+=chan_alsa.so ++# CHANNEL_LIBS+=chan_alsa.so endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri -+# CFLAGS+=-DZAPATA_PRI -+# ZAPPRI=-lpri ++# CFLAGS+=-DZAPATA_PRI ++# ZAPPRI=-lpri endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 -+# CFLAGS+=-DZAPATA_R2 -+# ZAPR2=-lmfcr2 ++# CFLAGS+=-DZAPATA_R2 ++# ZAPR2=-lmfcr2 endif ALSA_SRC=chan_alsa.c @@ -68,7 +73,7 @@ $NetBSD: patch-ad,v 1.5 2006/09/16 15:29:35 hira Exp $ endif ifndef WITHOUT_ZAPTEL -@@ -122,10 +123,10 @@ +@@ -128,10 +129,10 @@ endif endif # WITHOUT_ZAPTEL @@ -83,7 +88,7 @@ $NetBSD: patch-ad,v 1.5 2006/09/16 15:29:35 hira Exp $ CFLAGS+=-DCRYPTO -@@ -137,9 +138,9 @@ +@@ -143,9 +144,9 @@ ZAPDIR=/usr/lib @@ -96,7 +101,7 @@ $NetBSD: patch-ad,v 1.5 2006/09/16 15:29:35 hira Exp $ ifndef OPENH323DIR OPENH323DIR=$(HOME)/openh323 -@@ -164,13 +165,13 @@ +@@ -171,13 +172,13 @@ include .depend endif |