Attachment #217454 for bug #248850

View | Details | Raw Unified | Return to bug 248850
Collapse All | Expand All

Lines 2-8 Link Here

(-)net/kamailio/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kamailio	4	PORTNAME= kamailio
5	PORTVERSION= 5.3.5	5	PORTVERSION= 5.4.0
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/	7	MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
8	DISTNAME= ${PORTNAME}-${PORTVERSION}_src	8	DISTNAME= ${PORTNAME}-${PORTVERSION}_src

Lines 1-3 Link Here

(-)net/kamailio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1593173267	1	TIMESTAMP = 1597605362
2	SHA256 (kamailio-5.3.5_src.tar.gz) = 5e192a03a936a5a51f3b8363dfa5b15d350c3590cc7548609156b554bc6d0e94	2	SHA256 (kamailio-5.4.0_src.tar.gz) = 9ee22d566a7b6f60eaf283e95ee6633046dc87117be03b6cf2bc27293087718b
3	SIZE (kamailio-5.3.5_src.tar.gz) = 12480234	3	SIZE (kamailio-5.4.0_src.tar.gz) = 12586462

Lines 3-9 Link Here

(-)net/kamailio/files/kamailio.in (-1 / +1 lines)
3	# $FreeBSD: net/kamailio/files/kamailio.in	3	# $FreeBSD: net/kamailio/files/kamailio.in
4	#	4	#
5	# PROVIDE: kamailio	5	# PROVIDE: kamailio
6	# REQUIRE: LOGIN	6	# REQUIRE: NETWORKING SERVERS DAEMON
7	# KEYWORD: shutdown	7	# KEYWORD: shutdown
8	#	8	#
9	# Add the following line to /etc/rc.conf to enable this service	9	# Add the following line to /etc/rc.conf to enable this service




--- src/Makefile.defs.orig	2020-07-29 10:22:39 UTC
+++ src/Makefile.defs
@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}")
 

 else
 	LIBDIR = lib
 endif
@@ -1979,12 +1979,11 @@ ifeq ($(OS), freebsd)
 	ifeq ($(RAW_SOCKS), yes)
 		C_DEFS+= -DUSE_RAW_SOCKS
 	endif
+	LIBS= -lm   # resolv and dlopen is in libc
 	ifneq ($(found_lock_method), yes)
 		C_DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
 		found_lock_method=yes
-		LIBS+= -pthread   #dlopen is in libc
-	else
-		LIBS=   #dlopen is in libc
+		LIBS+= -pthread
 	endif
 	# check for ver >= 4.1
 	ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue)

Lines 5-11 Link Here

(-)net/kamailio/files/patch-src_modules_websocket_ws__frame.c (-1 / +1 lines)
5	#include "utf8_decode.h"	5	#include "utf8_decode.h"
6	#else	6	#else
7	-#include <unistr.h>	7	-#include <unistr.h>
8	+/* #include <unistr.h> */	8	+//#include <unistr.h>
9	#endif	9	#endif
10		10
11	#include "../../core/events.h"	11	#include "../../core/events.h"




%%PORTDOCS%%%%DOCSDIR%%/modules/README.print
%%PORTDOCS%%%%DOCSDIR%%/modules/README.print_lib
%%PORTDOCS%%%%DOCSDIR%%/modules/README.pv
%%PORTDOCS%%%%DOCSDIR%%/modules/README.pv_headers
%%PORTDOCS%%%%DOCSDIR%%/modules/README.qos
%%PORTDOCS%%%%DOCSDIR%%/modules/README.ratelimit
%%PORTDOCS%%%%DOCSDIR%%/modules/README.rr

lib/kamailio/libprint.so.1
lib/kamailio/libsrdb1.so
lib/kamailio/libsrdb1.so.1
lib/kamailio/libsrutils.so
lib/kamailio/libsrutils.so.1
lib/kamailio/libtrie.so
lib/kamailio/libtrie.so.1
lib/kamailio/modules/acc_diameter.so

lib/kamailio/modules/print.so
lib/kamailio/modules/print_lib.so
lib/kamailio/modules/pv.so
lib/kamailio/modules/pv_headers.so
lib/kamailio/modules/qos.so
lib/kamailio/modules/ratelimit.so
lib/kamailio/modules/rr.so

Return to bug 248850

Lines 1-4 Link Here

(-)net/kamailio/files/patch-src_Makefile.defs (-10 / +16 lines)
1	--- src/Makefile.defs.orig 2020-05-06 13:20:45 UTC	1	--- src/Makefile.defs.orig 2020-07-29 10:22:39 UTC
2	+++ src/Makefile.defs	2	+++ src/Makefile.defs
3	@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}")	3	@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}")
4		4
Lines 27-38 Link Here
27	else	27	else
28	LIBDIR = lib	28	LIBDIR = lib
29	endif	29	endif
30	@@ -1830,7 +1830,7 @@ ifeq ($(YACC),)	30	@@ -1979,12 +1979,11 @@ ifeq ($(OS), freebsd)
31	endif	31	ifeq ($(RAW_SOCKS), yes)
32	YACC_FLAGS=-d -b core/cfg	32	C_DEFS+= -DUSE_RAW_SOCKS
33	# on solaris add -lxnet (e.g. LIBS= -lxnet)	33	endif
34	-LIBS= -ldl -lresolv	34	+ LIBS= -lm # resolv and dlopen is in libc
35	+LIBS=	35	ifneq ($(found_lock_method), yes)
36	LIB_PREFIX:=lib	36	C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
37	LIB_SUFFIX:=.so	37	found_lock_method=yes
38		38	- LIBS+= -pthread #dlopen is in libc
		39	- else
		40	- LIBS= #dlopen is in libc
		41	+ LIBS+= -pthread
		42	endif
		43	# check for ver >= 4.1
		44	ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue)

Lines 319-324 Link Here

(-)net/kamailio/pkg-plist (-2 / +2 lines)
319	%%PORTDOCS%%%%DOCSDIR%%/modules/README.print	319	%%PORTDOCS%%%%DOCSDIR%%/modules/README.print
320	%%PORTDOCS%%%%DOCSDIR%%/modules/README.print_lib	320	%%PORTDOCS%%%%DOCSDIR%%/modules/README.print_lib
321	%%PORTDOCS%%%%DOCSDIR%%/modules/README.pv	321	%%PORTDOCS%%%%DOCSDIR%%/modules/README.pv
		322	%%PORTDOCS%%%%DOCSDIR%%/modules/README.pv_headers
322	%%PORTDOCS%%%%DOCSDIR%%/modules/README.qos	323	%%PORTDOCS%%%%DOCSDIR%%/modules/README.qos
323	%%PORTDOCS%%%%DOCSDIR%%/modules/README.ratelimit	324	%%PORTDOCS%%%%DOCSDIR%%/modules/README.ratelimit
324	%%PORTDOCS%%%%DOCSDIR%%/modules/README.rr	325	%%PORTDOCS%%%%DOCSDIR%%/modules/README.rr
Lines 426-433 Link Here
426	lib/kamailio/libprint.so.1	427	lib/kamailio/libprint.so.1
427	lib/kamailio/libsrdb1.so	428	lib/kamailio/libsrdb1.so
428	lib/kamailio/libsrdb1.so.1	429	lib/kamailio/libsrdb1.so.1
429	lib/kamailio/libsrutils.so
430	lib/kamailio/libsrutils.so.1
431	lib/kamailio/libtrie.so	430	lib/kamailio/libtrie.so
432	lib/kamailio/libtrie.so.1	431	lib/kamailio/libtrie.so.1
433	lib/kamailio/modules/acc_diameter.so	432	lib/kamailio/modules/acc_diameter.so
Lines 477-482 Link Here
477	lib/kamailio/modules/print.so	476	lib/kamailio/modules/print.so
478	lib/kamailio/modules/print_lib.so	477	lib/kamailio/modules/print_lib.so
479	lib/kamailio/modules/pv.so	478	lib/kamailio/modules/pv.so
		479	lib/kamailio/modules/pv_headers.so
480	lib/kamailio/modules/qos.so	480	lib/kamailio/modules/qos.so
481	lib/kamailio/modules/ratelimit.so	481	lib/kamailio/modules/ratelimit.so
482	lib/kamailio/modules/rr.so	482	lib/kamailio/modules/rr.so