7 files changed, 36 insertions, 38 deletions
diff --git a/net/libexosip/Makefile b/net/libexosip/Makefile
index 933b55827af..3e76acdaf7c 100644
--- a/net/libexosip/Makefile
+++ b/net/libexosip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2020/01/18 23:33:17 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/06 13:01:47 nia Exp $
 
-DISTNAME=	libeXosip2-4.1.0
-PKGREVISION=	2
-CATEGORIES=	devel net
-MASTER_SITES=	http://download.savannah.nongnu.org/releases/exosip/
+DISTNAME=	libexosip2-5.1.1
+PKGNAME=	${DISTNAME:S/exosip/eXosip/1}
+CATEGORIES=	net devel
+MASTER_SITES=	https://download.savannah.nongnu.org/releases/exosip/
 
 MAINTAINER=	schwarz@NetBSD.org
 HOMEPAGE=	https://savannah.nongnu.org/projects/exosip
@@ -15,11 +15,10 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_FEATURES+=	getopt_long
 
-.include "options.mk"
-
 LIBS.SunOS+=	-lsocket -lnsl
 LIBS.Darwin+=	-framework CoreServices -framework Security
 
+.include "options.mk"
 .include "../../net/libcares/buildlink3.mk"
 .include "../../devel/libosip/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/libexosip/PLIST b/net/libexosip/PLIST
index 49e7af1003c..45e8a6dd06b 100644
--- a/net/libexosip/PLIST
+++ b/net/libexosip/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/16 02:12:26 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/03/06 13:01:47 nia Exp $
 bin/sip_reg
 include/eXosip2/eX_call.h
 include/eXosip2/eX_message.h
 include/eXosip2/eX_options.h
 include/eXosip2/eX_publish.h
-include/eXosip2/eX_refer.h
 include/eXosip2/eX_register.h
 include/eXosip2/eX_setup.h
 include/eXosip2/eX_subscribe.h
diff --git a/net/libexosip/buildlink3.mk b/net/libexosip/buildlink3.mk
index 7816d99be75..47056377740 100644
--- a/net/libexosip/buildlink3.mk
+++ b/net/libexosip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/01/18 21:48:19 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2020/03/06 13:01:47 nia Exp $
 
 BUILDLINK_TREE+=	libeXosip2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libeXosip2
 LIBEXOSIP2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libeXosip2+=	libeXosip2>=3.5.0
-BUILDLINK_ABI_DEPENDS.libeXosip2?=	libeXosip2>=4.1.0nb2
+BUILDLINK_ABI_DEPENDS.libeXosip2+=	libeXosip2>=4.1.0nb2
 BUILDLINK_PKGSRCDIR.libeXosip2?=	../../net/libexosip
 
 pkgbase := libeXosip2
diff --git a/net/libexosip/distinfo b/net/libexosip/distinfo
index 94656e3c13e..4b25adffc1b 100644
--- a/net/libexosip/distinfo
+++ b/net/libexosip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 00:35:09 agc Exp $
+$NetBSD: distinfo,v 1.4 2020/03/06 13:01:47 nia Exp $
 
-SHA1 (libeXosip2-4.1.0.tar.gz) = f85e93227f772acac1b3e17b69c6b8a708336ba8
-RMD160 (libeXosip2-4.1.0.tar.gz) = 816ef497a6ddaf3953a2b6fd490ad8061151fbfe
-SHA512 (libeXosip2-4.1.0.tar.gz) = a7f9584a391b652371319329c0f5064b290e6ea04a75dc1cb9c28da3c17542b1364acfe1c74261fa6d3243d23554dcf3a2eabec388100a85bbfa261bb30a478d
-Size (libeXosip2-4.1.0.tar.gz) = 530997 bytes
-SHA1 (patch-aa) = 9e3482cb6cbe00cc512dca313904f0e671a180df
-SHA1 (patch-ab) = 929e7949d783a6065bb34c1a622284ad4ad24603
+SHA1 (libexosip2-5.1.1.tar.gz) = df8f43e138d1e1c6e7574fe97243318c2fdfb446
+RMD160 (libexosip2-5.1.1.tar.gz) = 5a4e28f9e4ce321d223747f92ff878dd6997efd5
+SHA512 (libexosip2-5.1.1.tar.gz) = cec5931484aa1a5e4a0679cc715da163df9429016ad74841a518c52c2bea6d9038a312b252802607d9a836bd2e598e2f3a4a24a9f63b34a0fb8c737f32329b96
+Size (libexosip2-5.1.1.tar.gz) = 630264 bytes
+SHA1 (patch-src_eXutils.c) = d4ad34fdb94c5f7b0bb6259521450efe459cc650
+SHA1 (patch-tools_sip__reg.c) = b2b5d03ef89207d748c35e36802f4193b103ea56
diff --git a/net/libexosip/patches/patch-aa b/net/libexosip/patches/patch-aa
deleted file mode 100644
index 223f1940d76..00000000000
--- a/net/libexosip/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2014/07/12 16:48:27 schwarz Exp $
-
-Defines INADDR_NONE, which is needed on Solaris.
-
---- src/eXutils.c.orig	2014-01-06 19:30:21.000000000 +0100
-+++ src/eXutils.c	2014-07-12 18:15:15.000000000 +0200
-@@ -509,6 +509,10 @@
- 
- #include <stdio.h>
- 
-+#ifndef INADDR_NONE
-+#define INADDR_NONE	((unsigned long) -1)	/* needed on Solaris */
-+#endif
-+
- static int _eXosip_default_gateway_ipv4 (struct eXosip_t *excontext, char *address, int size);
- 
- static int _eXosip_default_gateway_ipv6 (struct eXosip_t *excontext, char *address, int size);
diff --git a/net/libexosip/patches/patch-src_eXutils.c b/net/libexosip/patches/patch-src_eXutils.c
new file mode 100644
index 00000000000..3487ecae09e
--- /dev/null
+++ b/net/libexosip/patches/patch-src_eXutils.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_eXutils.c,v 1.1 2020/03/06 13:01:47 nia Exp $
+
+Defines INADDR_NONE, which is needed on Solaris.
+
+--- src/eXutils.c.orig	2020-01-17 12:52:50.000000000 +0000
++++ src/eXutils.c
+@@ -84,6 +84,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifndef INADDR_NONE
++#define INADDR_NONE	((unsigned long) -1)	/* needed on Solaris */
++#endif
++
+ int
+ _eXosip_closesocket (SOCKET_TYPE sock)
+ {
diff --git a/net/libexosip/patches/patch-ab b/net/libexosip/patches/patch-tools_sip__reg.c
index c55141f60a2..e368dd0ff77 100644
--- a/net/libexosip/patches/patch-ab
+++ b/net/libexosip/patches/patch-tools_sip__reg.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2013/07/16 02:12:26 rodent Exp $
+$NetBSD: patch-tools_sip__reg.c,v 1.1 2020/03/06 13:01:47 nia Exp $
 
 Pull in NetBSD compatibility headers for use with other headers.
 
---- tools/sip_reg.c.orig	2012-11-15 17:51:44.000000000 +0000
+--- tools/sip_reg.c.orig	2020-01-16 21:29:27.000000000 +0000
 +++ tools/sip_reg.c
-@@ -56,8 +56,14 @@
+@@ -60,8 +60,14 @@
  
  #if !defined(WIN32) && !defined(_WIN32_WCE) && !defined(__arc__)
  #define _GNU_SOURCE