net/kamailio: 4.2.4 -> 4.3.1

Release-Notes: http://www.kamailio.org/w/kamailio-v4-3-0-release-notes/
New features: http://www.kamailio.org/wiki/features/new-in-4.3.x

- tries to fix installation issues with non-default options
- adds WEBSOCKET option

PR:		200352

17 files changed, 228 insertions, 300 deletions

diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index 64cd6339d3df..12b3a9aabe4a 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -1,10 +1,8 @@
 # Created by: Oliver Mahmoudi <olivermahmoudi@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	kamailio
-PORTVERSION=	4.2.4
-PORTREVISION=	1
+PORTVERSION=	4.3.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
@@ -33,12 +31,14 @@ USE_RC_SUBR=	kamailio
 USERS=		kamailio
 GROUPS=		kamailio
 
-OPTIONS_DEFINE=	DOCS MYSQL PGSQL RADIUS JITSI JABBER TLS UNIXODBC PRESENCE
+OPTIONS_DEFINE=	DOCS MYSQL PGSQL RADIUS JITSI JABBER TLS UNIXODBC \
+		PRESENCE WEBSOCKET
 OPTIONS_DEFAULT=MYSQL RADIUS JABBER TLS PRESENCE
 OPTIONS_SUB=	YES
 
 JITSI_DESC=	VoIP Frontend GUI via Jitsi
 PRESENCE_DESC=	Presence support
+WEBSOCKET_DESC=	Websocket support
 
 MYSQL_USE=	mysql=yes
 PGSQL_USES=	pgsql
@@ -83,6 +83,11 @@ EXTRA_MODULES+=	tls
 EXTRA_GROUPS+=	presence
 .endif
 
+.if ${PORT_OPTIONS:MWEBSOCKET}
+EXTRA_MODULES+=	websocket
+LIB_DEPENDS+=	libunistring.so:${PORTSDIR}/devel/libunistring
+.endif
+
 .if !empty (EXTRA_GROUPS)
 MAKE_ARGS+=	group_include="${DEFAULT_GROUP_INCLUDE} ${EXTRA_GROUPS}"
 .else
@@ -138,7 +143,8 @@ post-stage:
 	presence_mwi \
 	presence_profile presence_reginfo presence_xml pua_bla \
 	pua_dialoginfo pua_mi pua_reginfo pua_usrloc rls \
-	acc_radius misc_radius peering pua pua_xmpp xcap_client xcap_server
+	acc_radius misc_radius peering pua pua_xmpp xcap_client xcap_server \
+	tcpops auth_xkeys statsd dmq_usrloc rtjson websocket
 	@if [ -e ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/${i}.so ]; then \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/${i}.so; \
 	fi
@@ -167,5 +173,8 @@ post-stage:
 
 do-install:
 	cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET}
+.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
+	${RMDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo
index 51b0a9a3a336..22deb662b1c0 100644
--- a/net/kamailio/distinfo
+++ b/net/kamailio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kamailio-4.2.4_src.tar.gz) = 6cc16f8d8759f555f836371780f9a9de087a09e14a1468c07dbe50dcf03c884d
-SIZE (kamailio-4.2.4_src.tar.gz) = 11171494
+SHA256 (kamailio-4.3.1_src.tar.gz) = da5216b2116f1d76189c61697eeea4ee787c168b0209c9a89e03aac65d179908
+SIZE (kamailio-4.3.1_src.tar.gz) = 11335477
diff --git a/net/kamailio/files/patch-Makefile b/net/kamailio/files/patch-Makefile
index 73c014cf6030..e2c4fee9a7e4 100644
--- a/net/kamailio/files/patch-Makefile
+++ b/net/kamailio/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2014-10-16 14:46:22.000000000 +0200
-+++ Makefile	2014-11-09 11:52:07.000000000 +0100
-@@ -95,7 +95,7 @@
+--- Makefile.orig	2015-07-20 13:16:24 UTC
++++ Makefile
+@@ -34,7 +34,7 @@ err_fail?=1
  # whether or not to install $(MAIN_NAME).cfg or just $(MAIN_NAME).cfg.default
  # ($(MAIN_NAME).cfg will never be overwritten by make install, this is usefull
  #  when creating packages)
@@ -9,7 +9,16 @@
  
  #extra modules to exclude
  skip_modules?=
-@@ -819,10 +819,10 @@
+@@ -646,7 +646,7 @@ sunpkg:
+ .PHONY: install
+ install: mk_params="compile_for_install=yes"
+ install: install-bin install-every-module install-cfg \
+-	install-doc install-man install-utils install-share
++	install-man install-utils install-share
+ 
+ .PHONY: dbinstall
+ dbinstall:
+@@ -761,10 +761,10 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
  				fi ; \
  			fi ; \
  			: ; done; true
diff --git a/net/kamailio/files/patch-Makefile.defs b/net/kamailio/files/patch-Makefile.defs
index ada442d3a67e..b801cab84589 100644
--- a/net/kamailio/files/patch-Makefile.defs
+++ b/net/kamailio/files/patch-Makefile.defs
@@ -1,6 +1,6 @@
---- Makefile.defs.orig	2014-10-16 14:46:23.000000000 +0200
-+++ Makefile.defs	2014-11-09 11:54:46.000000000 +0100
-@@ -264,7 +264,7 @@
+--- Makefile.defs.orig	2015-07-20 13:16:26 UTC
++++ Makefile.defs
+@@ -197,7 +197,7 @@ YACC := $(shell echo "$${YACC}")
  
  # find compiler name & version
  ifeq ($(CC),)
@@ -9,7 +9,7 @@
  endif
  LD= $(CC)
  CC_LONGVER:=$(shell if  $(CC) -v 2>/dev/null; then \
-@@ -278,7 +278,7 @@
+@@ -211,7 +211,7 @@ MKTAGS=ctags
  #find-out the compiler's name
  
  ifneq (,$(findstring gcc, $(CC_LONGVER)))
@@ -18,7 +18,7 @@
  	RPAREN=)
  	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\
  				sed  -e 's/([^$(RPAREN)]*)//g' \
-@@ -431,7 +431,7 @@
+@@ -366,7 +366,7 @@ LIBDIR ?=
  ifeq ($(LIBDIR),)
  ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
  ifeq ($(ARCHBSZ),64b)
@@ -27,19 +27,7 @@
  else
  	LIBDIR = lib
  endif
-@@ -945,10 +945,7 @@
- ifeq		($(CC_NAME), clang)
- $(call                          set_if_empty,CPU,athlon64)
- 					C_DEFS+=-DCC_GCC_LIKE_ASM
--                                        CFLAGS+=-g -m32
--                                                $(CC_OPT) \
--                                                          \
--                                                -mtune=$(CPU)
-+                                        CFLAGS+=-g -m32 $(CC_OPT) -mtune=$(CPU)
-                                         LDFLAGS+=-m32
- else			# CC_NAME, clang
- ifeq		($(CC_NAME), icc)
-@@ -1744,7 +1741,7 @@
+@@ -1693,7 +1693,7 @@ ifeq ($(YACC),)
  endif
  YACC_FLAGS=-d -b cfg
  # on solaris add -lxnet (e.g. LIBS= -lxnet)
diff --git a/net/kamailio/files/patch-ip__addr.h b/net/kamailio/files/patch-ip__addr.h
new file mode 100644
index 000000000000..433cc851eb26
--- /dev/null
+++ b/net/kamailio/files/patch-ip__addr.h
@@ -0,0 +1,13 @@
+--- ip_addr.h.orig	2015-09-05 21:17:34 UTC
++++ ip_addr.h
+@@ -53,6 +53,10 @@ enum comp_methods { COMP_NONE, COMP_SIGC
+ #define INADDR_LOOPBACK         (u_int32_t)0x7f000001
+ #endif
+ 
++#ifndef INADDR_LOOPBACK
++#define INADDR_LOOPBACK         (u_int32_t)0x7f000001
++#endif
++
+ struct ip_addr{
+ 	unsigned int af; /* address family: AF_INET6 or AF_INET */
+ 	unsigned int len;    /* address len, 16 or 4 */
diff --git a/net/kamailio/files/patch-ip_addr_h b/net/kamailio/files/patch-ip_addr_h
deleted file mode 100644
index 6d58de0d7338..000000000000
--- a/net/kamailio/files/patch-ip_addr_h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ip_addr.h.orig      2015-02-08 08:55:12.465621472 +0800
-+++ ip_addr.h   2015-02-08 08:57:10.297609516 +0800
-@@ -59,6 +59,10 @@
- enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ };
- #endif
- 
-+#ifndef INADDR_LOOPBACK
-+#define INADDR_LOOPBACK         (u_int32_t)0x7f000001
-+#endif
-+
- struct ip_addr{
-        unsigned int af; /* address family: AF_INET6 or AF_INET */
-        unsigned int len;    /* address len, 16 or 4 */
diff --git a/net/kamailio/files/patch-main.c b/net/kamailio/files/patch-main.c
new file mode 100644
index 000000000000..4aac88f1a5b3
--- /dev/null
+++ b/net/kamailio/files/patch-main.c
@@ -0,0 +1,11 @@
+--- main.c.orig	2015-07-20 13:16:25 UTC
++++ main.c
+@@ -353,7 +353,7 @@ int received_dns = 0;
+ int sr_auto_aliases=1;
+ char* working_dir = 0;
+ char* chroot_dir = 0;
+-char* runtime_dir = "" RUN_DIR;
++char* runtime_dir = "/var/run/kamailio/";
+ char* user=0;
+ char* group=0;
+ int uid = 0;
diff --git a/net/kamailio/files/patch-modules__db_berkeley__Makefile b/net/kamailio/files/patch-modules__db_berkeley__Makefile
index 8d117ef0b2e8..e7134aad1ce5 100644
--- a/net/kamailio/files/patch-modules__db_berkeley__Makefile
+++ b/net/kamailio/files/patch-modules__db_berkeley__Makefile
@@ -1,6 +1,6 @@
---- modules/db_berkeley/Makefile.orig	2014-08-06 15:29:51 UTC
+--- modules/db_berkeley/Makefile.orig	2015-07-20 13:16:25 UTC
 +++ modules/db_berkeley/Makefile
-@@ -25,7 +25,7 @@
+@@ -24,7 +24,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
  # extra install for kamailio
  
  install-berkeley-scripts: $(bin_prefix)/$(bin_dir)
diff --git a/net/kamailio/files/patch-modules__db_oracle__Makefile b/net/kamailio/files/patch-modules__db_oracle__Makefile
index d6c37951ddbc..992f78d0583f 100644
--- a/net/kamailio/files/patch-modules__db_oracle__Makefile
+++ b/net/kamailio/files/patch-modules__db_oracle__Makefile
@@ -1,6 +1,6 @@
---- modules/db_oracle/Makefile.orig	2014-08-06 15:29:51 UTC
+--- modules/db_oracle/Makefile.orig	2015-07-20 13:16:25 UTC
 +++ modules/db_oracle/Makefile
-@@ -71,7 +71,7 @@
+@@ -70,7 +70,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
  # extra install for kamailio
  
  install-oracle-scripts: $(bin_prefix)/$(bin_dir)
diff --git a/net/kamailio/files/patch-modules__db_sqlite__Makefile b/net/kamailio/files/patch-modules__db_sqlite__Makefile
index b40a01c50f28..3e484f9565a0 100644
--- a/net/kamailio/files/patch-modules__db_sqlite__Makefile
+++ b/net/kamailio/files/patch-modules__db_sqlite__Makefile
@@ -1,6 +1,6 @@
---- modules/db_sqlite/Makefile.orig	2014-08-06 15:29:51 UTC
+--- modules/db_sqlite/Makefile.orig	2015-07-20 13:16:25 UTC
 +++ modules/db_sqlite/Makefile
-@@ -23,7 +23,7 @@
+@@ -22,7 +22,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
  # extra install for kamailio
  
  install-sqlite-scripts: $(bin_prefix)/$(bin_dir)
diff --git a/net/kamailio/files/patch-modules__tls__Makefile b/net/kamailio/files/patch-modules__tls__Makefile
index 85963f7075ad..26ae1d581834 100644
--- a/net/kamailio/files/patch-modules__tls__Makefile
+++ b/net/kamailio/files/patch-modules__tls__Makefile
@@ -1,6 +1,6 @@
---- modules/tls/Makefile.orig	2014-08-06 15:29:51 UTC
+--- modules/tls/Makefile.orig	2015-07-20 13:16:26 UTC
 +++ modules/tls/Makefile
-@@ -9,6 +9,8 @@
+@@ -8,6 +8,8 @@ include ../../Makefile.defs
  auto_gen=
  NAME=tls.so
  
diff --git a/net/kamailio/files/patch-modules_ctl_ctl__defaults.h b/net/kamailio/files/patch-modules_ctl_ctl__defaults.h
new file mode 100644
index 000000000000..294f990c8e6f
--- /dev/null
+++ b/net/kamailio/files/patch-modules_ctl_ctl__defaults.h
@@ -0,0 +1,15 @@
+--- modules/ctl/ctl_defaults.h.orig	2015-07-20 13:16:25 UTC
++++ modules/ctl/ctl_defaults.h
+@@ -4,10 +4,10 @@
+ /*listen by default on: */
+ #ifdef SRNAME
+ /* this is used when compiling sercmd tool */
+-#define DEFAULT_CTL_SOCKET  "unixs:" RUN_DIR "/" SRNAME "_ctl"
++#define DEFAULT_CTL_SOCKET  "unixs:" "/var/run/" SRNAME "_ctl"
+ #else
+ /* this is used when compiling sip server */
+-#define DEFAULT_CTL_SOCKET  "unixs:" RUN_DIR "/" NAME "_ctl"
++#define DEFAULT_CTL_SOCKET  "unixs:" "/var/run/" NAME "_ctl"
+ #endif
+ /* port used by default for tcp/udp if no port is explicitely specified */
+ #define DEFAULT_CTL_PORT 2049
diff --git a/net/kamailio/files/patch-modules_tls_sip-router__cert.sh b/net/kamailio/files/patch-modules_tls_sip-router__cert.sh
new file mode 100644
index 000000000000..404cd62ec24c
--- /dev/null
+++ b/net/kamailio/files/patch-modules_tls_sip-router__cert.sh
@@ -0,0 +1,9 @@
+--- modules/tls/sip-router_cert.sh.orig	2015-07-20 13:16:26 UTC
++++ modules/tls/sip-router_cert.sh
+@@ -197,5 +197,6 @@ if [ $? != 0 ] ; then
+ else
+ 	echo "Private key stored in '$DIR/$KEY_FILENAME'."
+ 	echo "Certificate stored in '$DIR/$CERT_FILENAME'."
++	rm ~/.rnd
+ 	exit 0;
+ fi
diff --git a/net/kamailio/files/patch-modules_websocket_ws__frame.c b/net/kamailio/files/patch-modules_websocket_ws__frame.c
new file mode 100644
index 000000000000..e5c83ea00ff4
--- /dev/null
+++ b/net/kamailio/files/patch-modules_websocket_ws__frame.c
@@ -0,0 +1,11 @@
+--- modules/websocket/ws_frame.c.orig	2015-09-05 21:18:25 UTC
++++ modules/websocket/ws_frame.c
+@@ -29,7 +29,7 @@
+ #ifdef EMBEDDED_UTF8_DECODE
+ #include "utf8_decode.h"
+ #else
+-#include <unistr.h>
++/* #include <unistr.h> */
+ #endif
+ 
+ #include "../../events.h"
diff --git a/net/kamailio/files/patch-utils__sercmd__Makefile b/net/kamailio/files/patch-utils__kamcmd__Makefile
index 050ccdcfe326..74a4f91faa66 100644
--- a/net/kamailio/files/patch-utils__sercmd__Makefile
+++ b/net/kamailio/files/patch-utils__kamcmd__Makefile
@@ -1,7 +1,7 @@
---- utils/sercmd/Makefile.orig	2015-01-11 14:54:24.246707463 +0100
-+++ utils/sercmd/Makefile	2015-01-11 14:56:12.692702813 +0100
-@@ -12,7 +12,7 @@
- 	NAME=sercmd
+--- utils/kamcmd/Makefile.orig	2015-07-20 13:16:26 UTC
++++ utils/kamcmd/Makefile
+@@ -12,7 +12,7 @@ else
+ 	NAME=kamcmd
  endif
  
 -readline_locations= /usr/include/readline/readline.h \
@@ -9,7 +9,7 @@
  					$(LOCALBASE)/include/readline/readline.h
  
  use_readline ?=
-@@ -71,8 +71,8 @@
+@@ -72,8 +72,8 @@ endif
  endif
  
  ifeq ($(use_readline),1)
diff --git a/net/kamailio/files/patch-utils__kamctl__Makefile b/net/kamailio/files/patch-utils__kamctl__Makefile
index a38a291d1cd5..31b892dfc74c 100644
--- a/net/kamailio/files/patch-utils__kamctl__Makefile
+++ b/net/kamailio/files/patch-utils__kamctl__Makefile
@@ -1,15 +1,15 @@
---- utils/kamctl/Makefile.orig	2014-08-06 15:29:51 UTC
+--- utils/kamctl/Makefile.orig	2015-07-20 13:16:26 UTC
 +++ utils/kamctl/Makefile
-@@ -3,6 +3,8 @@
- include $(COREPATH)/Makefile.defs
- include $(COREPATH)/config.mak
+@@ -9,6 +9,8 @@ else
+ kamctltmpdir = $(basedir)
+ endif
  
 +skip_cfg_install?=yes
 +
  all:
  		@echo "No compilation needed for kamctl"
  
-@@ -15,7 +17,8 @@
+@@ -21,7 +23,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
  		$(INSTALL_TOUCH)   $(cfg_prefix)/$(cfg_dir)/kamctlrc.sample
  		$(INSTALL_CFG) kamctlrc \
  			$(cfg_prefix)/$(cfg_dir)/kamctlrc.sample
diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
index acbcdfe5e002..acb7139539de 100644
--- a/net/kamailio/pkg-plist
+++ b/net/kamailio/pkg-plist
@@ -20,15 +20,15 @@ lib/kamailio/libprint.so
 lib/kamailio/libprint.so.1
 lib/kamailio/libsrdb1.so
 lib/kamailio/libsrdb1.so.1
-lib/kamailio/libsrdb2.so
-lib/kamailio/libsrdb2.so.1
+%%MYSQL%%lib/kamailio/libsrdb2.so
+%%MYSQL%%lib/kamailio/libsrdb2.so.1
 lib/kamailio/libsrutils.so
 lib/kamailio/libsrutils.so.1
-lib/kamailio/libtrie.so
-lib/kamailio/libtrie.so.1
+%%MYSQL%%lib/kamailio/libtrie.so
+%%MYSQL%%lib/kamailio/libtrie.so.1
 lib/kamailio/kamctl/kamctl.base
 lib/kamailio/kamctl/kamctl.ctlbase
-lib/kamailio/kamctl/kamctl.dbtext
+%%MYSQL%%lib/kamailio/kamctl/kamctl.dbtext
 lib/kamailio/kamctl/kamctl.fifo
 %%MYSQL%%lib/kamailio/kamctl/kamctl.mysql
 %%PGSQL%%lib/kamailio/kamctl/kamctl.pgsql
@@ -37,101 +37,105 @@ lib/kamailio/kamctl/kamctl.ser_mi
 lib/kamailio/kamctl/kamctl.sqlbase
 lib/kamailio/kamctl/kamctl.unixsock
 lib/kamailio/kamctl/kamdbctl.base
-lib/kamailio/kamctl/kamdbctl.dbtext
+%%MYSQL%%lib/kamailio/kamctl/kamdbctl.dbtext
 %%MYSQL%%lib/kamailio/kamctl/kamdbctl.mysql
 %%PGSQL%%lib/kamailio/kamctl/kamdbctl.pgsql
-lib/kamailio/kamctl/dbtextdb/dbtextdb.py
-lib/kamailio/modules/acc.so
-lib/kamailio/modules/alias_db.so
+%%MYSQL%%lib/kamailio/kamctl/dbtextdb/dbtextdb.py
+%%MYSQL%%lib/kamailio/modules/acc.so
+%%MYSQL%%lib/kamailio/modules/alias_db.so
 lib/kamailio/modules/async.so
 lib/kamailio/modules/auth.so
-lib/kamailio/modules/auth_db.so
+%%MYSQL%%lib/kamailio/modules/auth_db.so
 lib/kamailio/modules/auth_diameter.so
 %%RADIUS%%lib/kamailio/modules/auth_radius.so
+lib/kamailio/modules/auth_xkeys.so
 lib/kamailio/modules/avp.so
-lib/kamailio/modules/avpops.so
+%%MYSQL%%lib/kamailio/modules/avpops.so
 lib/kamailio/modules/benchmark.so
 lib/kamailio/modules/blst.so
 lib/kamailio/modules/call_control.so
-lib/kamailio/modules/cfg_db.so
+%%MYSQL%%lib/kamailio/modules/cfg_db.so
 lib/kamailio/modules/cfg_rpc.so
 lib/kamailio/modules/cfgutils.so
-lib/kamailio/modules/cnxcc.so
 lib/kamailio/modules/corex.so
 lib/kamailio/modules/counters.so
 lib/kamailio/modules/ctl.so
-lib/kamailio/modules/db_cluster.so
-lib/kamailio/modules/db_flatstore.so
+%%MYSQL%%lib/kamailio/modules/db_cluster.so
+%%MYSQL%%lib/kamailio/modules/db_flatstore.so
 %%MYSQL%%lib/kamailio/modules/db_mysql.so
 %%PGSQL%%lib/kamailio/modules/db_postgres.so
 %%UNIXODBC%%lib/kamailio/modules/db_unixodbc.so
 %%TLS%%lib/kamailio/modules/tls.so
-lib/kamailio/modules/db_text.so
+%%MYSQL%%lib/kamailio/modules/db_text.so
 lib/kamailio/modules/debugger.so
-lib/kamailio/modules/dialog.so
-lib/kamailio/modules/dispatcher.so
+%%MYSQL%%lib/kamailio/modules/dialog.so
+%%MYSQL%%lib/kamailio/modules/dispatcher.so
 lib/kamailio/modules/diversion.so
 lib/kamailio/modules/dmq.so
-lib/kamailio/modules/domain.so
+lib/kamailio/modules/dmq_usrloc.so
+%%MYSQL%%lib/kamailio/modules/domain.so
 lib/kamailio/modules/domainpolicy.so
-lib/kamailio/modules/drouting.so
+%%MYSQL%%lib/kamailio/modules/drouting.so
 lib/kamailio/modules/enum.so
 lib/kamailio/modules/exec.so
-lib/kamailio/modules/group.so
-lib/kamailio/modules/htable.so
-lib/kamailio/modules/imc.so
+%%MYSQL%%lib/kamailio/modules/group.so
+%%MYSQL%%lib/kamailio/modules/htable.so
+%%MYSQL%%lib/kamailio/modules/imc.so
 lib/kamailio/modules/ipops.so
 lib/kamailio/modules/jsonrpc-s.so
 lib/kamailio/modules/kex.so
 lib/kamailio/modules/malloc_test.so
 lib/kamailio/modules/mangler.so
-lib/kamailio/modules/matrix.so
+%%MYSQL%%lib/kamailio/modules/matrix.so
 lib/kamailio/modules/maxfwd.so
 lib/kamailio/modules/mediaproxy.so
 lib/kamailio/modules/mi_datagram.so
 lib/kamailio/modules/mi_fifo.so
 lib/kamailio/modules/mi_rpc.so
-lib/kamailio/modules/mohqueue.so
+%%MYSQL%%lib/kamailio/modules/mohqueue.so
 lib/kamailio/modules/mqueue.so
-lib/kamailio/modules/msilo.so
+%%MYSQL%%lib/kamailio/modules/msilo.so
 lib/kamailio/modules/msrp.so
-lib/kamailio/modules/mtree.so
+%%MYSQL%%lib/kamailio/modules/mtree.so
 lib/kamailio/modules/nat_traversal.so
 lib/kamailio/modules/nathelper.so
 lib/kamailio/modules/nosip.so
-lib/kamailio/modules/p_usrloc.so
+%%MYSQL%%lib/kamailio/modules/p_usrloc.so
 lib/kamailio/modules/path.so
 lib/kamailio/modules/pdb.so
-lib/kamailio/modules/pdt.so
-lib/kamailio/modules/permissions.so
+%%MYSQL%%lib/kamailio/modules/pdt.so
+%%MYSQL%%lib/kamailio/modules/permissions.so
 lib/kamailio/modules/pike.so
-lib/kamailio/modules/pipelimit.so
-lib/kamailio/modules/prefix_route.so
+%%MYSQL%%lib/kamailio/modules/pipelimit.so
+%%MYSQL%%lib/kamailio/modules/prefix_route.so
 lib/kamailio/modules/print.so
 lib/kamailio/modules/print_lib.so
 lib/kamailio/modules/pv.so
 lib/kamailio/modules/qos.so
 lib/kamailio/modules/ratelimit.so
-lib/kamailio/modules/registrar.so
+%%MYSQL%%lib/kamailio/modules/registrar.so
 lib/kamailio/modules/rr.so
 lib/kamailio/modules/rtimer.so
+lib/kamailio/modules/rtjson.so
 lib/kamailio/modules/rtpengine.so
 lib/kamailio/modules/rtpproxy.so
 lib/kamailio/modules/sanity.so
 lib/kamailio/modules/sca.so
 lib/kamailio/modules/sdpops.so
 lib/kamailio/modules/seas.so
-lib/kamailio/modules/sipcapture.so
+%%MYSQL%%lib/kamailio/modules/sipcapture.so
 lib/kamailio/modules/sipt.so
-lib/kamailio/modules/siptrace.so
+%%MYSQL%%lib/kamailio/modules/siptrace.so
 lib/kamailio/modules/siputils.so
 lib/kamailio/modules/sl.so
 lib/kamailio/modules/sms.so
-lib/kamailio/modules/speeddial.so
-lib/kamailio/modules/sqlops.so
+%%MYSQL%%lib/kamailio/modules/speeddial.so
+%%MYSQL%%lib/kamailio/modules/sqlops.so
 lib/kamailio/modules/sst.so
 lib/kamailio/modules/statistics.so
+lib/kamailio/modules/statsd.so
 lib/kamailio/modules/stun.so
+lib/kamailio/modules/tcpops.so
 lib/kamailio/modules/textops.so
 lib/kamailio/modules/textopsx.so
 lib/kamailio/modules/timer.so
@@ -139,82 +143,84 @@ lib/kamailio/modules/tm.so
 lib/kamailio/modules/tmrec.so
 lib/kamailio/modules/tmx.so
 lib/kamailio/modules/topoh.so
-lib/kamailio/modules/uac.so
+lib/kamailio/modules/tsilo.so
+%%MYSQL%%lib/kamailio/modules/uac.so
 lib/kamailio/modules/uac_redirect.so
-lib/kamailio/modules/uri_db.so
-lib/kamailio/modules/userblacklist.so
-lib/kamailio/modules/usrloc.so
+%%MYSQL%%lib/kamailio/modules/uri_db.so
+%%MYSQL%%lib/kamailio/modules/userblacklist.so
+%%MYSQL%%lib/kamailio/modules/usrloc.so
+%%WEBSOCKET%%lib/kamailio/modules/websocket.so
 lib/kamailio/modules/xhttp.so
 lib/kamailio/modules/xhttp_rpc.so
 lib/kamailio/modules/xlog.so
 lib/kamailio/modules/xprint.so
-%%DATADIR%%/dbtext/kamailio/acc
-%%DATADIR%%/dbtext/kamailio/acc_cdrs
-%%DATADIR%%/dbtext/kamailio/active_watchers
-%%DATADIR%%/dbtext/kamailio/address
-%%DATADIR%%/dbtext/kamailio/aliases
-%%DATADIR%%/dbtext/kamailio/carrier_name
-%%DATADIR%%/dbtext/kamailio/carrierfailureroute
-%%DATADIR%%/dbtext/kamailio/carrierroute
-%%DATADIR%%/dbtext/kamailio/cpl
-%%DATADIR%%/dbtext/kamailio/dbaliases
-%%DATADIR%%/dbtext/kamailio/dialog
-%%DATADIR%%/dbtext/kamailio/dialog_vars
-%%DATADIR%%/dbtext/kamailio/dialplan
-%%DATADIR%%/dbtext/kamailio/dispatcher
-%%DATADIR%%/dbtext/kamailio/domain
-%%DATADIR%%/dbtext/kamailio/domain_attrs
-%%DATADIR%%/dbtext/kamailio/domain_name
-%%DATADIR%%/dbtext/kamailio/domainpolicy
-%%DATADIR%%/dbtext/kamailio/dr_gateways
-%%DATADIR%%/dbtext/kamailio/dr_groups
-%%DATADIR%%/dbtext/kamailio/dr_gw_lists
-%%DATADIR%%/dbtext/kamailio/dr_rules
-%%DATADIR%%/dbtext/kamailio/globalblacklist
-%%DATADIR%%/dbtext/kamailio/grp
-%%DATADIR%%/dbtext/kamailio/htable
-%%DATADIR%%/dbtext/kamailio/imc_members
-%%DATADIR%%/dbtext/kamailio/imc_rooms
-%%DATADIR%%/dbtext/kamailio/lcr_gw
-%%DATADIR%%/dbtext/kamailio/lcr_rule
-%%DATADIR%%/dbtext/kamailio/lcr_rule_target
-%%DATADIR%%/dbtext/kamailio/location
-%%DATADIR%%/dbtext/kamailio/location_attrs
-%%DATADIR%%/dbtext/kamailio/matrix
-%%DATADIR%%/dbtext/kamailio/missed_calls
-%%DATADIR%%/dbtext/kamailio/mohqcalls
-%%DATADIR%%/dbtext/kamailio/mohqueues
-%%DATADIR%%/dbtext/kamailio/mtree
-%%DATADIR%%/dbtext/kamailio/mtrees
-%%DATADIR%%/dbtext/kamailio/pdt
-%%DATADIR%%/dbtext/kamailio/pl_pipes
-%%DATADIR%%/dbtext/kamailio/presentity
-%%DATADIR%%/dbtext/kamailio/pua
-%%DATADIR%%/dbtext/kamailio/purplemap
-%%DATADIR%%/dbtext/kamailio/re_grp
-%%DATADIR%%/dbtext/kamailio/rls_presentity
-%%DATADIR%%/dbtext/kamailio/rls_watchers
-%%DATADIR%%/dbtext/kamailio/rtpproxy
-%%DATADIR%%/dbtext/kamailio/sca_subscriptions
-%%DATADIR%%/dbtext/kamailio/silo
-%%DATADIR%%/dbtext/kamailio/sip_trace
-%%DATADIR%%/dbtext/kamailio/speed_dial
-%%DATADIR%%/dbtext/kamailio/subscriber
-%%DATADIR%%/dbtext/kamailio/trusted
-%%DATADIR%%/dbtext/kamailio/uacreg
-%%DATADIR%%/dbtext/kamailio/uid_credentials
-%%DATADIR%%/dbtext/kamailio/uid_domain
-%%DATADIR%%/dbtext/kamailio/uid_domain_attrs
-%%DATADIR%%/dbtext/kamailio/uid_global_attrs
-%%DATADIR%%/dbtext/kamailio/uid_uri
-%%DATADIR%%/dbtext/kamailio/uid_uri_attrs
-%%DATADIR%%/dbtext/kamailio/uid_user_attrs
-%%DATADIR%%/dbtext/kamailio/uri
-%%DATADIR%%/dbtext/kamailio/userblacklist
-%%DATADIR%%/dbtext/kamailio/usr_preferences
-%%DATADIR%%/dbtext/kamailio/version
-%%DATADIR%%/dbtext/kamailio/watchers
-%%DATADIR%%/dbtext/kamailio/xcap
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/acc
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/acc_cdrs
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/active_watchers
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/address
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/aliases
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/carrier_name
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/carrierfailureroute
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/carrierroute
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/cpl
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dbaliases
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dialog
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dialog_vars
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dialplan
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dispatcher
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/domain
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/domain_attrs
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/domain_name
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/domainpolicy
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dr_gateways
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dr_groups
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dr_gw_lists
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/dr_rules
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/globalblacklist
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/grp
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/htable
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/imc_members
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/imc_rooms
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/lcr_gw
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/lcr_rule
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/lcr_rule_target
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/location
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/location_attrs
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/matrix
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/missed_calls
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/mohqcalls
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/mohqueues
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/mtree
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/mtrees
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/pdt
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/pl_pipes
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/presentity
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/pua
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/purplemap
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/re_grp
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/rls_presentity
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/rls_watchers
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/rtpproxy
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/sca_subscriptions
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/silo
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/sip_trace
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/speed_dial
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/subscriber
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/trusted
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uacreg
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uid_credentials
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uid_domain
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uid_domain_attrs
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uid_global_attrs
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uid_uri
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uid_uri_attrs
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uid_user_attrs
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/uri
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/userblacklist
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/usr_preferences
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/version
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/watchers
+%%MYSQL%%%%DATADIR%%/dbtext/kamailio/xcap
 %%MYSQL%%%%DATADIR%%/mysql/acc-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/alias_db-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/auth_db-create.sql
@@ -222,6 +228,7 @@ lib/kamailio/modules/xprint.so
 %%MYSQL%%%%DATADIR%%/mysql/carrierroute-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/cpl-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/dialog-create.sql
+%%MYSQL%%%%DATADIR%%/mysql/dialog_ng-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/dialplan-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/dispatcher-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/domain-create.sql
@@ -230,6 +237,7 @@ lib/kamailio/modules/xprint.so
 %%MYSQL%%%%DATADIR%%/mysql/group-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/htable-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/imc-create.sql
+%%MYSQL%%%%DATADIR%%/mysql/ims_charging_create.sql
 %%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_pcscf-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_scscf-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/lcr-create.sql
@@ -299,118 +307,6 @@ lib/kamailio/modules/xprint.so
 %%PGSQL%%%%DATADIR%%/postgres/uri_db-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/userblacklist-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/usrloc-create.sql
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README-MODULES
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.acc
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.alias_db
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.async
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.auth
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.auth_db
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.auth_diameter
-%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/modules/README.auth_radius
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.avp
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.avpops
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.benchmark
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.blst
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.call_control
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.cfg_db
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.cfg_rpc
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.cfgutils
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.cnxcc
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.corex
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.counters
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.ctl
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_cluster
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_flatstore
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/modules/README.db_mysql
-%%PORTDOCS%%%%PGSQL%%%%DOCSDIR%%/modules/README.db_postgres
-%%PORTDOCS%%%%UNIXODBC%%%%DOCSDIR%%/modules/README.db_unixodbc
-%%PORTDOCS%%%%TLS%%%%DOCSDIR%%/modules/README.tls
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_text
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.debugger
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.dialog
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.dispatcher
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.diversion
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.dmq
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.domain
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.domainpolicy
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.drouting
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.enum
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.exec
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.group
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.htable
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.imc
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.ipops
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.jsonrpc-s
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.kex
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.malloc_test
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.mangler
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.matrix
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.maxfwd
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.mediaproxy
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.mi_datagram
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.mi_fifo
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.mi_rpc
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.mohqueue
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.mqueue
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.msilo
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.msrp
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.mtree
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.nat_traversal
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.nathelper
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.nosip
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.p_usrloc
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.path
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.pdb
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.pdt
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.permissions
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.pike
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.pipelimit
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.prefix_route
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.print
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.print_lib
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.pv
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.qos
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.ratelimit
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.registrar
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.rr
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.rtimer
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.rtpengine
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.rtpproxy
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sanity
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sca
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sdpops
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.seas
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sipcapture
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sipt
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.siptrace
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.siputils
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sl
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sms
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.speeddial
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sqlops
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.sst
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.statistics
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.stun
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.textops
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.textopsx
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.timer
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.tm
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.tmrec
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.tmx
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.topoh
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.uac
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.uac_redirect
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.uri_db
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.userblacklist
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.usrloc
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp_rpc
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.xlog
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.xprint
 man/man5/kamailio.cfg.5.gz
 man/man8/kamailio.8.gz
 man/man8/kamcmd.8.gz
@@ -436,23 +332,3 @@ man/man8/kamdbctl.8.gz
 %%PRESENCE%%lib/kamailio/modules/pua_reginfo.so
 %%PRESENCE%%lib/kamailio/modules/pua_usrloc.so
 %%PRESENCE%%lib/kamailio/modules/rls.so
-%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/modules/README.acc_radius
-%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/modules/README.misc_radius
-%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/modules/README.peering
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_xmpp
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.xcap_client
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.xcap_server
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_conference
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_dialoginfo
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_mwi
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_profile
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_reginfo
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.presence_xml
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_bla
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_dialoginfo
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_mi
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_reginfo
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.pua_usrloc
-%%PORTDOCS%%%%PRESENCE%%%%DOCSDIR%%/modules/README.rls