View | Details | Raw Unified | Return to bug 234547 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +17 lines)
Lines 2-14 Link Here
2
2
3
PORTNAME=	asterisk
3
PORTNAME=	asterisk
4
PORTVERSION=	16.1.1
4
PORTVERSION=	16.1.1
5
PORTREVISION=	1
5
CATEGORIES=	net
6
CATEGORIES=	net
6
MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
7
MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \
8
		https://github.com/traud/asterisk-opus/archive/:opus
7
MASTER_SITE_SUBDIR=	asterisk/ \
9
MASTER_SITE_SUBDIR=	asterisk/ \
8
			asterisk/old-releases/ \
10
			asterisk/old-releases/ \
9
			sounds/releases/:g729
11
			sounds/releases/:g729
10
PKGNAMESUFFIX=	16
12
PKGNAMESUFFIX=	16
11
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
13
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
14
DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
12
15
13
MAINTAINER=	madpilot@FreeBSD.org
16
MAINTAINER=	madpilot@FreeBSD.org
14
COMMENT=	Open Source PBX and telephony toolkit
17
COMMENT=	Open Source PBX and telephony toolkit
Lines 75-81 Link Here
75
OPTIONS_DEFAULT_armv7=		BASE
78
OPTIONS_DEFAULT_armv7=		BASE
76
79
77
OPTIONS_GROUP=			CODECS
80
OPTIONS_GROUP=			CODECS
78
OPTIONS_GROUP_CODECS=		GSM NEWG711 SPEEX VORBIS
81
OPTIONS_GROUP_CODECS=		GSM NEWG711 OPUS SPEEX VORBIS
79
CODECS_DESC=			Encoder/Decoder (Codec) Support
82
CODECS_DESC=			Encoder/Decoder (Codec) Support
80
83
81
OPTIONS_SINGLE=			COMPILER
84
OPTIONS_SINGLE=			COMPILER
Lines 109-114 Link Here
109
MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
112
MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
110
NEWG711_DESC?=	New G711 Codec
113
NEWG711_DESC?=	New G711 Codec
111
OOH323_DESC?=	ooh323 support
114
OOH323_DESC?=	ooh323 support
115
OPUS_DESC?=	Opus Codec
112
PJSIP_DESC?=	Build the PJSIP based SIP channel
116
PJSIP_DESC?=	Build the PJSIP based SIP channel
113
SRTP_DESC?=	SecureRTP support
117
SRTP_DESC?=	SecureRTP support
114
SYSINFO_DESC?=	Use devel/libsysinfo to get system information
118
SYSINFO_DESC?=	Use devel/libsysinfo to get system information
Lines 167-172 Link Here
167
ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
171
ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
168
			libltdl.so:devel/libltdl
172
			libltdl.so:devel/libltdl
169
173
174
OPUS_LIB_DEPENDS=	libopus.so:audio/opus
175
OPUS_COMMIT=	83e1b458c77e0e287adeca494eeb79edb077b0ff
176
OPUS_SRC=	asterisk-opus-${OPUS_COMMIT}
177
OPUS_EXTRACT_ONLY=	${OPUS_COMMIT}${EXTRACT_SUFX}
178
OPUS_DISTFILES=	${OPUS_COMMIT}${EXTRACT_SUFX}:opus
179
170
PGSQL_CONFIGURE_WITH=	postgres
180
PGSQL_CONFIGURE_WITH=	postgres
171
PGSQL_USES=		pgsql
181
PGSQL_USES=		pgsql
172
182
Lines 247-252 Link Here
247
	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
257
	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
248
	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
258
	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
249
259
260
post-extract-OPUS-on:
261
	@${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk
262
	@${CP} ${WRKDIR}/${OPUS_SRC}/codecs/* ${WRKSRC}/codecs
263
	@${CP} ${WRKDIR}/${OPUS_SRC}/res/* ${WRKSRC}/res
264
250
post-patch:
265
post-patch:
251
	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
266
	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
252
.if exists(${FILESDIR}/.asterisk.makeopts)
267
.if exists(${FILESDIR}/.asterisk.makeopts)
(-)distinfo (-7 / +9 lines)
Lines 1-7 Link Here
1
TIMESTAMP = 1545873899
1
TIMESTAMP = 1547164616
2
SHA256 (asterisk-16.1.1.tar.gz) = bbf21452dfb213ecc0f24ef05d240e72b57cbc834f9e2e113062c2db2bde6ea5
2
SHA256 (asterisk16/asterisk-16.1.1.tar.gz) = bbf21452dfb213ecc0f24ef05d240e72b57cbc834f9e2e113062c2db2bde6ea5
3
SIZE (asterisk-16.1.1.tar.gz) = 27490688
3
SIZE (asterisk16/asterisk-16.1.1.tar.gz) = 27490688
4
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
4
SHA256 (asterisk16/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
5
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
5
SIZE (asterisk16/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
6
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
6
SHA256 (asterisk16/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
7
SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
7
SIZE (asterisk16/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
8
SHA256 (asterisk16/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
9
SIZE (asterisk16/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 24044
(-)files/patch-configure (-8 / +102 lines)
Lines 1-6 Link Here
1
--- configure.orig	2018-08-08 16:02:31 UTC
1
--- configure.orig	2018-12-26 18:45:13 UTC
2
+++ configure
2
+++ configure
3
@@ -4661,8 +4661,6 @@ case "${host_os}" in
3
@@ -4681,8 +4681,6 @@ case "${host_os}" in
4
      ;;
4
      ;;
5
      dragonfly*|freebsd*)
5
      dragonfly*|freebsd*)
6
      ac_default_prefix=/usr/local
6
      ac_default_prefix=/usr/local
Lines 9-16 Link Here
9
      ;;
9
      ;;
10
      openbsd*)
10
      openbsd*)
11
      ac_default_prefix=/usr/local
11
      ac_default_prefix=/usr/local
12
@@ -20328,6 +20326,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
12
@@ -7436,93 +7434,6 @@ $as_echo "no" >&6; }
13
 fi
13
 
14
 
15
 
16
-for ac_prog in xmlstarlet xml
17
-do
18
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
19
-set dummy $ac_prog; ac_word=$2
20
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21
-$as_echo_n "checking for $ac_word... " >&6; }
22
-if ${ac_cv_path_XMLSTARLET+:} false; then :
23
-  $as_echo_n "(cached) " >&6
24
-else
25
-  case $XMLSTARLET in
26
-  [\\/]* | ?:[\\/]*)
27
-  ac_cv_path_XMLSTARLET="$XMLSTARLET" # Let the user override the test with a path.
28
-  ;;
29
-  *)
30
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
31
-for as_dir in $PATH
32
-do
33
-  IFS=$as_save_IFS
34
-  test -z "$as_dir" && as_dir=.
35
-    for ac_exec_ext in '' $ac_executable_extensions; do
36
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
37
-    ac_cv_path_XMLSTARLET="$as_dir/$ac_word$ac_exec_ext"
38
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
39
-    break 2
40
-  fi
41
-done
42
-  done
43
-IFS=$as_save_IFS
44
-
45
-  ;;
46
-esac
47
-fi
48
-XMLSTARLET=$ac_cv_path_XMLSTARLET
49
-if test -n "$XMLSTARLET"; then
50
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLSTARLET" >&5
51
-$as_echo "$XMLSTARLET" >&6; }
52
-else
53
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
54
-$as_echo "no" >&6; }
55
-fi
56
-
57
-
58
-  test -n "$XMLSTARLET" && break
59
-done
60
-test -n "$XMLSTARLET" || XMLSTARLET=":"
61
-
62
-# Extract the first word of "bash", so it can be a program name with args.
63
-set dummy bash; ac_word=$2
64
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
65
-$as_echo_n "checking for $ac_word... " >&6; }
66
-if ${ac_cv_path_BASH+:} false; then :
67
-  $as_echo_n "(cached) " >&6
68
-else
69
-  case $BASH in
70
-  [\\/]* | ?:[\\/]*)
71
-  ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
72
-  ;;
73
-  *)
74
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
75
-for as_dir in $PATH
76
-do
77
-  IFS=$as_save_IFS
78
-  test -z "$as_dir" && as_dir=.
79
-    for ac_exec_ext in '' $ac_executable_extensions; do
80
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
81
-    ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
82
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
83
-    break 2
84
-  fi
85
-done
86
-  done
87
-IFS=$as_save_IFS
88
-
89
-  test -z "$ac_cv_path_BASH" && ac_cv_path_BASH=":"
90
-  ;;
91
-esac
92
-fi
93
-BASH=$ac_cv_path_BASH
94
-if test -n "$BASH"; then
95
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
96
-$as_echo "$BASH" >&6; }
97
-else
98
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
99
-$as_echo "no" >&6; }
100
-fi
101
-
102
-
103
 # Extract the first word of "git", so it can be a program name with args.
104
 set dummy git; ac_word=$2
105
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
106
@@ -20419,6 +20330,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
107
 
14
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
108
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15
 /* end confdefs.h.  */
109
 /* end confdefs.h.  */
16
+ #include <sys/types.h>
110
+ #include <sys/types.h>
Lines 18-24 Link Here
18
  #include <ifaddrs.h>
112
  #include <ifaddrs.h>
19
 int
113
 int
20
 main ()
114
 main ()
21
@@ -29156,6 +29156,8 @@ fi
115
@@ -29295,6 +29208,8 @@ fi
22
 
116
 
23
 for ver in 5.3 5.2 5.1; do
117
 for ver in 5.3 5.2 5.1; do
24
 
118
 
Lines 27-33 Link Here
27
 if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
121
 if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
28
    pbxlibdir=""
122
    pbxlibdir=""
29
    # if --with-LUA=DIR has been specified, use it.
123
    # if --with-LUA=DIR has been specified, use it.
30
@@ -29170,13 +29172,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
124
@@ -29309,13 +29224,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
31
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
125
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
32
       CFLAGS="${CFLAGS} "
126
       CFLAGS="${CFLAGS} "
33
       as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
127
       as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
Lines 44-50 Link Here
44
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
138
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
45
 /* end confdefs.h.  */
139
 /* end confdefs.h.  */
46
 
140
 
47
@@ -29218,7 +29220,7 @@ fi
141
@@ -29357,7 +29272,7 @@ fi
48
 
142
 
49
    # now check for the header.
143
    # now check for the header.
50
    if test "${AST_LUA_FOUND}" = "yes"; then
144
    if test "${AST_LUA_FOUND}" = "yes"; then
Lines 53-59 Link Here
53
       # if --with-LUA=DIR has been specified, use it.
147
       # if --with-LUA=DIR has been specified, use it.
54
       if test "x${LUA_DIR}" != "x"; then
148
       if test "x${LUA_DIR}" != "x"; then
55
          LUA_INCLUDE="-I${LUA_DIR}/include"
149
          LUA_INCLUDE="-I${LUA_DIR}/include"
56
@@ -29228,8 +29230,8 @@ fi
150
@@ -29367,8 +29282,8 @@ fi
57
          # check for the header
151
          # check for the header
58
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
152
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
59
          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
153
          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
Lines 64-70 Link Here
64
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
158
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
65
   LUA_HEADER_FOUND=1
159
   LUA_HEADER_FOUND=1
66
 else
160
 else
67
@@ -29256,9 +29258,9 @@ fi
161
@@ -29395,9 +29310,9 @@ fi
68
 
162
 
69
 	if test "x${PBX_LUA}" = "x1" ; then
163
 	if test "x${PBX_LUA}" = "x1" ; then
70
 		if test x"${LUA_DIR}" = x; then
164
 		if test x"${LUA_DIR}" = x; then

Return to bug 234547