Attachment #175612 for bug #212729




# $FreeBSD$

PORTNAME=	freeswitch
PORTVERSION=	1.6.11
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
		http://files.freeswitch.org/releases/sounds/:sounds

LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
		libcurl.so:ftp/curl \
		libpcre.so:devel/pcre \
		libspeexdsp.so:audio/speexdsp \
		libspeex.so:audio/speex \
		libldns.so:dns/ldns \
		libopus.so:audio/opus \
		libsndfile.so:audio/libsndfile \
		libfreetype.so:print/freetype2 \
		libpng16.so:graphics/png \
		libjbig.so:graphics/jbigkit

CONFLICTS_BUILD=	xmlrpc-c-*


BROKEN_FreeBSD_9=	Fails in configure due to compiler issues
ONLY_FOR_ARCHS=	amd64

USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz iconv libedit ssl
USE_LDCONFIG=	yes

ALL_MODULES_DESC=	Build all modules

NO_OPTIONS_SORT=	yes
OPTIONS_SUB=		yes

ALL_MODULES_CONFLICTS_BUILD+=	apr
ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf

GNU_CONFIGURE=		yes

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MALL_MODULES}
USE_XORG=	x11
BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
		${LOCALBASE}/bin/aclocal:devel/automake
RUN_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa
LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
		libopencv_gpu.so:graphics/opencv2 \
		libopencv_core.so:graphics/opencv2-core \
		libhiredis.so:databases/hiredis \
		libmemcached.so:databases/libmemcached \
		libSoundTouch.so:audio/soundtouch \

		libnetsnmp.so:net-mgmt/net-snmp \
		libvlc.so:multimedia/vlc \
		libyaml.so:textproc/libyaml \
		libMagickCore-6.so:graphics/ImageMagick-nox11
USE_OPENLDAP=	yes
USE_OPENSSL=	yes
.endif

EDPRE=	freeswitch-sounds

Lines 1-5 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (freeswitch-1.6.8.tar.xz) = a9834667c0afc164631611b4862acd6411e4e6ddb706e4af4b51eab4adbe4fc1	1	TIMESTAMP = 1476110002
2	SIZE (freeswitch-1.6.8.tar.xz) = 33460304	2	SHA256 (freeswitch-1.6.11.tar.xz) = c1744fbe8c5d0b478dc493f3b4c5eca8ba3a010df1de034eff738ffb2aea0668
		3	SIZE (freeswitch-1.6.11.tar.xz) = 33467096
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




--- modules.conf.orig	2016-08-25 12:35:35 UTC
+++ modules.conf
@@ -1,162 +1,162 @@
-#applications/mod_abstraction
-#applications/mod_av
-#applications/mod_avmd
+applications/mod_abstraction
+applications/mod_av
+applications/mod_avmd
-#applications/mod_bert
-#applications/mod_blacklist
-#applications/mod_callcenter
-#applications/mod_cidlookup
-#applications/mod_cluechoo
+applications/mod_abstraction
+applications/mod_av
+applications/mod_avmd
+applications/mod_bert
+applications/mod_blacklist
+applications/mod_callcenter

+applications/mod_redis
+applications/mod_rss
 applications/mod_sms
 #applications/mod_sms_flowroute
-#applications/mod_snapshot
-#applications/mod_snom
-#applications/mod_sonar

Lines 27-30 Link Here

(-)files/freeswitch.in (+4 lines)
27		27
28	command_args="-nc"	28	command_args="-nc"
29		29
		30	pidfile="/var/run/${name}/${name}.pid"
		31
		32	stop_cmd="${command} -stop ; sleep 5 ; check_pidfile ${pidfile} ${command} \| xargs kill -KILL ; rm ${pidfile}"
		33
30	run_rc_command "$1"	34	run_rc_command "$1"




--- build/config/ltmain.sh.orig	2016-08-25 12:36:38 UTC
+++ build/config/ltmain.sh
@@ -2260,9 +2260,9 @@ func_mode_install ()
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
-      fi
+#      if test -n "$stripme" && test -n "$old_striplib"; then
+#	func_show_eval "$old_striplib $oldlib" 'exit $?'
+#      fi
 
       # Do each command in the postinstall commands.
       func_execute_cmds "$old_postinstall_cmds" 'exit $?'

Lines 1-11 Link Here

(-)files/patch-configure (-11 lines)
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




--- libs/sofia-sip/config.h.in.orig	2016-08-25 12:36:03 UTC
+++ libs/sofia-sip/config.h.in
@@ -518,7 +518,9 @@
 #undef _POSIX_SOURCE
 
 /* Little Endian */
+#ifndef __BYTE_ORDER
 #undef __BYTE_ORDER
+#endif
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const




--- src/mod/applications/mod_avmd/avmd_fast_acosf.c.orig	2016-05-05 20:42:20 UTC
+++ src/mod/applications/mod_avmd/avmd_fast_acosf.c
@@ -23,6 +23,9 @@
 #include "avmd_fast_acosf.h"
 #include "avmd_options.h"

+#ifndef MAP_POPULATE
+#define MAP_POPULATE 0
+#endif

 typedef union {
     uint32_t i;

Line 0 Link Here

(-)files/patch-src_mod_applications_mod__http__cache_mod__http__cache.c (+11 lines)
	1	--- src/mod/applications/mod_http_cache/mod_http_cache.c.orig 2016-08-25 12:35:35 UTC
	2	+++ src/mod/applications/mod_http_cache/mod_http_cache.c
	3	@@ -38,6 +38,8 @@
	4
	5	#include <stdlib.h>
	6
	7	+char strndup(const char str, size_t len);
	8	+
	9	/* 253 max domain size + '/' + NUL byte */
	10	#define DOMAIN_BUF_SIZE 255
	11




include/freeswitch/switch_cpp.h
include/freeswitch/switch_curl.h
include/freeswitch/switch_dso.h
include/freeswitch/switch_estimators.h
include/freeswitch/switch_event.h
include/freeswitch/switch_frame.h
include/freeswitch/switch_hashtable.h

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/acl.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/alsa.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amqp.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/avmd.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/cdr_csv.conf.xml

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/shout.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/skinny.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/smpp.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sms_flowroute.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sofia.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/spandsp.conf.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/switch.conf.xml

Return to bug 212729

Lines 2-9 Link Here

(-)Makefile (-7 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= freeswitch	4	PORTNAME= freeswitch
5	PORTVERSION= 1.6.8	5	PORTVERSION= 1.6.11
6	PORTREVISION= 1
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \	7	MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \
9	http://files.freeswitch.org/releases/sounds/:sounds	8	http://files.freeswitch.org/releases/sounds/:sounds
Lines 17-26 Link Here
17	LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \	16	LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
18	libcurl.so:ftp/curl \	17	libcurl.so:ftp/curl \
19	libpcre.so:devel/pcre \	18	libpcre.so:devel/pcre \
		19	libspeexdsp.so:audio/speexdsp \
20	libspeex.so:audio/speex \	20	libspeex.so:audio/speex \
21	libldns.so:dns/ldns \	21	libldns.so:dns/ldns \
22	libopus.so:audio/opus \	22	libopus.so:audio/opus \
23	libsndfile.so:audio/libsndfile	23	libsndfile.so:audio/libsndfile \
		24	libfreetype.so:print/freetype2 \
		25	libpng16.so:graphics/png \
		26	libjbig.so:graphics/jbigkit
24		27
25	CONFLICTS_BUILD= xmlrpc-c-*	28	CONFLICTS_BUILD= xmlrpc-c-*
26		29
Lines 27-33 Link Here
27	BROKEN_FreeBSD_9= Fails in configure due to compiler issues	30	BROKEN_FreeBSD_9= Fails in configure due to compiler issues
28	ONLY_FOR_ARCHS= amd64	31	ONLY_FOR_ARCHS= amd64
29		32
30	USES= gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz	33	USES= gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz iconv libedit ssl
31	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
32		35
33	ALL_MODULES_DESC= Build all modules	36	ALL_MODULES_DESC= Build all modules
Lines 47-52 Link Here
47	NO_OPTIONS_SORT= yes	50	NO_OPTIONS_SORT= yes
48	OPTIONS_SUB= yes	51	OPTIONS_SUB= yes
49		52
		53	ALL_MODULES_CONFLICTS_BUILD+= apr
50	ALL_MODULES_EXTRA_PATCHES= ${FILESDIR}/extrapatch-modules.conf	54	ALL_MODULES_EXTRA_PATCHES= ${FILESDIR}/extrapatch-modules.conf
51		55
52	GNU_CONFIGURE= yes	56	GNU_CONFIGURE= yes
Lines 67-77 Link Here
67	.include <bsd.port.options.mk>	71	.include <bsd.port.options.mk>
68		72
69	.if ${PORT_OPTIONS:MALL_MODULES}	73	.if ${PORT_OPTIONS:MALL_MODULES}
		74	USE_XORG= x11
70	BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:audio/ladspa \	75	BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:audio/ladspa \
71	${LOCALBASE}/bin/aclocal:devel/automake	76	${LOCALBASE}/bin/aclocal:devel/automake
72	RUN_DEPENDS+= ${LOCALBASE}/include/ladspa.h:audio/ladspa	77	RUN_DEPENDS+= ${LOCALBASE}/include/ladspa.h:audio/ladspa
73	LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg \	78	LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg \
74	libopencv_legacy.so:graphics/opencv2 \	79	libopencv_gpu.so:graphics/opencv2 \
		80	libopencv_core.so:graphics/opencv2-core \
75	libhiredis.so:databases/hiredis \	81	libhiredis.so:databases/hiredis \
76	libmemcached.so:databases/libmemcached \	82	libmemcached.so:databases/libmemcached \
77	libSoundTouch.so:audio/soundtouch \	83	libSoundTouch.so:audio/soundtouch \
Lines 84-92 Link Here
84	libnetsnmp.so:net-mgmt/net-snmp \	90	libnetsnmp.so:net-mgmt/net-snmp \
85	libvlc.so:multimedia/vlc \	91	libvlc.so:multimedia/vlc \
86	libyaml.so:textproc/libyaml \	92	libyaml.so:textproc/libyaml \
87	libMagickWand-6.so:graphics/ImageMagick-nox11	93	libMagickCore-6.so:graphics/ImageMagick-nox11
88	USE_OPENLDAP= yes	94	USE_OPENLDAP= yes
89	USE_OPENSSL= yes
90	.endif	95	.endif
91		96
92	EDPRE= freeswitch-sounds	97	EDPRE= freeswitch-sounds

Lines 1-17 Link Here

(-)files/extrapatch-modules.conf (-6 / +7 lines)
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

Line 0 Link Here

(-)files/patch-build_config_ltmain.sh (+15 lines)
	1	--- build/config/ltmain.sh.orig 2016-08-25 12:36:38 UTC
	2	+++ build/config/ltmain.sh
	3	@@ -2260,9 +2260,9 @@ func_mode_install ()
	4
	5	func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
	6
	7	- if test -n "$stripme" && test -n "$old_striplib"; then
	8	- func_show_eval "$old_striplib $oldlib" 'exit $?'
	9	- fi
	10	+# if test -n "$stripme" && test -n "$old_striplib"; then
	11	+# func_show_eval "$old_striplib $oldlib" 'exit $?'
	12	+# fi
	13
	14	# Do each command in the postinstall commands.
	15	func_execute_cmds "$old_postinstall_cmds" 'exit $?'

Line 0 Link Here

(-)files/patch-libs_sofia-sip_config.h.in (+12 lines)
	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

Lines 1-12 Link Here

(-)files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c (-12 lines)
1	--- src/mod/applications/mod_avmd/avmd_fast_acosf.c.orig 2016-05-05 20:42:20 UTC
2	+++ src/mod/applications/mod_avmd/avmd_fast_acosf.c
3	@@ -23,6 +23,9 @@
4	#include "avmd_fast_acosf.h"
5	#include "avmd_options.h"
6
7	+#ifndef MAP_POPULATE
8	+#define MAP_POPULATE 0
9	+#endif
10
11	typedef union {
12	uint32_t i;

Lines 24-29 Link Here

(-)pkg-plist (+3 lines)
24	include/freeswitch/switch_cpp.h	24	include/freeswitch/switch_cpp.h
25	include/freeswitch/switch_curl.h	25	include/freeswitch/switch_curl.h
26	include/freeswitch/switch_dso.h	26	include/freeswitch/switch_dso.h
		27	include/freeswitch/switch_estimators.h
27	include/freeswitch/switch_event.h	28	include/freeswitch/switch_event.h
28	include/freeswitch/switch_frame.h	29	include/freeswitch/switch_frame.h
29	include/freeswitch/switch_hashtable.h	30	include/freeswitch/switch_hashtable.h
Lines 632-637 Link Here
632	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/acl.conf.xml	633	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/acl.conf.xml
633	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/alsa.conf.xml	634	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/alsa.conf.xml
634	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amqp.conf.xml	635	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amqp.conf.xml
		636	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/avmd.conf.xml
635	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml	637	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml
636	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml	638	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml
637	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/cdr_csv.conf.xml	639	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/cdr_csv.conf.xml
Lines 689-694 Link Here
689	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/shout.conf.xml	691	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/shout.conf.xml
690	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/skinny.conf.xml	692	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/skinny.conf.xml
691	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/smpp.conf.xml	693	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/smpp.conf.xml
		694	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sms_flowroute.conf.xml
692	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sofia.conf.xml	695	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sofia.conf.xml
693	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/spandsp.conf.xml	696	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/spandsp.conf.xml
694	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/switch.conf.xml	697	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/switch.conf.xml