From 4d21afaace1009cfbcb9d7adfdb0a2af67ace17e Mon Sep 17 00:00:00 2001
From: flo <flo@FreeBSD.org>
Date: Wed, 16 Nov 2011 23:44:54 +0000
Subject: - update to 10.0.0rc1 - asterisk10 uses sqlite3 instead of Berkeley
 DB so sqlite3 is now a mandatory   dependency

Feature safe:	yes
---
 net/asterisk10/Makefile              | 11 +++++------
 net/asterisk10/distinfo              |  4 ++--
 net/asterisk10/files/patch-configure | 24 ++++++++++++------------
 net/asterisk10/pkg-plist             |  5 +++--
 4 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'net')

diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 127363337978..f685c139a22d 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk
-DISTVERSION=	10.0.0-beta2
+DISTVERSION=	10.0.0-rc1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -16,7 +16,8 @@ COMMENT=	An Open Source PBX and telephony toolkit
 
 LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
 		newt.52:${PORTSDIR}/devel/newt \
-		execinfo:${PORTSDIR}/devel/libexecinfo
+		execinfo:${PORTSDIR}/devel/libexecinfo \
+		sqlite3:${PORTSDIR}/databases/sqlite3
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc sparc64
@@ -202,13 +203,11 @@ LIB_DEPENDS+=	iksemel.4:${PORTSDIR}/textproc/iksemel
 
 .if !defined(WITH_SQLITE)
 PLIST_SUB+=	WITH_SQLITE="@comment "
-CONFIGURE_ARGS+=	--without-sqlite \
-			--with-sqlite3=no
+CONFIGURE_ARGS+=	--without-sqlite
 .else
 PLIST_SUB+=	WITH_SQLITE=""
 CONFIGURE_ARGS+=	--with-sqlite
-LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite2 \
-		sqlite3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite2
 .endif
 
 .if !defined(WITH_ILBC)
diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo
index 1ac12201f6c0..b1d0eead8bf5 100644
--- a/net/asterisk10/distinfo
+++ b/net/asterisk10/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-10.0.0-beta2.tar.gz) = 702ef1fe285637e5295899e01b25affd944534c2e90516da1d5567a5151e7db9
-SIZE (asterisk-10.0.0-beta2.tar.gz) = 27733356
+SHA256 (asterisk-10.0.0-rc1.tar.gz) = 35190a0b634b4ccb2db7a92ac62b1b8f4b18d59af8c9a5b7994ed1da4f0921de
+SIZE (asterisk-10.0.0-rc1.tar.gz) = 24723820
diff --git a/net/asterisk10/files/patch-configure b/net/asterisk10/files/patch-configure
index a2c686eea5e6..81c301bef698 100644
--- a/net/asterisk10/files/patch-configure
+++ b/net/asterisk10/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-01-27 18:03:01.000000000 +0100
-+++ configure	2011-05-10 20:10:47.007174008 +0200
-@@ -4681,9 +4681,9 @@
+--- configure.orig	2011-10-07 00:58:40.000000000 +0200
++++ configure	2011-11-12 22:03:44.000000000 +0100
+@@ -4248,9 +4248,9 @@
  astheaderdir='${includedir}/asterisk'
  astlibdir='${libdir}/asterisk'
  astmandir='${mandir}'
@@ -12,7 +12,7 @@
  astkeydir='${astvarlibdir}'
  astspooldir='${localstatedir}/spool/asterisk'
  astlogdir='${localstatedir}/log/asterisk'
-@@ -4706,8 +4706,6 @@
+@@ -4273,8 +4273,6 @@
  case "${host_os}" in
       freebsd*)
       ac_default_prefix=/usr/local
@@ -21,16 +21,16 @@
       ;;
       openbsd*)
       ac_default_prefix=/usr/local
-@@ -17540,6 +17538,8 @@
- 
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -28575,6 +28573,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-  #include <ifaddrs.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
  int
  main ()
-@@ -25290,7 +25290,7 @@
+@@ -47486,7 +47486,7 @@
  
  	fi
  
@@ -38,4 +38,4 @@
 +	PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
  
  	if test "${HAS_OPENH323:-unset}" != "unset"; then
- 	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
+ 	   { $as_echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index fdeed8490636..30e3b0a8c468 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/pkg-plist
@@ -545,14 +545,14 @@ lib/asterisk/modules/cdr_manager.so
 %%WITH_MYSQL%%lib/asterisk/modules/cdr_mysql.so
 %%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so
 %%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so
-%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite3_custom.so
+lib/asterisk/modules/cdr_sqlite3_custom.so
 lib/asterisk/modules/cdr_syslog.so
 lib/asterisk/modules/cel_custom.so
 lib/asterisk/modules/cel_manager.so
 %%WITH_ODBC%%lib/asterisk/modules/cel_odbc.so
 %%WITH_POSTGRES%%lib/asterisk/modules/cel_pgsql.so
 %%WITH_RADIUS%%lib/asterisk/modules/cel_radius.so
-%%WITH_SQLITE%%lib/asterisk/modules/cel_sqlite3_custom.so
+lib/asterisk/modules/cel_sqlite3_custom.so
 %%WITH_FREETDS%%lib/asterisk/modules/cel_tds.so
 lib/asterisk/modules/chan_agent.so
 %%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so
@@ -641,6 +641,7 @@ lib/asterisk/modules/res_smdi.so
 %%WITH_SNMP%%lib/asterisk/modules/res_snmp.so
 lib/asterisk/modules/res_speech.so
 sbin/astcanary
+sbin/astdb2bdb
 sbin/astdb2sqlite3
 sbin/asterisk
 sbin/astgenkey
-- 
cgit