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

Collapse All | Expand All

(-)Makefile (-8 / +23 lines)
Lines 17-31 Link Here
17
			libxmlrpc.so:net/xmlrpc-c \
17
			libxmlrpc.so:net/xmlrpc-c \
18
			libpcre.so:devel/pcre \
18
			libpcre.so:devel/pcre \
19
			libconfuse.so:devel/libconfuse \
19
			libconfuse.so:devel/libconfuse \
20
			librabbitmq.so:net/rabbitmq-c-devel \
21
			libhiredis.so:databases/hiredis \
22
			libexpat.so:textproc/expat2 \
20
			libexpat.so:textproc/expat2 \
23
			libcurl.so:ftp/curl \
21
			libcurl.so:ftp/curl \
24
			libjson-c.so:devel/json-c
22
			libjson-c.so:devel/json-c
25
BUILD_DEPENDS=		ginstall:sysutils/coreutils \
23
BUILD_DEPENDS=		ginstall:sysutils/coreutils \
26
			gtar:archivers/gtar \
24
			gtar:archivers/gtar \
27
			gm4:devel/m4 \
25
			gm4:devel/m4
28
			redis-server:databases/redis-devel
29
RUN_DEPENDS=		${LOCALBASE}/bin/bash:shells/bash \
26
RUN_DEPENDS=		${LOCALBASE}/bin/bash:shells/bash \
30
			${LOCALBASE}/bin/grep:textproc/gnugrep
27
			${LOCALBASE}/bin/grep:textproc/gnugrep
31
28
Lines 36-59 Link Here
36
33
37
USE_RC_SUBR=		opensips
34
USE_RC_SUBR=		opensips
38
35
39
USES=			gmake ncurses perl5 pkgconfig python:2.7 shebangfix ssl
36
USES=			gmake ncurses perl5 pkgconfig shebangfix ssl
40
USE_GCC=		yes
37
USE_GCC=		yes
41
38
42
NOPRECIOUSMAKEVARS=	yes
39
NOPRECIOUSMAKEVARS=	yes
43
40
44
OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL \
41
OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL \
45
			PGSQL RADIUS TESTS TLS UNIXODBC SQLITE
42
			PGSQL PYTHON RABBITMQ RADIUS REDIS TESTS TLS UNIXODBC SQLITE
46
OPTIONS_DEFAULT=	GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS
43
OPTIONS_DEFAULT=	GEOIP HTTP LDAP MEMCACHED PGSQL PYTHON RABBITMQ RADIUS REDIS TLS
47
OPTIONS_SUB=		yes
44
OPTIONS_SUB=		yes
48
45
49
GEOIP_DESC=		Build with GeoIP support
46
GEOIP_DESC=		Build with GeoIP support
50
HTTP_DESC=		Enable HTTP transport via libmicrohttpd
47
HTTP_DESC=		Enable HTTP transport via libmicrohttpd
51
MEMCACHED_DESC=		Build with memcached support
48
MEMCACHED_DESC=		Build with memcached support
52
TESTS_DESC=		Install smoke tests
49
TESTS_DESC=		Install smoke tests
50
RABBITMQ_DESC=	RabbitMQ/AMQP support
53
51
54
LDAP_USE=		OPENLDAP=client
52
LDAP_USE=		OPENLDAP=client
55
MYSQL_USE=		MYSQL=client
53
MYSQL_USE=		MYSQL=client
56
PGSQL_USES+=		pgsql
54
PGSQL_USES+=		pgsql
55
PYTHON_USES+=	python:2.7
57
56
58
PGSQL_BUILD_DEPENDS+=	p5-DBD-Pg>=3.4:databases/p5-DBD-Pg
57
PGSQL_BUILD_DEPENDS+=	p5-DBD-Pg>=3.4:databases/p5-DBD-Pg
59
RADIUS_LIB_DEPENDS+=	libradiusclient-ng.so:net/radiusclient
58
RADIUS_LIB_DEPENDS+=	libradiusclient-ng.so:net/radiusclient
Lines 62-67 Link Here
62
MEMCACHED_LIB_DEPENDS+=	libmemcached.so:databases/libmemcached
61
MEMCACHED_LIB_DEPENDS+=	libmemcached.so:databases/libmemcached
63
UNIXODBC_LIB_DEPENDS+=	libodbc.so:databases/unixODBC
62
UNIXODBC_LIB_DEPENDS+=	libodbc.so:databases/unixODBC
64
SQLITE_LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
63
SQLITE_LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
64
RABBITMQ_LIB_DEPENDS+=	librabbitmq.so:net/rabbitmq-c-devel
65
REDIS_LIB_DEPENDS+=	libhiredis.so:databases/hiredis
66
REDIS_BUILD_DEPENDS+=	redis-server:databases/redis-devel
65
67
66
SHEBANG_FILES=		ccopts.sh \
68
SHEBANG_FILES=		ccopts.sh \
67
			ccver.sh \
69
			ccver.sh \
Lines 184-190 Link Here
184
EXTRA_MODULES+=		db_sqlite
186
EXTRA_MODULES+=		db_sqlite
185
.endif
187
.endif
186
188
187
OPENSIPS_MAKE_ENV=	CC="${CC}" CXX="${CXX}" CPP="${CPP}" _GCC_RUNTIME="${_GCC_RUNTIME}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" PYTHON=${PYTHON_CMD}
189
.if ${PORT_OPTIONS:MRABBITMQ}
190
EXTRA_MODULES+=		event_rabbitmq
191
.endif
192
193
.if ${PORT_OPTIONS:MREDIS}
194
EXTRA_MODULES+=		cachedb_redis
195
.endif
196
197
OPENSIPS_MAKE_ENV=	CC="${CC}" CXX="${CXX}" CPP="${CPP}" _GCC_RUNTIME="${_GCC_RUNTIME}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
198
199
.if ${PORT_OPTIONS:MPYTHON}
200
EXTRA_MODULES+=		python
201
OPENSIPS_MAKE_ENV+=	PYTHON=${PYTHON_CMD}
202
.endif
188
203
189
post-patch:
204
post-patch:
190
	@${RM} ${WRKSRC}/modules/json/array_del.c
205
	@${RM} ${WRKSRC}/modules/json/array_del.c
(-)files/Makefile.conf (-1 / +1 lines)
Lines 54-60 Link Here
54
54
55
exclude_modules= aaa_radius b2b_logic cachedb_cassandra cachedb_couchbase cachedb_memcached cachedb_mongodb cachedb_redis carrierroute compression cpl-c db_berkeley db_http db_mysql db_oracle db_perlvdb db_postgres db_unixodbc dialplan emergency event_rabbitmq h350 regex identity jabber json ldap lua httpd mi_xmlrpc_ng mmgeoip osp perl pi_http presence presence_dialoginfo presence_mwi presence_xml proto_sctp proto_tls pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls sngtc snmpstats xcap xcap_client xmpp db_sqlite
55
exclude_modules= aaa_radius b2b_logic cachedb_cassandra cachedb_couchbase cachedb_memcached cachedb_mongodb cachedb_redis carrierroute compression cpl-c db_berkeley db_http db_mysql db_oracle db_perlvdb db_postgres db_unixodbc dialplan emergency event_rabbitmq h350 regex identity jabber json ldap lua httpd mi_xmlrpc_ng mmgeoip osp perl pi_http presence presence_dialoginfo presence_mwi presence_xml proto_sctp proto_tls pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls sngtc snmpstats xcap xcap_client xmpp db_sqlite
56
56
57
include_modules= b2b_logic cachedb_redis carrierroute cpl-c dialplan event_rabbitmq regex identity jabber json mi_xmlrpc_ng perl pi_http presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls xcap xcap_client xmpp
57
include_modules= b2b_logic carrierroute cpl-c dialplan regex identity jabber json mi_xmlrpc_ng perl pi_http presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rest_client rls xcap xcap_client xmpp
58
58
59
DEFS+= -DPKG_MALLOC #Uses a faster malloc (exclusive w/ USE_SHM_MEM)
59
DEFS+= -DPKG_MALLOC #Uses a faster malloc (exclusive w/ USE_SHM_MEM)
60
DEFS+= -DSHM_MMAP #Use mmap instead of SYSV shared memory
60
DEFS+= -DSHM_MMAP #Use mmap instead of SYSV shared memory
(-)pkg-plist (-6 / +6 lines)
Lines 28-34 Link Here
28
lib/opensips/modules/benchmark.so
28
lib/opensips/modules/benchmark.so
29
lib/opensips/modules/cachedb_local.so
29
lib/opensips/modules/cachedb_local.so
30
%%MEMCACHED%%lib/opensips/modules/cachedb_memcached.so
30
%%MEMCACHED%%lib/opensips/modules/cachedb_memcached.so
31
lib/opensips/modules/cachedb_redis.so
31
%%REDIS%%lib/opensips/modules/cachedb_redis.so
32
lib/opensips/modules/cachedb_sql.so
32
lib/opensips/modules/cachedb_sql.so
33
lib/opensips/modules/call_center.so
33
lib/opensips/modules/call_center.so
34
lib/opensips/modules/call_control.so
34
lib/opensips/modules/call_control.so
Lines 55-61 Link Here
55
lib/opensips/modules/enum.so
55
lib/opensips/modules/enum.so
56
lib/opensips/modules/event_datagram.so
56
lib/opensips/modules/event_datagram.so
57
lib/opensips/modules/event_flatstore.so
57
lib/opensips/modules/event_flatstore.so
58
lib/opensips/modules/event_rabbitmq.so
58
%%RABBITMQ%%lib/opensips/modules/event_rabbitmq.so
59
lib/opensips/modules/event_route.so
59
lib/opensips/modules/event_route.so
60
lib/opensips/modules/event_virtual.so
60
lib/opensips/modules/event_virtual.so
61
lib/opensips/modules/event_xmlrpc.so
61
lib/opensips/modules/event_xmlrpc.so
Lines 108-114 Link Here
108
lib/opensips/modules/pua_mi.so
108
lib/opensips/modules/pua_mi.so
109
lib/opensips/modules/pua_usrloc.so
109
lib/opensips/modules/pua_usrloc.so
110
lib/opensips/modules/pua_xmpp.so
110
lib/opensips/modules/pua_xmpp.so
111
lib/opensips/modules/python.so
111
%%PYTHON%%lib/opensips/modules/python.so
112
lib/opensips/modules/qos.so
112
lib/opensips/modules/qos.so
113
lib/opensips/modules/ratelimit.so
113
lib/opensips/modules/ratelimit.so
114
lib/opensips/modules/regex.so
114
lib/opensips/modules/regex.so
Lines 208-214 Link Here
208
%%PORTDOCS%%%%DOCSDIR%%/README.benchmark
208
%%PORTDOCS%%%%DOCSDIR%%/README.benchmark
209
%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_local
209
%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_local
210
%%MEMCACHED%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_memcached
210
%%MEMCACHED%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_memcached
211
%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_redis
211
%%REDIS%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_redis
212
%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_sql
212
%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_sql
213
%%PORTDOCS%%%%DOCSDIR%%/README.call_center
213
%%PORTDOCS%%%%DOCSDIR%%/README.call_center
214
%%PORTDOCS%%%%DOCSDIR%%/README.call_control
214
%%PORTDOCS%%%%DOCSDIR%%/README.call_control
Lines 235-241 Link Here
235
%%PORTDOCS%%%%DOCSDIR%%/README.enum
235
%%PORTDOCS%%%%DOCSDIR%%/README.enum
236
%%PORTDOCS%%%%DOCSDIR%%/README.event_datagram
236
%%PORTDOCS%%%%DOCSDIR%%/README.event_datagram
237
%%PORTDOCS%%%%DOCSDIR%%/README.event_flatstore
237
%%PORTDOCS%%%%DOCSDIR%%/README.event_flatstore
238
%%PORTDOCS%%%%DOCSDIR%%/README.event_rabbitmq
238
%%RABBITMQ%%%%PORTDOCS%%%%DOCSDIR%%/README.event_rabbitmq
239
%%PORTDOCS%%%%DOCSDIR%%/README.event_route
239
%%PORTDOCS%%%%DOCSDIR%%/README.event_route
240
%%PORTDOCS%%%%DOCSDIR%%/README.event_virtual
240
%%PORTDOCS%%%%DOCSDIR%%/README.event_virtual
241
%%PORTDOCS%%%%DOCSDIR%%/README.event_xmlrpc
241
%%PORTDOCS%%%%DOCSDIR%%/README.event_xmlrpc
Lines 288-294 Link Here
288
%%PORTDOCS%%%%DOCSDIR%%/README.pua_mi
288
%%PORTDOCS%%%%DOCSDIR%%/README.pua_mi
289
%%PORTDOCS%%%%DOCSDIR%%/README.pua_usrloc
289
%%PORTDOCS%%%%DOCSDIR%%/README.pua_usrloc
290
%%PORTDOCS%%%%DOCSDIR%%/README.pua_xmpp
290
%%PORTDOCS%%%%DOCSDIR%%/README.pua_xmpp
291
%%PORTDOCS%%%%DOCSDIR%%/README.python
291
%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/README.python
292
%%PORTDOCS%%%%DOCSDIR%%/README.qos
292
%%PORTDOCS%%%%DOCSDIR%%/README.qos
293
%%PORTDOCS%%%%DOCSDIR%%/README.ratelimit
293
%%PORTDOCS%%%%DOCSDIR%%/README.ratelimit
294
%%PORTDOCS%%%%DOCSDIR%%/README.regex
294
%%PORTDOCS%%%%DOCSDIR%%/README.regex

Return to bug 222718