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

Collapse All | Expand All

(-)Makefile (-4 / +11 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	freeswitch
4
PORTNAME=	freeswitch
5
PORTVERSION=	1.6.8
5
PORTVERSION=	1.6.10
6
CATEGORIES=	net
6
CATEGORIES=	net
7
MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
7
MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
8
		http://files.freeswitch.org/releases/sounds/:sounds
8
		http://files.freeswitch.org/releases/sounds/:sounds
Lines 16-25 Link Here
16
LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
16
LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
17
		libcurl.so:ftp/curl \
17
		libcurl.so:ftp/curl \
18
		libpcre.so:devel/pcre \
18
		libpcre.so:devel/pcre \
19
		libspeexdsp.so:audio/speexdsp \
19
		libspeex.so:audio/speex \
20
		libspeex.so:audio/speex \
20
		libldns.so:dns/ldns \
21
		libldns.so:dns/ldns \
21
		libopus.so:audio/opus \
22
		libopus.so:audio/opus \
22
		libsndfile.so:audio/libsndfile
23
		libsndfile.so:audio/libsndfile \
24
		libfreetype.so:print/freetype2 \
25
		libpng16.so:graphics/png \
26
		libjbig.so:graphics/jbigkit
23
27
24
CONFLICTS_BUILD=	xmlrpc-c-*
28
CONFLICTS_BUILD=	xmlrpc-c-*
25
29
Lines 26-32 Link Here
26
BROKEN_FreeBSD_9=	Fails in configure due to compiler issues
30
BROKEN_FreeBSD_9=	Fails in configure due to compiler issues
27
ONLY_FOR_ARCHS=	amd64
31
ONLY_FOR_ARCHS=	amd64
28
32
29
USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz
33
USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz ssl libedit iconv
30
USE_LDCONFIG=	yes
34
USE_LDCONFIG=	yes
31
35
32
ALL_MODULES_DESC=	Build all modules
36
ALL_MODULES_DESC=	Build all modules
Lines 46-52 Link Here
46
NO_OPTIONS_SORT=	yes
50
NO_OPTIONS_SORT=	yes
47
OPTIONS_SUB=		yes
51
OPTIONS_SUB=		yes
48
52
53
ALL_MODULES_USE_XORG+=	x11
49
ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf
54
ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf
55
ALL_MODULES_CONFLICTS_BUILD+=	apr
56
ALL_MODULES_LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core \
57
				libopencv_imgproc.so:graphics/opencv-core
50
58
51
GNU_CONFIGURE=		yes
59
GNU_CONFIGURE=		yes
52
INSTALL_TARGET=		install-strip
60
INSTALL_TARGET=		install-strip
Lines 85-91 Link Here
85
		libyaml.so:textproc/libyaml \
93
		libyaml.so:textproc/libyaml \
86
		libMagickWand-6.so:graphics/ImageMagick-nox11
94
		libMagickWand-6.so:graphics/ImageMagick-nox11
87
USE_OPENLDAP=	yes
95
USE_OPENLDAP=	yes
88
USE_OPENSSL=	yes
89
.endif
96
.endif
90
97
91
EDPRE=	freeswitch-sounds
98
EDPRE=	freeswitch-sounds
(-)distinfo (-26 / +3 lines)
Lines 1-34 Link Here
1
SHA256 (freeswitch-1.6.8.tar.xz) = a9834667c0afc164631611b4862acd6411e4e6ddb706e4af4b51eab4adbe4fc1
1
TIMESTAMP = 1474009500
2
SIZE (freeswitch-1.6.8.tar.xz) = 33460304
2
SHA256 (freeswitch-1.6.10.tar.xz) = b7beaaac29dc0a58cc34cfd402bf1c7e8ca06975722fd8ddb2983cbed17dd6e4
3
SIZE (freeswitch-1.6.10.tar.xz) = 33487164
3
SHA256 (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 7556d3eb314be939992a3f73c0d7754e44b36859d670e0b42d4cff7f9c0789a9
4
SHA256 (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 7556d3eb314be939992a3f73c0d7754e44b36859d670e0b42d4cff7f9c0789a9
4
SIZE (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 14619493
5
SIZE (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 14619493
5
SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8
6
SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8
6
SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031
7
SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031
7
SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c
8
SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178
9
SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66
10
SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200
11
SHA256 (freeswitch-sounds-music-16000-1.0.51.tar.gz) = 94b72b14b61054e4faeca2b7282aa976fae641aba5df84b13fb4a811c07c5e0e
8
SHA256 (freeswitch-sounds-music-16000-1.0.51.tar.gz) = 94b72b14b61054e4faeca2b7282aa976fae641aba5df84b13fb4a811c07c5e0e
12
SIZE (freeswitch-sounds-music-16000-1.0.51.tar.gz) = 27993050
9
SIZE (freeswitch-sounds-music-16000-1.0.51.tar.gz) = 27993050
13
SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2
10
SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2
14
SIZE (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776
11
SIZE (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776
15
SHA256 (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6
16
SIZE (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = 26591167
17
SHA256 (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b
18
SIZE (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = 25072831
19
SHA256 (freeswitch-sounds-music-32000-1.0.51.tar.gz) = c6b6a5ea1b68ee1eb0d879e449052d07dc9ed6371a50cd173fbe09b532becf1e
20
SIZE (freeswitch-sounds-music-32000-1.0.51.tar.gz) = 53016061
21
SHA256 (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838
22
SIZE (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 73012907
23
SHA256 (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b
24
SIZE (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 52040064
25
SHA256 (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc
26
SIZE (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = 49276482
27
SHA256 (freeswitch-sounds-music-48000-1.0.51.tar.gz) = 13ca541c76e42c13e686ff8da3b93cf21fdcff5388e6353856daef4d7bac30fd
28
SIZE (freeswitch-sounds-music-48000-1.0.51.tar.gz) = 75546338
29
SHA256 (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa
30
SIZE (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = 105319388
31
SHA256 (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0
32
SIZE (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = 76666642
33
SHA256 (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d
34
SIZE (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = 72438142
(-)files/extrapatch-modules.conf (-6 / +7 lines)
Lines 1-17 Link Here
1
--- modules.conf.orig	2016-05-05 16:42:20.000000000 -0400
1
--- modules.conf.orig	2016-08-25 12:35:35 UTC
2
+++ modules.conf	2016-05-06 16:42:38.276496730 -0400
2
+++ modules.conf
3
@@ -1,161 +1,161 @@
3
@@ -1,162 +1,162 @@
4
-#applications/mod_abstraction
4
-#applications/mod_abstraction
5
-#applications/mod_av
5
-#applications/mod_av
6
-#applications/mod_avmd
6
-#applications/mod_avmd
7
+applications/mod_abstraction
8
+applications/mod_av
9
+applications/mod_avmd
10
-#applications/mod_bert
7
-#applications/mod_bert
11
-#applications/mod_blacklist
8
-#applications/mod_blacklist
12
-#applications/mod_callcenter
9
-#applications/mod_callcenter
13
-#applications/mod_cidlookup
10
-#applications/mod_cidlookup
14
-#applications/mod_cluechoo
11
-#applications/mod_cluechoo
12
+applications/mod_abstraction
13
+applications/mod_av
14
+applications/mod_avmd
15
+applications/mod_bert
15
+applications/mod_bert
16
+applications/mod_blacklist
16
+applications/mod_blacklist
17
+applications/mod_callcenter
17
+applications/mod_callcenter
Lines 69-74 Link Here
69
+applications/mod_redis
69
+applications/mod_redis
70
+applications/mod_rss
70
+applications/mod_rss
71
 applications/mod_sms
71
 applications/mod_sms
72
 #applications/mod_sms_flowroute
72
-#applications/mod_snapshot
73
-#applications/mod_snapshot
73
-#applications/mod_snom
74
-#applications/mod_snom
74
-#applications/mod_sonar
75
-#applications/mod_sonar
(-)files/patch-build_Makefile.in (-2 / +2 lines)
Lines 1-6 Link Here
1
--- build/Makefile.in.orig	2016-03-07 21:11:29 UTC
1
--- build/Makefile.in.orig	2016-08-25 12:36:43 UTC
2
+++ build/Makefile.in
2
+++ build/Makefile.in
3
@@ -588,76 +588,9 @@ uninstall-am:
3
@@ -594,76 +594,9 @@ uninstall-am:
4
 
4
 
5
 all:
5
 all:
6
 	@echo " +---------- FreeSWITCH Build Complete ----------+"
6
 	@echo " +---------- FreeSWITCH Build Complete ----------+"
(-)files/patch-configure (-11 lines)
Lines 1-11 Link Here
1
--- configure.orig	2016-05-18 22:49:18.753911000 +0000
2
+++ configure	2016-05-18 22:49:38.480978000 +0000
3
@@ -20062,7 +20062,7 @@
4
 fi
5
 
6
 
7
-for luaversion in lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do
8
+for luaversion in lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do
9
 
10
   succeeded=no
11
 
(-)files/patch-libs_sofia-sip_config.h.in (+12 lines)
Line 0 Link Here
1
--- libs/sofia-sip/config.h.in.orig	2016-08-25 12:36:03 UTC
2
+++ libs/sofia-sip/config.h.in
3
@@ -518,7 +518,9 @@
4
 #undef _POSIX_SOURCE
5
 
6
 /* Little Endian */
7
+#ifndef __BYTE_ORDER
8
 #undef __BYTE_ORDER
9
+#endif
10
 
11
 /* Define to empty if `const' does not conform to ANSI C. */
12
 #undef const

Return to bug 212729