Date: Tue, 29 Jul 2014 22:52:50 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363407 - in head/net: asterisk asterisk/files asterisk11 asterisk11/files Message-ID: <201407292252.s6TMqoJN015326@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Jul 29 22:52:49 2014 New Revision: 363407 URL: http://svnweb.freebsd.org/changeset/ports/363407 QAT: https://qat.redports.org/buildarchive/r363407/ Log: - Update net/asterisk to 1.8.29.0 - Update net/asterisk11 to 11.11.0 - Take maintainership [1] - Add missing ODBC option to OPTIONS_DEFINE [2] - Convert ports to using option helpers - Fix LUA option PR: 192226 [2] Submitted by: m.tsatsenko at gmail.com Approved by: flo (previous maintainer) [1] Modified: head/net/asterisk/Makefile head/net/asterisk/distinfo head/net/asterisk/files/patch-configure head/net/asterisk/pkg-plist head/net/asterisk11/Makefile head/net/asterisk11/distinfo head/net/asterisk11/files/patch-configure head/net/asterisk11/pkg-plist Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Tue Jul 29 22:47:44 2014 (r363406) +++ head/net/asterisk/Makefile Tue Jul 29 22:52:49 2014 (r363407) @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.28.2 -PORTREVISION= 3 +PORTVERSION= 1.8.29.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ PKGNAMESUFFIX= 18 -MAINTAINER= flo@FreeBSD.org +MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LICENSE= GPLv2 @@ -23,7 +22,6 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mp ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gsm=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GCC= yes @@ -47,7 +45,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-10* -OPTIONS_DEFINE= VORBIS PGSQL MYSQL RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \ +OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \ SQLITE CURL @@ -66,6 +64,57 @@ SRTP_DESC?= SecureRTP support OOH323_DESC?= ooh323 support DAHDI_DESC?= DAHDI support +OPTIONS_SUB= yes +H323_CONFIGURE_WITH= h323 +H323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ + libh323_r.so:${PORTSDIR}/net/openh323 +DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 +DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 +DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ + ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi +DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \ + libopenr2.so:${PORTSDIR}/misc/openr2 +ODBC_CONFIGURE_WITH= unixodbc +ODBC_CONFIGURE_ON= --with-ltdl +ODBC_USE= AUTOTOOLS=libltdl +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC +FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} +FREETDS_CONFIGURE_OFF= --without-tds +FREETDS_LIB_DEPENDS= libtds.so:${PORTSDIR}/databases/freetds +PGSQL_CONFIGURE_WITH= postgres +PGSQL_USE= PGSQL=yes +MYSQL_CONFIGURE_WITH= mysqlclient +MYSQL_USE= MYSQL=yes +VORBIS_CONFIGURE_WITH= ogg +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +RADIUS_CONFIGURE_WITH= radius +RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient +SNMP_CONFIGURE_WITH= netsnmp +SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp +JABBER_CONFIGURE_WITH= iksemel +JABBER_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel +SQLITE_CONFIGURE_WITH= sqlite +SQLITE_CONFIGURE_OFF= --with-sqlite3=no +SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 +GSM_CONFIGURE_WITH= gsm +GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm +CURL_CONFIGURE_ON= --with-libcurl +CURL_CONFIGURE_OFF= --with-libcurl=no +CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +SPANDSP_CONFIGURE_WITH= spandsp +SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp-devel +EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 +EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 +SRTP_CONFIGURE_WITH= srtp +SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp +LUA_CONFIGURE_WITH= lua +LUA_USES= lua:51 +LUA_CFLAGS= -I${LUA_INCDIR} +LUA_LDFLAGS= -L${LUA_LIBDIR} +LDAP_CONFIGURE_WITH= ldap +LDAP_USE= OPENLDAP=yes + PORTSCOUT= limit:^1\.8\. ASTERISK_USER?= asterisk @@ -87,185 +136,6 @@ PLIST_SUB+= ASTERISK_USER=${ASTERISK_USE PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} PLIST_SUB+= VARDIR=${VARDIR} -.if ${PORT_OPTIONS:MH323} -PLIST_SUB+= WITH_H323="" -CONFIGURE_ARGS+= --with-h323=${LOCALBASE} -LIB_DEPENDS+= libpt_r.so:${PORTSDIR}/devel/pwlib \ - libh323_r.so:${PORTSDIR}/net/openh323 -.else -PLIST_SUB+= WITH_H323="@comment " -CONFIGURE_ARGS+= --without-h323 -.endif - -.if ${PORT_OPTIONS:MDAHDI} -PLIST_SUB+= WITH_DAHDI="" -CONFIGURE_ARGS+= --with-dahdi --with-openr2 -BUILD_DEPENDS+= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi -LIB_DEPENDS+= libpri.so:${PORTSDIR}/misc/libpri \ - libopenr2.so:${PORTSDIR}/misc/openr2 -.else -PLIST_SUB+= WITH_DAHDI="@comment " -CONFIGURE_ARGS+= --without-dahdi --without-openr2 -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if empty(PORT_OPTIONS:MODBC) -CONFIGURE_ARGS+= --without-unixodbc -PLIST_SUB+= WITH_ODBC="@comment " -.else -PLIST_SUB+= WITH_ODBC="" -USE_AUTOTOOLS= libltdl -CONFIGURE_ARGS+= --with-unixodbc --with-ltdl -LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC -.endif - -.if ${PORT_OPTIONS:MFREETDS} -PLIST_SUB+= WITH_FREETDS="" -CONFIGURE_ARGS+= --with-tds=${LOCALBASE} -LIB_DEPENDS+= libtds.so:${PORTSDIR}/databases/freetds -.else -PLIST_SUB+= WITH_FREETDS="@comment " -CONFIGURE_ARGS+= --without-tds -.endif - -.if ${PORT_OPTIONS:MPGSQL} -PLIST_SUB+= WITH_PGSQL="" -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-postgres -.else -PLIST_SUB+= WITH_PGSQL="@comment " -CONFIGURE_ARGS+= --without-postgres -.endif - -.if ${PORT_OPTIONS:MMYSQL} -PLIST_SUB+= WITH_MYSQL="" -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysqlclient -.else -PLIST_SUB+= WITH_MYSQL="@comment " -CONFIGURE_ARGS+= --without-mysqlclient -.endif - -.if ${PORT_OPTIONS:MVORBIS} -PLIST_SUB+= WITH_VORBIS="" -CONFIGURE_ARGS+= --with-ogg -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis -.else -PLIST_SUB+= WITH_VORBIS="@comment " -CONFIGURE_ARGS+= --without-ogg -.endif - -.if ${PORT_OPTIONS:MRADIUS} -PLIST_SUB+= WITH_RADIUS="" -CONFIGURE_ARGS+= --with-radius -LIB_DEPENDS+= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient -.else -PLIST_SUB+= WITH_RADIUS="@comment " -CONFIGURE_ARGS+= --without-radius -.endif - -.if ${PORT_OPTIONS:MSNMP} -PLIST_SUB+= WITH_SNMP="" -CONFIGURE_ARGS+= --with-netsnmp -LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp -.else -PLIST_SUB+= WITH_SNMP="@comment " -CONFIGURE_ARGS+= --without-netsnmp -.endif - -.if ${PORT_OPTIONS:MJABBER} -PLIST_SUB+= WITH_JABBER="" -CONFIGURE_ARGS+= --with-iksemel -LIB_DEPENDS+= libiksemel.so:${PORTSDIR}/textproc/iksemel -.else -PLIST_SUB+= WITH_JABBER="@comment " -CONFIGURE_ARGS+= --without-iksemel -.endif - -.if ${PORT_OPTIONS:MSQLITE} -PLIST_SUB+= WITH_SQLITE="" -CONFIGURE_ARGS+= --with-sqlite -LIB_DEPENDS+= libsqlite.so:${PORTSDIR}/databases/sqlite2 \ - libsqlite3.so:${PORTSDIR}/databases/sqlite3 -.else -PLIST_SUB+= WITH_SQLITE="@comment " -CONFIGURE_ARGS+= --without-sqlite \ - --with-sqlite3=no -.endif - -.if ${PORT_OPTIONS:MGSM} -PLIST_SUB+= WITH_GSM="" -CONFIGURE_ARGS+= --with-gsm -LIB_DEPENDS+= libgsm.so:${PORTSDIR}/audio/gsm -.else -PLIST_SUB+= WITH_GSM="@comment " -CONFIGURE_ARGS+= --without-gsm -.endif - -.if ${PORT_OPTIONS:MCURL} -PLIST_SUB+= WITH_CURL="" -CONFIGURE_ARGS+= --with-libcurl -LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl -.else -PLIST_SUB+= WITH_CURL="@comment " -CONFIGURE_ARGS+= --with-libcurl=no -.endif - -.if ${PORT_OPTIONS:MSPANDSP} -PLIST_SUB+= WITH_SPANDSP="" -CONFIGURE_ARGS+= --with-spandsp -LIB_DEPENDS+= libspandsp.so:${PORTSDIR}/comms/spandsp-devel -.else -PLIST_SUB+= WITH_SPANDSP="@comment " -CONFIGURE_ARGS+= --without-spandsp -.endif - -.if ${PORT_OPTIONS:MEXCHANGE} -LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29 -PLIST_SUB+= WITH_EXCHANGE="" -.else -CONFIGURE_ARGS+= --without-neon --without-neon29 -PLIST_SUB+= WITH_EXCHANGE="@comment " -.endif - -.if ${PORT_OPTIONS:MSRTP} -PLIST_SUB+= WITH_SRTP="" -BUILD_DEPENDS+= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp -CONFIGURE_ARGS+= --with-srtp -.else -PLIST_SUB+= WITH_SRTP="@comment " -CONFIGURE_ARGS+= --without-srtp -.endif - -.if ${PORT_OPTIONS:MLUA} -CONFIGURE_ARGS+= --with-lua -CFLAGS+= -I${LUA_INCDIR} -USES+= lua:51 -LDFLAGS+= -L${LUA_LIBDIR} -PLIST_SUB+= WITH_LUA="" -.else -CONFIGURE_ARGS+= --without-lua -PLIST_SUB+= WITH_LUA="@comment " -.endif - -.if ${PORT_OPTIONS:MLDAP} -CONFIGURE_ARGS+= --with-ldap -USE_OPENLDAP= yes -PLIST_SUB+= WITH_LDAP="" -.else -CONFIGURE_ARGS+= --without-ldap -PLIST_SUB+= WITH_LDAP="@comment " -.endif - -.if ${PORT_OPTIONS:MOOH323} -PLIST_SUB+= WITH_OOH323="" -.else -PLIST_SUB+= WITH_OOH323="@comment " -.endif - post-extract: ${FIND} ${WRKSRC} -name '*.d' -delete Modified: head/net/asterisk/distinfo ============================================================================== --- head/net/asterisk/distinfo Tue Jul 29 22:47:44 2014 (r363406) +++ head/net/asterisk/distinfo Tue Jul 29 22:52:49 2014 (r363407) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.28.2.tar.gz) = 7b3d84a3403fce590377808eaa4b08b6320666ca0e37eba0ad578b66211b13c8 -SIZE (asterisk-1.8.28.2.tar.gz) = 29521616 +SHA256 (asterisk-1.8.29.0.tar.gz) = ab172919adfa94fcf211ea5e9b587aff61d0f507ff958219a9ab777d5cf8ebea +SIZE (asterisk-1.8.29.0.tar.gz) = 29538404 Modified: head/net/asterisk/files/patch-configure ============================================================================== --- head/net/asterisk/files/patch-configure Tue Jul 29 22:47:44 2014 (r363406) +++ head/net/asterisk/files/patch-configure Tue Jul 29 22:52:49 2014 (r363407) @@ -1,6 +1,6 @@ ---- configure.orig 2013-01-30 18:44:11.000000000 +0100 -+++ configure 2013-04-20 10:54:05.213563665 +0200 -@@ -4680,9 +4680,9 @@ +--- configure.orig 2014-06-21 01:12:25.000000000 +0200 ++++ configure 2014-07-30 00:01:20.820891824 +0200 +@@ -4720,9 +4720,9 @@ astheaderdir='${includedir}/asterisk' astlibdir='${libdir}/asterisk' astmandir='${mandir}' @@ -12,7 +12,7 @@ astkeydir='${astvarlibdir}' astspooldir='${localstatedir}/spool/asterisk' astlogdir='${localstatedir}/log/asterisk' -@@ -4705,8 +4705,6 @@ +@@ -4745,8 +4745,6 @@ case "${host_os}" in freebsd*) ac_default_prefix=/usr/local @@ -21,7 +21,7 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -18262,6 +18260,8 @@ +@@ -18493,6 +18491,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30,7 +30,7 @@ #include <ifaddrs.h> int main () -@@ -25941,7 +25941,7 @@ +@@ -26268,7 +26268,7 @@ fi @@ -39,3 +39,81 @@ if test "${HAS_OPENH323:-unset}" != "unset"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 +@@ -26366,13 +26366,13 @@ + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.2" >&5 +-$as_echo_n "checking for ${pbxfuncname} in -llua5.2... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.2" >&5 ++$as_echo_n "checking for ${pbxfuncname} in -llua-5.2... " >&6; } + if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua5.2 ${pbxlibdir} -lm $LIBS" ++LIBS="-llua-5.2 ${pbxlibdir} -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -26414,18 +26414,18 @@ + + # now check for the header. + if test "${AST_LUA_FOUND}" = "yes"; then +- LUA_LIB="${pbxlibdir} -llua5.2 -lm" ++ LUA_LIB="${pbxlibdir} -llua-5.2 -lm" + # if --with-LUA=DIR has been specified, use it. + if test "x${LUA_DIR}" != "x"; then + LUA_INCLUDE="-I${LUA_DIR}/include" + fi + LUA_INCLUDE="${LUA_INCLUDE} " +- if test "xlua5.2/lua.h" = "x" ; then # no header, assume found ++ if test "xlua52/lua.h" = "x" ; then # no header, assume found + LUA_HEADER_FOUND="1" + else # check for the header + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" +- ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "lua52/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default" + if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then : + LUA_HEADER_FOUND=1 + else +@@ -26478,13 +26478,13 @@ + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5 +-$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.1" >&5 ++$as_echo_n "checking for ${pbxfuncname} in -llua-5.1... " >&6; } + if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS" ++LIBS="-llua-5.1 ${pbxlibdir} -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -26526,18 +26526,18 @@ + + # now check for the header. + if test "${AST_LUA_FOUND}" = "yes"; then +- LUA_LIB="${pbxlibdir} -llua5.1 -lm" ++ LUA_LIB="${pbxlibdir} -llua-5.1 -lm" + # if --with-LUA=DIR has been specified, use it. + if test "x${LUA_DIR}" != "x"; then + LUA_INCLUDE="-I${LUA_DIR}/include" + fi + LUA_INCLUDE="${LUA_INCLUDE} " +- if test "xlua5.1/lua.h" = "x" ; then # no header, assume found ++ if test "xlua51/lua.h" = "x" ; then # no header, assume found + LUA_HEADER_FOUND="1" + else # check for the header + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" +- ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "lua51/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" + if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then : + LUA_HEADER_FOUND=1 + else Modified: head/net/asterisk/pkg-plist ============================================================================== --- head/net/asterisk/pkg-plist Tue Jul 29 22:47:44 2014 (r363406) +++ head/net/asterisk/pkg-plist Tue Jul 29 22:52:49 2014 (r363407) @@ -424,7 +424,7 @@ include/asterisk/xmldoc.h lib/asterisk/modules/app_celgenuserevent.so lib/asterisk/modules/app_confbridge.so lib/asterisk/modules/app_minivm.so -%%WITH_MYSQL%%lib/asterisk/modules/app_mysql.so +%%MYSQL%%lib/asterisk/modules/app_mysql.so lib/asterisk/modules/app_originate.so lib/asterisk/modules/app_playtones.so lib/asterisk/modules/app_readexten.so @@ -433,8 +433,8 @@ lib/asterisk/modules/bridge_builtin_feat lib/asterisk/modules/bridge_multiplexed.so lib/asterisk/modules/bridge_simple.so lib/asterisk/modules/bridge_softmix.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so -%%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so +%%ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so +%%JABBER%%lib/asterisk/modules/chan_jingle.so lib/asterisk/modules/chan_bridge.so lib/asterisk/modules/chan_unistim.so lib/asterisk/modules/codec_g722.so @@ -462,15 +462,15 @@ lib/asterisk/modules/func_vmcount.so lib/asterisk/modules/func_volume.so lib/asterisk/modules/res_ael_share.so lib/asterisk/modules/res_clialiases.so -%%WITH_CURL%%lib/asterisk/modules/res_curl.so -%%WITH_CURL%%lib/asterisk/modules/res_config_curl.so -%%WITH_LDAP%%lib/asterisk/modules/res_config_ldap.so -%%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so +%%CURL%%lib/asterisk/modules/res_curl.so +%%CURL%%lib/asterisk/modules/res_config_curl.so +%%LDAP%%lib/asterisk/modules/res_config_ldap.so +%%SQLITE%%lib/asterisk/modules/res_config_sqlite.so lib/asterisk/modules/res_limit.so lib/asterisk/modules/res_phoneprov.so lib/asterisk/modules/res_realtime.so -%%WITH_SRTP%%lib/asterisk/modules/res_srtp.so -%%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so +%%SRTP%%lib/asterisk/modules/res_srtp.so +%%DAHDI%%lib/asterisk/modules/res_timing_dahdi.so lib/asterisk/modules/res_timing_pthread.so lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so @@ -533,26 +533,26 @@ lib/asterisk/modules/app_zapateller.so lib/asterisk/modules/cdr_csv.so lib/asterisk/modules/cdr_custom.so lib/asterisk/modules/cdr_manager.so -%%WITH_MYSQL%%lib/asterisk/modules/cdr_mysql.so -%%WITH_PGSQL%%lib/asterisk/modules/cdr_pgsql.so -%%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so -%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite.so -%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite3_custom.so +%%MYSQL%%lib/asterisk/modules/cdr_mysql.so +%%PGSQL%%lib/asterisk/modules/cdr_pgsql.so +%%RADIUS%%lib/asterisk/modules/cdr_radius.so +%%SQLITE%%lib/asterisk/modules/cdr_sqlite.so +%%SQLITE%%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_PGSQL%%lib/asterisk/modules/cel_pgsql.so -%%WITH_RADIUS%%lib/asterisk/modules/cel_radius.so -%%WITH_SQLITE%%lib/asterisk/modules/cel_sqlite3_custom.so -%%WITH_FREETDS%%lib/asterisk/modules/cel_tds.so +%%ODBC%%lib/asterisk/modules/cel_odbc.so +%%PGSQL%%lib/asterisk/modules/cel_pgsql.so +%%RADIUS%%lib/asterisk/modules/cel_radius.so +%%SQLITE%%lib/asterisk/modules/cel_sqlite3_custom.so +%%FREETDS%%lib/asterisk/modules/cel_tds.so lib/asterisk/modules/chan_agent.so -%%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so +%%JABBER%%lib/asterisk/modules/chan_gtalk.so lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so @comment lib/asterisk/modules/chan_mgcp.so lib/asterisk/modules/chan_multicast_rtp.so -%%WITH_OOH323%%lib/asterisk/modules/chan_ooh323.so +%%OOH323%%lib/asterisk/modules/chan_ooh323.so lib/asterisk/modules/chan_oss.so lib/asterisk/modules/chan_sip.so lib/asterisk/modules/chan_skinny.so @@ -560,7 +560,7 @@ lib/asterisk/modules/codec_a_mu.so lib/asterisk/modules/codec_adpcm.so lib/asterisk/modules/codec_alaw.so lib/asterisk/modules/codec_g726.so -%%WITH_GSM%%lib/asterisk/modules/codec_gsm.so +%%GSM%%lib/asterisk/modules/codec_gsm.so lib/asterisk/modules/codec_ilbc.so lib/asterisk/modules/codec_lpc10.so lib/asterisk/modules/codec_speex.so @@ -573,7 +573,7 @@ lib/asterisk/modules/format_h263.so lib/asterisk/modules/format_h264.so lib/asterisk/modules/format_ilbc.so lib/asterisk/modules/format_jpeg.so -%%WITH_VORBIS%%lib/asterisk/modules/format_ogg_vorbis.so +%%VORBIS%%lib/asterisk/modules/format_ogg_vorbis.so lib/asterisk/modules/format_pcm.so lib/asterisk/modules/format_sln.so lib/asterisk/modules/format_vox.so @@ -584,7 +584,7 @@ lib/asterisk/modules/func_callcompletion lib/asterisk/modules/func_callerid.so lib/asterisk/modules/func_cdr.so lib/asterisk/modules/func_channel.so -%%WITH_CURL%%lib/asterisk/modules/func_curl.so +%%CURL%%lib/asterisk/modules/func_curl.so lib/asterisk/modules/func_cut.so lib/asterisk/modules/func_db.so lib/asterisk/modules/func_enum.so @@ -595,7 +595,7 @@ lib/asterisk/modules/func_groupcount.so lib/asterisk/modules/func_logic.so lib/asterisk/modules/func_math.so lib/asterisk/modules/func_md5.so -%%WITH_ODBC%%lib/asterisk/modules/func_odbc.so +%%ODBC%%lib/asterisk/modules/func_odbc.so lib/asterisk/modules/func_pitchshift.so lib/asterisk/modules/func_rand.so lib/asterisk/modules/func_realtime.so @@ -613,15 +613,15 @@ lib/asterisk/modules/pbx_spool.so lib/asterisk/modules/res_adsi.so lib/asterisk/modules/res_agi.so lib/asterisk/modules/res_calendar.so -%%WITH_EXCHANGE%%lib/asterisk/modules/res_calendar_ews.so +%%EXCHANGE%%lib/asterisk/modules/res_calendar_ews.so lib/asterisk/modules/res_clioriginate.so -%%WITH_MYSQL%%lib/asterisk/modules/res_config_mysql.so -%%WITH_PGSQL%%lib/asterisk/modules/res_config_pgsql.so +%%MYSQL%%lib/asterisk/modules/res_config_mysql.so +%%PGSQL%%lib/asterisk/modules/res_config_pgsql.so lib/asterisk/modules/res_convert.so lib/asterisk/modules/res_crypto.so lib/asterisk/modules/res_fax.so -%%WITH_SPANDSP%%lib/asterisk/modules/res_fax_spandsp.so -%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so +%%SPANDSP%%lib/asterisk/modules/res_fax_spandsp.so +%%JABBER%%lib/asterisk/modules/res_jabber.so lib/asterisk/modules/res_monitor.so lib/asterisk/modules/res_musiconhold.so lib/asterisk/modules/res_mutestream.so @@ -630,7 +630,7 @@ lib/asterisk/modules/res_rtp_multicast.s lib/asterisk/modules/res_security_log.so lib/asterisk/modules/res_stun_monitor.so lib/asterisk/modules/res_smdi.so -%%WITH_SNMP%%lib/asterisk/modules/res_snmp.so +%%SNMP%%lib/asterisk/modules/res_snmp.so lib/asterisk/modules/res_speech.so man/man8/asterisk.8.gz man/man8/astgenkey.8.gz @@ -1177,19 +1177,19 @@ share/asterisk/static-http/astman.js share/asterisk/static-http/core-en_US.xml share/asterisk/static-http/prototype.js share/asterisk/static-http/mantest.html -%%WITH_DAHDI%%lib/asterisk/modules/app_flash.so -%%WITH_DAHDI%%lib/asterisk/modules/app_meetme.so -%%WITH_DAHDI%%lib/asterisk/modules/app_page.so -%%WITH_DAHDI%%lib/asterisk/modules/app_dahdibarge.so -%%WITH_DAHDI%%lib/asterisk/modules/app_dahdiras.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so -%%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so -%%WITH_H323%%lib/asterisk/modules/chan_h323.so -%%WITH_DAHDI%%lib/asterisk/modules/chan_dahdi.so -%%WITH_DAHDI%%lib/asterisk/modules/codec_dahdi.so -%%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so -%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so -%%WITH_LUA%%lib/asterisk/modules/pbx_lua.so +%%DAHDI%%lib/asterisk/modules/app_flash.so +%%DAHDI%%lib/asterisk/modules/app_meetme.so +%%DAHDI%%lib/asterisk/modules/app_page.so +%%DAHDI%%lib/asterisk/modules/app_dahdibarge.so +%%DAHDI%%lib/asterisk/modules/app_dahdiras.so +%%ODBC%%lib/asterisk/modules/cdr_odbc.so +%%FREETDS%%lib/asterisk/modules/cdr_tds.so +%%H323%%lib/asterisk/modules/chan_h323.so +%%DAHDI%%lib/asterisk/modules/chan_dahdi.so +%%DAHDI%%lib/asterisk/modules/codec_dahdi.so +%%ODBC%%lib/asterisk/modules/res_config_odbc.so +%%ODBC%%lib/asterisk/modules/res_odbc.so +%%LUA%%lib/asterisk/modules/pbx_lua.so %%DOCSDIR%%/images/asterisk-intro.jpg %%DOCSDIR%%/images/kpad2.jpg @dirrm %%DOCSDIR%%/images Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Tue Jul 29 22:47:44 2014 (r363406) +++ head/net/asterisk11/Makefile Tue Jul 29 22:52:49 2014 (r363407) @@ -1,14 +1,13 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.10.2 -PORTREVISION= 3 +PORTVERSION= 11.11.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ PKGNAMESUFFIX= 11 -MAINTAINER= flo@FreeBSD.org +MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \ @@ -21,7 +20,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mp ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gsm=${LOCALBASE} --with-uuid=${LOCALBASE} +CONFIGURE_ARGS= --with-uuid=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 CFLAGS+= -I${LOCALBASE}/include @@ -42,7 +41,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA 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 \ +OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ XMPP GSM SQLITE CURL @@ -62,6 +61,54 @@ OOH323_DESC?= ooh323 support DAHDI_DESC?= DAHDI support XMPP_DESC?= XMPP/GTALK support +OPTIONS_SUB= yes +OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ + libh323_r.so:${PORTSDIR}/net/openh323 +DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 +DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 +DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ + ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi +DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \ + libopenr2.so:${PORTSDIR}/misc/openr2 +ODBC_CONFIGURE_WITH= unixodbc +ODBC_CONFIGURE_ON= --with-ltdl +ODBC_USE= AUTOTOOLS=libltdl +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC +FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} +FREETDS_CONFIGURE_OFF= --without-tds +FREETDS_LIB_DEPENDS= libtds.so:${PORTSDIR}/databases/freetds +PGSQL_CONFIGURE_WITH= postgres +PGSQL_USE= PGSQL=yes +MYSQL_CONFIGURE_WITH= mysqlclient +MYSQL_USE= MYSQL=yes +VORBIS_CONFIGURE_WITH= ogg +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +RADIUS_CONFIGURE_WITH= radius +RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient +SNMP_CONFIGURE_WITH= netsnmp +SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp +XMPP_CONFIGURE_WITH= iksemel +XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel +SQLITE_CONFIGURE_WITH= sqlite +SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 +GSM_CONFIGURE_WITH= gsm +GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm +CURL_CONFIGURE_ON= --with-libcurl +CURL_CONFIGURE_OFF= --with-libcurl=no +CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +SPANDSP_CONFIGURE_WITH= spandsp +SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp-devel +EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 +EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 +SRTP_CONFIGURE_WITH= srtp +SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp +LUA_CONFIGURE_WITH= lua +LUA_USES= lua:51 +LUA_CFLAGS= -I${LUA_INCDIR} +LUA_LDFLAGS= -L${LUA_LIBDIR} +LDAP_CONFIGURE_WITH= ldap +LDAP_USE= OPENLDAP=yes + ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk @@ -81,175 +128,6 @@ PLIST_SUB+= ASTERISK_USER=${ASTERISK_USE PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} PLIST_SUB+= VARDIR=${VARDIR} -.if ${PORT_OPTIONS:MOOH323} -PLIST_SUB+= WITH_OOH323="" -LIB_DEPENDS+= libpt_r.so:${PORTSDIR}/devel/pwlib \ - libh323_r.so:${PORTSDIR}/net/openh323 -.else -PLIST_SUB+= WITH_OOH323="@comment " -.endif - -.if ${PORT_OPTIONS:MDAHDI} -PLIST_SUB+= WITH_DAHDI="" -CONFIGURE_ARGS+= --with-dahdi --with-openr2 -BUILD_DEPENDS+= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi -LIB_DEPENDS+= libpri.so:${PORTSDIR}/misc/libpri\ - libopenr2.so:${PORTSDIR}/misc/openr2 -.else -PLIST_SUB+= WITH_DAHDI="@comment " -CONFIGURE_ARGS+= --without-dahdi --without-openr2 -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if empty(PORT_OPTIONS:MODBC) -CONFIGURE_ARGS+= --without-unixodbc -PLIST_SUB+= WITH_ODBC="@comment " -.else -PLIST_SUB+= WITH_ODBC="" -USE_AUTOTOOLS= libltdl -CONFIGURE_ARGS+= --with-unixodbc --with-ltdl -LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC -.endif - -.if ${PORT_OPTIONS:MFREETDS} -PLIST_SUB+= WITH_FREETDS="" -CONFIGURE_ARGS+= --with-tds=${LOCALBASE} -LIB_DEPENDS+= libtds.so:${PORTSDIR}/databases/freetds -.else -PLIST_SUB+= WITH_FREETDS="@comment " -CONFIGURE_ARGS+= --without-tds -.endif - -.if ${PORT_OPTIONS:MPGSQL} -PLIST_SUB+= WITH_PGSQL="" -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-postgres -.else -PLIST_SUB+= WITH_PGSQL="@comment " -CONFIGURE_ARGS+= --without-postgres -.endif - -.if ${PORT_OPTIONS:MMYSQL} -PLIST_SUB+= WITH_MYSQL="" -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysqlclient -.else -PLIST_SUB+= WITH_MYSQL="@comment " -CONFIGURE_ARGS+= --without-mysqlclient -.endif - -.if ${PORT_OPTIONS:MVORBIS} -PLIST_SUB+= WITH_VORBIS="" -CONFIGURE_ARGS+= --with-ogg -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis -.else -PLIST_SUB+= WITH_VORBIS="@comment " -CONFIGURE_ARGS+= --without-ogg -.endif - -.if ${PORT_OPTIONS:MRADIUS} -PLIST_SUB+= WITH_RADIUS="" -CONFIGURE_ARGS+= --with-radius -LIB_DEPENDS+= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient -.else -PLIST_SUB+= WITH_RADIUS="@comment " -CONFIGURE_ARGS+= --without-radius -.endif - -.if ${PORT_OPTIONS:MSNMP} -PLIST_SUB+= WITH_SNMP="" -CONFIGURE_ARGS+= --with-netsnmp -LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp -.else -PLIST_SUB+= WITH_SNMP="@comment " -CONFIGURE_ARGS+= --without-netsnmp -.endif - -.if ${PORT_OPTIONS:MXMPP} -PLIST_SUB+= WITH_XMPP="" -CONFIGURE_ARGS+= --with-iksemel -LIB_DEPENDS+= libiksemel.so:${PORTSDIR}/textproc/iksemel -.else -PLIST_SUB+= WITH_XMPP="@comment " -CONFIGURE_ARGS+= --without-iksemel -.endif - -.if ${PORT_OPTIONS:MSQLITE} -PLIST_SUB+= WITH_SQLITE="" -CONFIGURE_ARGS+= --with-sqlite -LIB_DEPENDS+= libsqlite.so:${PORTSDIR}/databases/sqlite2 -.else -PLIST_SUB+= WITH_SQLITE="@comment " -CONFIGURE_ARGS+= --without-sqlite -.endif - -.if ${PORT_OPTIONS:MGSM} -PLIST_SUB+= WITH_GSM="" -CONFIGURE_ARGS+= --with-gsm -LIB_DEPENDS+= libgsm.so:${PORTSDIR}/audio/gsm -.else -PLIST_SUB+= WITH_GSM="@comment " -CONFIGURE_ARGS+= --without-gsm -.endif - -.if ${PORT_OPTIONS:MCURL} -PLIST_SUB+= WITH_CURL="" -CONFIGURE_ARGS+= --with-libcurl -LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl -.else -PLIST_SUB+= WITH_CURL="@comment " -CONFIGURE_ARGS+= --with-libcurl=no -.endif - -.if ${PORT_OPTIONS:MSPANDSP} -PLIST_SUB+= WITH_SPANDSP="" -CONFIGURE_ARGS+= --with-spandsp -LIB_DEPENDS+= libspandsp.so:${PORTSDIR}/comms/spandsp-devel -.else -PLIST_SUB+= WITH_SPANDSP="@comment " -CONFIGURE_ARGS+= --without-spandsp -.endif - -.if ${PORT_OPTIONS:MEXCHANGE} -LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29 -PLIST_SUB+= WITH_EXCHANGE="" -.else -CONFIGURE_ARGS+= --without-neon --without-neon29 -PLIST_SUB+= WITH_EXCHANGE="@comment " -.endif - -.if ${PORT_OPTIONS:MSRTP} -PLIST_SUB+= WITH_SRTP="" -BUILD_DEPENDS+= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp -CONFIGURE_ARGS+= --with-srtp -.else -PLIST_SUB+= WITH_SRTP="@comment " -CONFIGURE_ARGS+= --without-srtp -.endif - -.if ${PORT_OPTIONS:MLUA} -CONFIGURE_ARGS+= --with-lua -CFLAGS+= -I${LUA_INCDIR} -USES+= lua:51 -LDFLAGS+= -L${LUA_LIBDIR} -PLIST_SUB+= WITH_LUA="" -.else -CONFIGURE_ARGS+= --without-lua -PLIST_SUB+= WITH_LUA="@comment " -.endif - -.if ${PORT_OPTIONS:MLDAP} -CONFIGURE_ARGS+= --with-ldap -USE_OPENLDAP= yes -PLIST_SUB+= WITH_LDAP="" -.else -CONFIGURE_ARGS+= --without-ldap -PLIST_SUB+= WITH_LDAP="@comment " -.endif - post-extract: ${FIND} ${WRKSRC} -name '*.d' -delete Modified: head/net/asterisk11/distinfo ============================================================================== --- head/net/asterisk11/distinfo Tue Jul 29 22:47:44 2014 (r363406) +++ head/net/asterisk11/distinfo Tue Jul 29 22:52:49 2014 (r363407) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.10.2.tar.gz) = c86975b00c81898b0500742a59f69e97bd970e657198f95b273ca2dc25431e9e -SIZE (asterisk-11.10.2.tar.gz) = 34846584 +SHA256 (asterisk-11.11.0.tar.gz) = 568c9558005e686b020d596556c700ecec910a0c4f81fe54141851d049e222a6 +SIZE (asterisk-11.11.0.tar.gz) = 34867274 Modified: head/net/asterisk11/files/patch-configure ============================================================================== --- head/net/asterisk11/files/patch-configure Tue Jul 29 22:47:44 2014 (r363406) +++ head/net/asterisk11/files/patch-configure Tue Jul 29 22:52:49 2014 (r363407) @@ -1,6 +1,6 @@ ---- configure.orig 2013-01-30 18:46:52.000000000 +0100 -+++ configure 2013-04-20 10:55:21.078558716 +0200 -@@ -4571,9 +4571,9 @@ +--- configure.orig 2014-06-21 01:14:52.000000000 +0200 ++++ configure 2014-07-29 23:59:12.060900744 +0200 +@@ -4616,9 +4616,9 @@ astlibdir='${libdir}' astmoddir='${libdir}/asterisk/modules' astmandir='${mandir}' @@ -12,7 +12,7 @@ astkeydir='${astvarlibdir}' astspooldir='${localstatedir}/spool/asterisk' astlogdir='${localstatedir}/log/asterisk' -@@ -4596,8 +4596,6 @@ +@@ -4641,8 +4641,6 @@ case "${host_os}" in freebsd*) ac_default_prefix=/usr/local @@ -21,7 +21,7 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -17840,6 +17838,8 @@ +@@ -18084,6 +18082,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30,7 +30,7 @@ #include <ifaddrs.h> int main () -@@ -26041,7 +26041,7 @@ +@@ -26385,7 +26385,7 @@ fi @@ -39,3 +39,81 @@ if test "${HAS_OPENH323:-unset}" != "unset"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 +@@ -26483,13 +26483,13 @@ + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.2" >&5 +-$as_echo_n "checking for ${pbxfuncname} in -llua5.2... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.2" >&5 ++$as_echo_n "checking for ${pbxfuncname} in -llua-5.2... " >&6; } + if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua5.2 ${pbxlibdir} -lm $LIBS" ++LIBS="-llua-5.2 ${pbxlibdir} -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -26531,18 +26531,18 @@ + + # now check for the header. + if test "${AST_LUA_FOUND}" = "yes"; then +- LUA_LIB="${pbxlibdir} -llua5.2 -lm" ++ LUA_LIB="${pbxlibdir} -llua-5.2 -lm" + # if --with-LUA=DIR has been specified, use it. + if test "x${LUA_DIR}" != "x"; then + LUA_INCLUDE="-I${LUA_DIR}/include" + fi + LUA_INCLUDE="${LUA_INCLUDE} " +- if test "xlua5.2/lua.h" = "x" ; then # no header, assume found ++ if test "xlua52/lua.h" = "x" ; then # no header, assume found + LUA_HEADER_FOUND="1" + else # check for the header + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" +- ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "lua52/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default" + if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then : + LUA_HEADER_FOUND=1 + else +@@ -26595,13 +26595,13 @@ + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5 +-$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.1" >&5 ++$as_echo_n "checking for ${pbxfuncname} in -llua-5.1... " >&6; } + if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS" ++LIBS="-llua-5.1 ${pbxlibdir} -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -26643,18 +26643,18 @@ + + # now check for the header. + if test "${AST_LUA_FOUND}" = "yes"; then +- LUA_LIB="${pbxlibdir} -llua5.1 -lm" ++ LUA_LIB="${pbxlibdir} -llua-5.1 -lm" + # if --with-LUA=DIR has been specified, use it. + if test "x${LUA_DIR}" != "x"; then + LUA_INCLUDE="-I${LUA_DIR}/include" + fi + LUA_INCLUDE="${LUA_INCLUDE} " +- if test "xlua5.1/lua.h" = "x" ; then # no header, assume found ++ if test "xlua51/lua.h" = "x" ; then # no header, assume found + LUA_HEADER_FOUND="1" + else # check for the header + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" +- ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "lua51/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" + if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then : + LUA_HEADER_FOUND=1 + else Modified: head/net/asterisk11/pkg-plist ============================================================================== --- head/net/asterisk11/pkg-plist Tue Jul 29 22:47:44 2014 (r363406) +++ head/net/asterisk11/pkg-plist Tue Jul 29 22:52:49 2014 (r363407) @@ -453,7 +453,7 @@ include/asterisk/xmpp.h lib/asterisk/modules/app_celgenuserevent.so lib/asterisk/modules/app_confbridge.so lib/asterisk/modules/app_minivm.so -%%WITH_MYSQL%%lib/asterisk/modules/app_mysql.so +%%MYSQL%%lib/asterisk/modules/app_mysql.so lib/asterisk/modules/app_originate.so lib/asterisk/modules/app_page.so lib/asterisk/modules/app_playtones.so @@ -463,9 +463,9 @@ lib/asterisk/modules/bridge_builtin_feat lib/asterisk/modules/bridge_multiplexed.so lib/asterisk/modules/bridge_simple.so *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407292252.s6TMqoJN015326>