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

Collapse All | Expand All

(-)net/kamailio/Makefile (-4 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	kamailio
4
PORTNAME=	kamailio
5
PORTVERSION=	5.3.3
5
PORTVERSION=	5.3.5
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 126-132 Link Here
126
.endif
126
.endif
127
127
128
post-patch:
128
post-patch:
129
	${REINPLACE_CMD} '554s|$$(run_prefix)/$$(run_dir)|${KAMAILIO_RUNDIR}|' \
129
	${REINPLACE_CMD} '563s|run_target = $$(run_prefix)/$$(run_dir)|run_target = ${KAMAILIO_RUNDIR}|' \
130
		${WRKSRC}/src/Makefile.defs
130
		${WRKSRC}/src/Makefile.defs
131
131
132
post-patch-DOCS-off:
132
post-patch-DOCS-off:
Lines 137-143 Link Here
137
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CFG_ARGS} cfg
137
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CFG_ARGS} cfg
138
138
139
do-install:
139
do-install:
140
	@${MKDIR} ${STAGEDIR}${KAMAILIO_RUNDIR}
141
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
140
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
142
	@(cd ${STAGEDIR}${ETCDIR}; for i in `${FIND} . -type f`; do ${MV} $$i $$i.sample; done)
141
	@(cd ${STAGEDIR}${ETCDIR}; for i in `${FIND} . -type f`; do ${MV} $$i $$i.sample; done)
143
142
Lines 147-152 Link Here
147
	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so.1' -exec ${STRIP_CMD} {} +
146
	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so.1' -exec ${STRIP_CMD} {} +
148
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamailio
147
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamailio
149
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamcmd
148
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamcmd
150
	@${ECHO_CMD} "@dir(${KAMAILIO_USER},${KAMAILIO_GROUP},750) ${KAMAILIO_RUNDIR}" >> ${TMPPLIST}
151
149
152
.include <bsd.port.post.mk>
150
.include <bsd.port.post.mk>
(-)net/kamailio/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1584945539
1
TIMESTAMP = 1593173267
2
SHA256 (kamailio-5.3.3_src.tar.gz) = 2443f8aad3584b009b51948dc41982060b9ffc76be8016aa4e7de25b83be5b0a
2
SHA256 (kamailio-5.3.5_src.tar.gz) = 5e192a03a936a5a51f3b8363dfa5b15d350c3590cc7548609156b554bc6d0e94
3
SIZE (kamailio-5.3.3_src.tar.gz) = 12447194
3
SIZE (kamailio-5.3.5_src.tar.gz) = 12480234
(-)net/kamailio/files/kamailio.in (-1 / +3 lines)
Lines 48-54 Link Here
48
48
49
kamailio_start_precmd()
49
kamailio_start_precmd()
50
{
50
{
51
	install -d -m 0750 -o ${kamailio_user} -g ${kamailio_group} "%%KAMAILIO_RUNDIR%%"
51
	if [ ! -d "%%KAMAILIO_RUNDIR%%" ]; then
52
		install -d -m 0750 -o ${kamailio_user} -g ${kamailio_group} "%%KAMAILIO_RUNDIR%%"
53
	fi
52
}
54
}
53
55
54
kamailio_checkconfig()
56
kamailio_checkconfig()
(-)net/kamailio/files/patch-src_Makefile.defs (-5 / +5 lines)
Lines 1-6 Link Here
1
--- src/Makefile.defs.orig	2019-10-17 11:30:50 UTC
1
--- src/Makefile.defs.orig	2020-05-06 13:20:45 UTC
2
+++ src/Makefile.defs
2
+++ src/Makefile.defs
3
@@ -245,7 +245,7 @@ YACC := $(shell echo "$${YACC}")
3
@@ -257,7 +257,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
@@ -259,7 +259,7 @@ MKTAGS=ctags
12
@@ -271,7 +271,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
@@ -444,7 +444,7 @@ LIBDIR ?=
21
@@ -456,7 +456,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
@@ -1818,7 +1818,7 @@ ifeq ($(YACC),)
30
@@ -1830,7 +1830,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)
(-)net/kamailio/pkg-plist (+1 lines)
Lines 47-52 Link Here
47
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/rtpengine
47
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/rtpengine
48
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/rtpproxy
48
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/rtpproxy
49
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/sca_subscriptions
49
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/sca_subscriptions
50
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/secfilter
50
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/silo
51
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/silo
51
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/sip_trace
52
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/sip_trace
52
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/speed_dial
53
%%DATABASE%%%%DATADIR%%/dbtext/kamailio/speed_dial

Return to bug 246510