Attachment #208523 for bug #241429




# $FreeBSD$

PORTNAME=	kamailio
PORTVERSION=	5.3.0
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
DISTNAME=	${PORTNAME}-${PORTVERSION}_src

		KAMAILIO_GROUP=${KAMAILIO_GROUP} \
		KAMAILIO_RUNDIR=${KAMAILIO_RUNDIR}

OPTIONS_GROUP=		DATABASE_DRIVERS KEMI_LANGS
OPTIONS_GROUP_KEMI=	LUAJIT PYTHON3
OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL UNIXODBC
OPTIONS_GROUP_KEMI_LANGS=	LUAJIT PYTHON3
OPTIONS_DEFINE=		DATABASE DIALPLAN DOCS KEMIX PERL PRESENCE RADIUS \
			SCTP TLS WEBSOCKET
#OPTIONS_DEFAULT=	MYSQL PRESENCE RADIUS TLS
OPTIONS_SUB=		YES

DATABASE_DRIVERS_DESC=	Database drivers

UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
UNIXODBC_VARS=		EXTRA_MODULES+=db_unixodbc

KEMIX_DESC=		Core KEMI Functions
KEMIX_VARS=		EXTRA_MODULES+=kemix

KEMI_LANGS_DESC=	Kamailio Embedded Interface Interpreters

LUAJIT_DESC=		Execute embedded Lua scripts
LUAJIT_IMPLIES=		KEMIX
LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
LUAJIT_MAKE_ARGS=	LUAJIT=yes
LUAJIT_VARS=		EXTRA_MODULES+=app_lua

PYTHON3_DESC=		Execute embedded Python3 scripts
PYTHON3_IMPLIES=	KEMIX
PYTHON3_MAKE_ARGS=	PYTHON3=${PYTHON_CMD}
PYTHON3_VARS=		EXTRA_MODULES+=app_python3


.endif

post-patch:
	${REINPLACE_CMD} '551s|$$(run_prefix)/$$(run_dir)|${KAMAILIO_RUNDIR}|' \
		${WRKSRC}/src/Makefile.defs

post-patch-DOCS-off:


post-install:
	@${RMDIR} ${STAGEDIR}${DATADIR} || true
	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so' -exec ${STRIP_CMD} {} +
	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so.1' -exec ${STRIP_CMD} {} +
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamailio
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamcmd
	@${ECHO_CMD} "@dir(${KAMAILIO_USER},${KAMAILIO_GROUP},750) ${KAMAILIO_RUNDIR}" >> ${TMPPLIST}

Lines 1-3 Link Here

(-)net/kamailio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1566543570	1	TIMESTAMP = 1571491417
2	SHA256 (kamailio-5.2.4_src.tar.gz) = 484488879fa3c790bbd940bb81bac90639f4dccfc1c2b4e75db38f65d4020393	2	SHA256 (kamailio-5.3.0_src.tar.gz) = 1bf948620a4036fa473659d3969d5d3887dd25bd2ad20a1ac451ecadaaca447e
3	SIZE (kamailio-5.2.4_src.tar.gz) = 12305527	3	SIZE (kamailio-5.3.0_src.tar.gz) = 12429451




--- src/Makefile.defs.orig	2019-10-17 11:30:50 UTC
+++ src/Makefile.defs
@@ -245,7 +245,7 @@ YACC := $(shell echo "$${YACC}")
 
 # find compiler name & version
 ifeq ($(CC),)

 endif
 LD= $(CC)
 CC_LONGVER:=$(shell if  $(CC) -v 2>/dev/null; then \
@@ -259,7 +259,7 @@ MKTAGS=ctags
 #find-out the compiler's name
 
 ifneq (,$(findstring gcc, $(CC_LONGVER)))

 	RPAREN=)
 	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\
 				sed  -e 's/([^$(RPAREN)]*)//g' \
@@ -444,7 +444,7 @@ LIBDIR ?=
 ifeq ($(LIBDIR),)
 ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
 ifeq ($(ARCHBSZ),64b)

 else
 	LIBDIR = lib
 endif
@@ -1818,7 +1818,7 @@ ifeq ($(YACC),)
 endif
 YACC_FLAGS=-d -b core/cfg
 # on solaris add -lxnet (e.g. LIBS= -lxnet)

Return to bug 241429

Lines 2-9 Link Here

(-)net/kamailio/Makefile (-10 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kamailio	4	PORTNAME= kamailio
5	PORTVERSION= 5.2.4	5	PORTVERSION= 5.3.0
6	PORTREVISION= 2
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/	7	MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
9	DISTNAME= ${PORTNAME}-${PORTVERSION}_src	8	DISTNAME= ${PORTNAME}-${PORTVERSION}_src
Lines 45-56 Link Here
45	KAMAILIO_GROUP=${KAMAILIO_GROUP} \	44	KAMAILIO_GROUP=${KAMAILIO_GROUP} \
46	KAMAILIO_RUNDIR=${KAMAILIO_RUNDIR}	45	KAMAILIO_RUNDIR=${KAMAILIO_RUNDIR}
47		46
48	OPTIONS_GROUP= DATABASE_DRIVERS KEMI	47	OPTIONS_GROUP= DATABASE_DRIVERS KEMI_LANGS
49	OPTIONS_GROUP_KEMI= LUAJIT PYTHON3
50	OPTIONS_GROUP_DATABASE_DRIVERS= MYSQL PGSQL UNIXODBC	48	OPTIONS_GROUP_DATABASE_DRIVERS= MYSQL PGSQL UNIXODBC
51	OPTIONS_DEFINE= DATABASE DIALPLAN DOCS PERL PRESENCE RADIUS \	49	OPTIONS_GROUP_KEMI_LANGS= LUAJIT PYTHON3
		50	OPTIONS_DEFINE= DATABASE DIALPLAN DOCS KEMIX PERL PRESENCE RADIUS \
52	SCTP TLS WEBSOCKET	51	SCTP TLS WEBSOCKET
53	OPTIONS_DEFAULT= MYSQL PRESENCE RADIUS TLS	52	#OPTIONS_DEFAULT= MYSQL PRESENCE RADIUS TLS
54	OPTIONS_SUB= YES	53	OPTIONS_SUB= YES
55		54
56	DATABASE_DRIVERS_DESC= Database drivers	55	DATABASE_DRIVERS_DESC= Database drivers
Lines 70-83 Link Here
70	UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC	69	UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
71	UNIXODBC_VARS= EXTRA_MODULES+=db_unixodbc	70	UNIXODBC_VARS= EXTRA_MODULES+=db_unixodbc
72		71
73	KEMI_DESC= Kamailio Embedded Interface	72	KEMIX_DESC= Core KEMI Functions
		73	KEMIX_VARS= EXTRA_MODULES+=kemix
74		74
		75	KEMI_LANGS_DESC= Kamailio Embedded Interface Interpreters
		76
75	LUAJIT_DESC= Execute embedded Lua scripts	77	LUAJIT_DESC= Execute embedded Lua scripts
		78	LUAJIT_IMPLIES= KEMIX
76	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	79	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
77	LUAJIT_MAKE_ARGS= LUAJIT=yes	80	LUAJIT_MAKE_ARGS= LUAJIT=yes
78	LUAJIT_VARS= EXTRA_MODULES+=app_lua	81	LUAJIT_VARS= EXTRA_MODULES+=app_lua
79		82
80	PYTHON3_DESC= Execute embedded Python3 scripts	83	PYTHON3_DESC= Execute embedded Python3 scripts
		84	PYTHON3_IMPLIES= KEMIX
81	PYTHON3_MAKE_ARGS= PYTHON3=${PYTHON_CMD}	85	PYTHON3_MAKE_ARGS= PYTHON3=${PYTHON_CMD}
82	PYTHON3_VARS= EXTRA_MODULES+=app_python3	86	PYTHON3_VARS= EXTRA_MODULES+=app_python3
83		87
Lines 122-128 Link Here
122	.endif	126	.endif
123		127
124	post-patch:	128	post-patch:
125	${REINPLACE_CMD} '499s\|$$(run_prefix)/$$(run_dir)\|${KAMAILIO_RUNDIR}\|' \	129	${REINPLACE_CMD} '551s\|$$(run_prefix)/$$(run_dir)\|${KAMAILIO_RUNDIR}\|' \
126	${WRKSRC}/src/Makefile.defs	130	${WRKSRC}/src/Makefile.defs
127		131
128	post-patch-DOCS-off:	132	post-patch-DOCS-off:
Lines 139-146 Link Here
139		143
140	post-install:	144	post-install:
141	@${RMDIR} ${STAGEDIR}${DATADIR} \|\| true	145	@${RMDIR} ${STAGEDIR}${DATADIR} \|\| true
142	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kamailio/*.so.1	146	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so' -exec ${STRIP_CMD} {} +
143	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kamailio/modules/*.so	147	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so.1' -exec ${STRIP_CMD} {} +
144	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamailio	148	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamailio
145	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamcmd	149	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamcmd
146	@${ECHO_CMD} "@dir(${KAMAILIO_USER},${KAMAILIO_GROUP},750) ${KAMAILIO_RUNDIR}" >> ${TMPPLIST}	150	@${ECHO_CMD} "@dir(${KAMAILIO_USER},${KAMAILIO_GROUP},750) ${KAMAILIO_RUNDIR}" >> ${TMPPLIST}

Lines 1-6 Link Here

(-)net/kamailio/files/patch-src_Makefile.defs (-5 / +5 lines)
1	--- src/Makefile.defs.orig 2019-08-14 09:43:03 UTC	1	--- src/Makefile.defs.orig 2019-10-17 11:30:50 UTC
2	+++ src/Makefile.defs	2	+++ src/Makefile.defs
3	@@ -208,7 +208,7 @@ YACC := $(shell echo "$${YACC}")	3	@@ -245,7 +245,7 @@ YACC := $(shell echo "$${YACC}")
4		4
5	# find compiler name & version	5	# find compiler name & version
6	ifeq ($(CC),)	6	ifeq ($(CC),)
Lines 9-15 Link Here
9	endif	9	endif
10	LD= $(CC)	10	LD= $(CC)
11	CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \	11	CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \
12	@@ -222,7 +222,7 @@ MKTAGS=ctags	12	@@ -259,7 +259,7 @@ MKTAGS=ctags
13	#find-out the compiler's name	13	#find-out the compiler's name
14		14
15	ifneq (,$(findstring gcc, $(CC_LONGVER)))	15	ifneq (,$(findstring gcc, $(CC_LONGVER)))
Lines 18-24 Link Here
18	RPAREN=)	18	RPAREN=)
19	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version\|head -n 1\|\	19	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version\|head -n 1\|\
20	sed -e 's/([^$(RPAREN)]*)//g' \	20	sed -e 's/([^$(RPAREN)]*)//g' \
21	@@ -392,7 +392,7 @@ LIBDIR ?=	21	@@ -444,7 +444,7 @@ LIBDIR ?=
22	ifeq ($(LIBDIR),)	22	ifeq ($(LIBDIR),)
23	ARCHBSZ= $(shell echo $(ARCH) \| sed -e 's/.64./64b/')	23	ARCHBSZ= $(shell echo $(ARCH) \| sed -e 's/.64./64b/')
24	ifeq ($(ARCHBSZ),64b)	24	ifeq ($(ARCHBSZ),64b)
Lines 27-33 Link Here
27	else	27	else
28	LIBDIR = lib	28	LIBDIR = lib
29	endif	29	endif
30	@@ -1736,7 +1736,7 @@ ifeq ($(YACC),)	30	@@ -1818,7 +1818,7 @@ ifeq ($(YACC),)
31	endif	31	endif
32	YACC_FLAGS=-d -b core/cfg	32	YACC_FLAGS=-d -b core/cfg
33	# on solaris add -lxnet (e.g. LIBS= -lxnet)	33	# on solaris add -lxnet (e.g. LIBS= -lxnet)

Lines 93-98 Link Here

(-)net/kamailio/pkg-plist (-1 / +10 lines)
93	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.pipelimit	93	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.pipelimit
94	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.prefix_route	94	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.prefix_route
95	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.registrar	95	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.registrar
		96	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.secfilter
96	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.sipcapture	97	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.sipcapture
97	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.siptrace	98	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.siptrace
98	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.speeddial	99	%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.speeddial
Lines 131-136 Link Here
131	%%DATABASE%%lib/kamailio/modules/pipelimit.so	132	%%DATABASE%%lib/kamailio/modules/pipelimit.so
132	%%DATABASE%%lib/kamailio/modules/prefix_route.so	133	%%DATABASE%%lib/kamailio/modules/prefix_route.so
133	%%DATABASE%%lib/kamailio/modules/registrar.so	134	%%DATABASE%%lib/kamailio/modules/registrar.so
		135	%%DATABASE%%lib/kamailio/modules/secfilter.so
134	%%DATABASE%%lib/kamailio/modules/sipcapture.so	136	%%DATABASE%%lib/kamailio/modules/sipcapture.so
135	%%DATABASE%%lib/kamailio/modules/siptrace.so	137	%%DATABASE%%lib/kamailio/modules/siptrace.so
136	%%DATABASE%%lib/kamailio/modules/speeddial.so	138	%%DATABASE%%lib/kamailio/modules/speeddial.so
Lines 141-146 Link Here
141	%%DATABASE%%lib/kamailio/modules/usrloc.so	143	%%DATABASE%%lib/kamailio/modules/usrloc.so
142	%%DIALPLAN%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.dialplan	144	%%DIALPLAN%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.dialplan
143	%%DIALPLAN%%lib/kamailio/modules/dialplan.so	145	%%DIALPLAN%%lib/kamailio/modules/dialplan.so
		146	%%KEMIX%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.kemix
		147	%%KEMIX%%lib/kamailio/modules/kemix.so
144	%%LUAJIT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_lua	148	%%LUAJIT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_lua
145	%%LUAJIT%%lib/kamailio/modules/app_lua.so	149	%%LUAJIT%%lib/kamailio/modules/app_lua.so
146	%%MYSQL%%%%DATADIR%%/mysql/acc-create.sql	150	%%MYSQL%%%%DATADIR%%/mysql/acc-create.sql
Lines 158-164 Link Here
158	%%MYSQL%%%%DATADIR%%/mysql/group-create.sql	162	%%MYSQL%%%%DATADIR%%/mysql/group-create.sql
159	%%MYSQL%%%%DATADIR%%/mysql/htable-create.sql	163	%%MYSQL%%%%DATADIR%%/mysql/htable-create.sql
160	%%MYSQL%%%%DATADIR%%/mysql/imc-create.sql	164	%%MYSQL%%%%DATADIR%%/mysql/imc-create.sql
161	%%MYSQL%%%%DATADIR%%/mysql/ims_charging_create.sql	165	%%MYSQL%%%%DATADIR%%/mysql/ims_charging-create.sql
162	%%MYSQL%%%%DATADIR%%/mysql/ims_dialog-create.sql	166	%%MYSQL%%%%DATADIR%%/mysql/ims_dialog-create.sql
163	%%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_pcscf-create.sql	167	%%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_pcscf-create.sql
164	%%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_scscf-create.sql	168	%%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_scscf-create.sql
Lines 177-182 Link Here
177	%%MYSQL%%%%DATADIR%%/mysql/rtpengine-create.sql	181	%%MYSQL%%%%DATADIR%%/mysql/rtpengine-create.sql
178	%%MYSQL%%%%DATADIR%%/mysql/rtpproxy-create.sql	182	%%MYSQL%%%%DATADIR%%/mysql/rtpproxy-create.sql
179	%%MYSQL%%%%DATADIR%%/mysql/sca-create.sql	183	%%MYSQL%%%%DATADIR%%/mysql/sca-create.sql
		184	%%MYSQL%%%%DATADIR%%/mysql/secfilter-create.sql
180	%%MYSQL%%%%DATADIR%%/mysql/siptrace-create.sql	185	%%MYSQL%%%%DATADIR%%/mysql/siptrace-create.sql
181	%%MYSQL%%%%DATADIR%%/mysql/speeddial-create.sql	186	%%MYSQL%%%%DATADIR%%/mysql/speeddial-create.sql
182	%%MYSQL%%%%DATADIR%%/mysql/standard-create.sql	187	%%MYSQL%%%%DATADIR%%/mysql/standard-create.sql
Lines 246-251 Link Here
246	%%PGSQL%%%%DATADIR%%/postgres/rtpengine-create.sql	251	%%PGSQL%%%%DATADIR%%/postgres/rtpengine-create.sql
247	%%PGSQL%%%%DATADIR%%/postgres/rtpproxy-create.sql	252	%%PGSQL%%%%DATADIR%%/postgres/rtpproxy-create.sql
248	%%PGSQL%%%%DATADIR%%/postgres/sca-create.sql	253	%%PGSQL%%%%DATADIR%%/postgres/sca-create.sql
		254	%%PGSQL%%%%DATADIR%%/postgres/secfilter-create.sql
249	%%PGSQL%%%%DATADIR%%/postgres/siptrace-create.sql	255	%%PGSQL%%%%DATADIR%%/postgres/siptrace-create.sql
250	%%PGSQL%%%%DATADIR%%/postgres/speeddial-create.sql	256	%%PGSQL%%%%DATADIR%%/postgres/speeddial-create.sql
251	%%PGSQL%%%%DATADIR%%/postgres/standard-create.sql	257	%%PGSQL%%%%DATADIR%%/postgres/standard-create.sql
Lines 348-353 Link Here
348	%%PORTDOCS%%%%DOCSDIR%%/modules/README.tsilo	354	%%PORTDOCS%%%%DOCSDIR%%/modules/README.tsilo
349	%%PORTDOCS%%%%DOCSDIR%%/modules/README.uac_redirect	355	%%PORTDOCS%%%%DOCSDIR%%/modules/README.uac_redirect
350	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp	356	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp
		357	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp_prom
351	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp_rpc	358	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp_rpc
352	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xlog	359	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xlog
353	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xprint	360	%%PORTDOCS%%%%DOCSDIR%%/modules/README.xprint
Lines 401-406 Link Here
401	%%TLS%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.tls	408	%%TLS%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.tls
402	%%TLS%%@sample %%ETCDIR%%/tls.cfg.sample	409	%%TLS%%@sample %%ETCDIR%%/tls.cfg.sample
403	%%TLS%%lib/kamailio/modules/tls.so	410	%%TLS%%lib/kamailio/modules/tls.so
		411	%%TLS%%lib/kamailio/openssl_mutex_shared/openssl_mutex_shared.so
404	%%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_unixodbc	412	%%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_unixodbc
405	%%UNIXODBC%%lib/kamailio/modules/db_unixodbc.so	413	%%UNIXODBC%%lib/kamailio/modules/db_unixodbc.so
406	%%WEBSOCKET%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.websocket	414	%%WEBSOCKET%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.websocket
Lines 504-509 Link Here
504	lib/kamailio/modules/tsilo.so	512	lib/kamailio/modules/tsilo.so
505	lib/kamailio/modules/uac_redirect.so	513	lib/kamailio/modules/uac_redirect.so
506	lib/kamailio/modules/xhttp.so	514	lib/kamailio/modules/xhttp.so
		515	lib/kamailio/modules/xhttp_prom.so
507	lib/kamailio/modules/xhttp_rpc.so	516	lib/kamailio/modules/xhttp_rpc.so
508	lib/kamailio/modules/xlog.so	517	lib/kamailio/modules/xlog.so
509	lib/kamailio/modules/xprint.so	518	lib/kamailio/modules/xprint.so