From 8962a0c995f536bdf7c495333fe2463b1113fab8 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Mon, 15 Dec 2014 14:46:25 +0000 Subject: Add asterisk13 port. Fix CONFLICTS for asterisk ports and remove long deleted entries references. Upstream announce: http://blogs.digium.com/2014/10/28/asterisk-13-0-0-now-available/ --- net/asterisk13/files/patch-configure | 119 +++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 net/asterisk13/files/patch-configure (limited to 'net/asterisk13/files/patch-configure') diff --git a/net/asterisk13/files/patch-configure b/net/asterisk13/files/patch-configure new file mode 100644 index 000000000000..f120219bbf6a --- /dev/null +++ b/net/asterisk13/files/patch-configure @@ -0,0 +1,119 @@ +--- configure.orig 2014-10-19 17:07:50 UTC ++++ configure +@@ -4667,9 +4667,9 @@ astheaderdir='${includedir}/asterisk' + astlibdir='${libdir}' + astmoddir='${libdir}/asterisk/modules' + astmandir='${mandir}' +-astvarlibdir='${localstatedir}/lib/asterisk' ++astvarlibdir='${prefix}/share/asterisk' + astdatadir='${astvarlibdir}' +-astdbdir='${astvarlibdir}' ++astdbdir='${localstatedir}/db/asterisk' + astkeydir='${astvarlibdir}' + astspooldir='${localstatedir}/spool/asterisk' + astlogdir='${localstatedir}/log/asterisk' +@@ -4692,8 +4692,6 @@ esac + case "${host_os}" in + freebsd*) + ac_default_prefix=/usr/local +- CPPFLAGS=-I/usr/local/include +- LDFLAGS=-L/usr/local/lib + ;; + openbsd*) + ac_default_prefix=/usr/local +@@ -19052,6 +19050,8 @@ $as_echo_n "checking if \"struct ifaddrs + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++ #include ++ #include + #include + int + main () +@@ -27599,7 +27599,7 @@ $as_echo "${OPENH323_BUILD}" >&6; } + + fi + +- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}" ++ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}" + + if test "${HAS_OPENH323:-unset}" != "unset"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 +@@ -27697,13 +27697,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ + 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. */ + +@@ -27745,18 +27745,18 @@ fi + + # 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 +@@ -27809,13 +27809,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ + 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. */ + +@@ -27857,18 +27857,18 @@ fi + + # 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 -- cgit v1.2.3