PR/38351 - Miro Voutilainen -- app_curl does not build

4 files changed, 17 insertions, 7 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 2e14528d02b..1ff4f627713 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/01/22 12:19:49 obache Exp $
+# $NetBSD: Makefile,v 1.61 2009/01/26 13:15:49 jnemeth Exp $
 
 DISTNAME=	asterisk-1.2.31
 CATEGORIES=	comms net audio
@@ -103,5 +103,6 @@ post-patch:
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/asterisk/PLIST.common b/comms/asterisk/PLIST.common
index 70aaa0dae09..1c099c4e974 100644
--- a/comms/asterisk/PLIST.common
+++ b/comms/asterisk/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.14 2008/11/24 09:27:29 jnemeth Exp $
+@comment $NetBSD: PLIST.common,v 1.15 2009/01/26 13:15:49 jnemeth Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -79,6 +79,7 @@ lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
 lib/asterisk/modules/app_chanspy.so
 lib/asterisk/modules/app_controlplayback.so
+lib/asterisk/modules/app_curl.so
 lib/asterisk/modules/app_cut.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index 1f082f1201d..88407e1469d 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2009/01/21 05:35:07 obache Exp $
+$NetBSD: distinfo,v 1.38 2009/01/26 13:15:49 jnemeth Exp $
 
 SHA1 (asterisk-1.2.31.tar.gz) = a7550ead37fb095918fdc8a98f9ef449017ea67f
 RMD160 (asterisk-1.2.31.tar.gz) = 35de82df02ea725c85a7b157677570989764888a
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 0070d874445d5bad7eb5a4cbd023a8f698e1f938
 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
 SHA1 (patch-ad) = 93a40eebdd2049cce2a976e54fcc3ea6a0548ebb
-SHA1 (patch-ae) = d3ff3a6e2340c53814d2e7ac97b798e9905a4c57
+SHA1 (patch-ae) = a3b9dbf8017286dcc9327d65fb9c47c7b7ac5b79
 SHA1 (patch-af) = 393bfbe218e843039fc9f4bc59a42ba1b9e896bd
 SHA1 (patch-ag) = 7adec0d05371f6ffa56e067770c04c8acec2d922
 SHA1 (patch-ai) = 81c0ff8f8a273562a64ab7cfb301d578e18808e3
diff --git a/comms/asterisk/patches/patch-ae b/comms/asterisk/patches/patch-ae
index 14737b35ea5..96b1f9ebe99 100644
--- a/comms/asterisk/patches/patch-ae
+++ b/comms/asterisk/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2006/04/13 08:47:06 adam Exp $
+$NetBSD: patch-ae,v 1.4 2009/01/26 13:15:49 jnemeth Exp $
 
---- apps/Makefile.orig	2006-02-09 03:31:21.000000000 +0100
+--- apps/Makefile.orig	2006-04-30 06:38:22.000000000 -0700
 +++ apps/Makefile
-@@ -45,15 +45,17 @@ APPS=app_dial.so app_playback.so app_voi
+@@ -45,21 +45,23 @@ APPS=app_dial.so app_playback.so app_voi
  #APPS+=app_rpt.so
  
  ifndef WITHOUT_ZAPTEL
@@ -22,6 +22,14 @@ $NetBSD: patch-ae,v 1.3 2006/04/13 08:47:06 adam Exp $
  ifeq ($(findstring BSD,${OSARCH}),BSD)
  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
  endif
+ 
+-CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
+-ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
++CURLLIBS=$(shell $(PREFIX)/bin/curl-config --libs)
++ifneq ($(shell if [ `$(PREFIX)/bin/curl-config --vernum` -ge 70907 ]; then echo "OK" ; fi),)
+   ifneq (${CURLLIBS},)
+     APPS+=app_curl.so
+   endif 
 @@ -103,10 +105,10 @@ app_curl.so: app_curl.o
  	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)