From owner-svn-ports-all@FreeBSD.ORG Wed Dec 12 01:48:48 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 68D66D50; Wed, 12 Dec 2012 01:48:48 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 425098FC08; Wed, 12 Dec 2012 01:48:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC1mmlD036066; Wed, 12 Dec 2012 01:48:48 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBC1mlZr036063; Wed, 12 Dec 2012 01:48:47 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201212120148.qBC1mlZr036063@svn.freebsd.org> From: Florian Smeets Date: Wed, 12 Dec 2012 01:48:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308731 - in head/net/asterisk11: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2012 01:48:48 -0000 Author: flo Date: Wed Dec 12 01:48:47 2012 New Revision: 308731 URL: http://svnweb.freebsd.org/changeset/ports/308731 Log: - update 11.1.0 - use OPTIONS_RADIO instead of OPTIONS_SINGLE Modified: head/net/asterisk11/Makefile head/net/asterisk11/distinfo head/net/asterisk11/files/patch-configure Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Wed Dec 12 01:45:27 2012 (r308730) +++ head/net/asterisk11/Makefile Wed Dec 12 01:48:47 2012 (r308731) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.0.2 +PORTVERSION= 11.1.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -41,12 +41,12 @@ CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* OPTIONS_DEFINE= VORBIS PGSQL MYSQL RADIUS SNMP FREETDS XMPP SQLITE GSM \ - CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP ODBC OOH323 -OPTIONS_DEFAULT= VORBIS ODBC UNIXODBC PGSQL RADIUS SNMP FREETDS \ + CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 +OPTIONS_DEFAULT= VORBIS UNIXODBC PGSQL RADIUS SNMP FREETDS \ XMPP GSM SQLITE CURL -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +OPTIONS_RADIO= ODBC +OPTIONS_RADIO_ODBC= IODBC UNIXODBC OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI Modified: head/net/asterisk11/distinfo ============================================================================== --- head/net/asterisk11/distinfo Wed Dec 12 01:45:27 2012 (r308730) +++ head/net/asterisk11/distinfo Wed Dec 12 01:48:47 2012 (r308731) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.0.2.tar.gz) = d6d759397b38fa0312b07c4c4f1372b6c964df398f681ca42e4457f7f4c5619f -SIZE (asterisk-11.0.2.tar.gz) = 30391411 +SHA256 (asterisk-11.1.0.tar.gz) = bf5eb3615529e18fd51e82a60585a7ad2635e4658d484dea482d15d7bce5874d +SIZE (asterisk-11.1.0.tar.gz) = 30448814 Modified: head/net/asterisk11/files/patch-configure ============================================================================== --- head/net/asterisk11/files/patch-configure Wed Dec 12 01:45:27 2012 (r308730) +++ head/net/asterisk11/files/patch-configure Wed Dec 12 01:48:47 2012 (r308731) @@ -1,6 +1,6 @@ ---- configure.orig 2012-09-20 20:18:47.000000000 +0200 -+++ configure 2012-11-05 14:23:17.172817463 +0100 -@@ -4576,9 +4576,9 @@ +--- configure.orig 2012-10-18 22:02:02.000000000 +0200 ++++ configure 2012-12-12 02:37:25.609625743 +0100 +@@ -4300,9 +4300,9 @@ astlibdir='${libdir}' astmoddir='${libdir}/asterisk/modules' astmandir='${mandir}' @@ -12,7 +12,7 @@ astkeydir='${astvarlibdir}' astspooldir='${localstatedir}/spool/asterisk' astlogdir='${localstatedir}/log/asterisk' -@@ -4601,8 +4601,6 @@ +@@ -4325,8 +4325,6 @@ case "${host_os}" in freebsd*) ac_default_prefix=/usr/local @@ -21,16 +21,16 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -17763,6 +17761,8 @@ - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -29331,6 +29329,8 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -+ #include -+ #include - #include ++#include ++#include + #include int main () -@@ -25968,7 +25968,7 @@ +@@ -48461,7 +48461,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