4 files changed, 10 insertions, 49 deletions

diff --git a/devel/libosmo-abis/Makefile b/devel/libosmo-abis/Makefile
index 42435563e695..401292061ca9 100644
--- a/devel/libosmo-abis/Makefile
+++ b/devel/libosmo-abis/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libosmo-abis
-PORTVERSION=	0.3.2
-PORTREVISION=	2
+PORTVERSION=	0.4.0
 CATEGORIES=	devel
 MASTER_SITES=	http://git.osmocom.org/libosmo-abis/snapshot/ \
 		http://chaosophia.net/downloads/osmocom/${PORTNAME}/
@@ -14,6 +13,7 @@ LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libosmocore.so:devel/libosmocore \
+		libtalloc.so:devel/talloc \
 		libortp.so:net/ortp
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
diff --git a/devel/libosmo-abis/distinfo b/devel/libosmo-abis/distinfo
index 26d20dfbb997..78d052ccbc57 100644
--- a/devel/libosmo-abis/distinfo
+++ b/devel/libosmo-abis/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libosmo-abis-0.3.2.tar.gz) = a8edf90effd9ea3f6ec626d3baa98da218f2a4c9b178cf428b831eb60ec4ed30
-SIZE (libosmo-abis-0.3.2.tar.gz) = 73927
+TIMESTAMP = 1512656884
+SHA256 (libosmo-abis-0.4.0.tar.gz) = a4f6ccd4bc27e99a5e558de7b22d690aea075e711247975bbf93953749f44e4e
+SIZE (libosmo-abis-0.4.0.tar.gz) = 83714
diff --git a/devel/libosmo-abis/files/patch-src-trau-osmo_ortp.c b/devel/libosmo-abis/files/patch-src-trau-osmo_ortp.c
deleted file mode 100644
index 67842be3fa98..000000000000
--- a/devel/libosmo-abis/files/patch-src-trau-osmo_ortp.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/trau/osmo_ortp.c.orig	2015-09-21 08:55:12 UTC
-+++ src/trau/osmo_ortp.c
-@@ -93,7 +93,7 @@ static int ortp_to_osmo_lvl(OrtpLogLevel
- 	return LOGL_ERROR;
- }
- 
--static void my_ortp_logfn(OrtpLogLevel lev, const char *fmt,
-+static void my_ortp_logfn(const char *domain, OrtpLogLevel lev, const char *fmt,
- 			  va_list args)
- {
- 	osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0,
-@@ -267,7 +267,7 @@ void osmo_rtp_init(void *ctx)
- 	tall_rtp_ctx = ctx;
- 	ortp_set_memory_functions(&osmo_ortp_memfn);
- 	ortp_init();
--	ortp_set_log_level_mask(0xffff);
-+	ortp_set_log_level_mask(NULL, 0xffff);
- 	ortp_set_log_handler(my_ortp_logfn);
- 	create_payload_types();
- }
-@@ -326,16 +326,16 @@ struct osmo_rtp_socket *osmo_rtp_socket_
- 
- 	rtp_session_signal_connect(rs->sess, "ssrc_changed",
- 				   (RtpCallback) ortp_sig_cb_ssrc,
--				   (unsigned long) rs);
-+				   rs);
- 	rtp_session_signal_connect(rs->sess, "payload_type_changed",
- 				   (RtpCallback) ortp_sig_cb_pt,
--				   (unsigned long) rs);
-+				   rs);
- 	rtp_session_signal_connect(rs->sess, "network_error",
- 				   (RtpCallback) ortp_sig_cb_net,
--				   (unsigned long) rs);
-+				   rs);
- 	rtp_session_signal_connect(rs->sess, "timestamp_jump",
- 				   (RtpCallback) ortp_sig_cb_ts,
--				   (unsigned long) rs);
-+				   rs);
- 
- 	/* initialize according to the RFC */
- 	rtp_session_set_seq_number(rs->sess, random());
diff --git a/devel/libosmo-abis/pkg-plist b/devel/libosmo-abis/pkg-plist
index 75d9e399c61a..1af8e3254b06 100644
--- a/devel/libosmo-abis/pkg-plist
+++ b/devel/libosmo-abis/pkg-plist
@@ -7,12 +7,13 @@ include/osmocom/abis/subchan_demux.h
 include/osmocom/abis/e1_input.h
 include/osmocom/abis/lapd.h
 include/osmocom/abis/lapd_pcap.h
+include/osmocom/abis/unixsocket_proto.h
 include/osmocom/trau/osmo_ortp.h
-lib/libosmoabis.so.4.0.0
-lib/libosmoabis.so.4
+lib/libosmoabis.so.6.0.0
+lib/libosmoabis.so.6
 lib/libosmoabis.so
-lib/libosmotrau.so.0.0.0
-lib/libosmotrau.so.0
+lib/libosmotrau.so.2.0.0
+lib/libosmotrau.so.2
 lib/libosmotrau.so
 lib/libosmoabis.a
 lib/libosmotrau.a