updated libosip to 3.2.0

4 files changed, 17 insertions, 17 deletions

diff --git a/devel/libosip/Makefile b/devel/libosip/Makefile
index ac7d28b8e36..d2963045c2a 100644
--- a/devel/libosip/Makefile
+++ b/devel/libosip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2008/10/11 21:59:15 schwarz Exp $
+# $NetBSD: Makefile,v 1.12 2008/11/11 22:02:42 schwarz Exp $
 #
 
-DISTNAME=	libosip2-3.1.0
+DISTNAME=	libosip2-3.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=osip/}
 
diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk
index 87204bced92..31b9aac9a9f 100644
--- a/devel/libosip/buildlink3.mk
+++ b/devel/libosip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/08/25 02:49:12 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2008/11/11 22:02:42 schwarz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBOSIP2_BUILDLINK3_MK:=	${LIBOSIP2_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libosip2
 
 .if !empty(LIBOSIP2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libosip2+=	libosip2>=2.2.0
-BUILDLINK_ABI_DEPENDS.libosip2+=	libosip2>=3.0.1
+BUILDLINK_ABI_DEPENDS.libosip2+=	libosip2>=3.2.0
 BUILDLINK_PKGSRCDIR.libosip2?=	../../devel/libosip
 .endif	# LIBOSIP2_BUILDLINK3_MK
 
diff --git a/devel/libosip/distinfo b/devel/libosip/distinfo
index 7abbda7edf3..50c731f2df3 100644
--- a/devel/libosip/distinfo
+++ b/devel/libosip/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2008/10/11 21:59:15 schwarz Exp $
+$NetBSD: distinfo,v 1.9 2008/11/11 22:02:42 schwarz Exp $
 
-SHA1 (libosip2-3.1.0.tar.gz) = 27764e6fa6b18b7be9e49a00eb32639de108ffb0
-RMD160 (libosip2-3.1.0.tar.gz) = 12337bbc332aa20780fb7559679b5709cf27819e
-Size (libosip2-3.1.0.tar.gz) = 655700 bytes
-SHA1 (patch-aa) = f86b43e253983209bf0c8f04bfe984bbf5d6790e
+SHA1 (libosip2-3.2.0.tar.gz) = 9960accab564d27afe6b98dd53a55d1aedb51e57
+RMD160 (libosip2-3.2.0.tar.gz) = c6f85d0d7268a1023c67b329bb4061d8921523a1
+Size (libosip2-3.2.0.tar.gz) = 664262 bytes
+SHA1 (patch-aa) = 22dd0d593348fbe563257536c10901bfde2d6f66
diff --git a/devel/libosip/patches/patch-aa b/devel/libosip/patches/patch-aa
index f47f54a9f2e..b514577243e 100644
--- a/devel/libosip/patches/patch-aa
+++ b/devel/libosip/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/08/25 02:49:13 obache Exp $
+$NetBSD: patch-aa,v 1.4 2008/11/11 22:02:42 schwarz Exp $
 
---- src/osip2/port_sema.c.orig	2007-06-05 10:17:50.000000000 +0000
-+++ src/osip2/port_sema.c
-@@ -236,7 +236,6 @@ osip_sem_trywait (struct osip_sem *_sem)
+--- src/osip2/port_sema.c.orig	2008-11-10 22:22:41.000000000 +0100
++++ src/osip2/port_sema.c	2008-11-10 22:24:06.000000000 +0100
+@@ -236,7 +236,6 @@
  struct osip_sem *
  osip_sem_init (unsigned int value)
  {
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/25 02:49:13 obache Exp $
    int i;
    osip_sem_t *sem = (osip_sem_t *) osip_malloc (sizeof (osip_sem_t));
  
-@@ -250,8 +249,7 @@ osip_sem_init (unsigned int value)
+@@ -250,8 +249,7 @@
        osip_free (sem);
        return NULL;
      }
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/25 02:49:13 obache Exp $
    if (i != 0)
      {
        perror ("semctl error");
-@@ -264,13 +262,11 @@ osip_sem_init (unsigned int value)
+@@ -264,13 +262,11 @@
  int
  osip_sem_destroy (struct osip_sem *_sem)
  {
@@ -28,10 +28,10 @@ $NetBSD: patch-aa,v 1.3 2007/08/25 02:49:13 obache Exp $
    osip_sem_t *sem = (osip_sem_t *) _sem;
  
    if (sem == NULL)
-     return 0;
+     return OSIP_SUCCESS;
 -  val.val = 0;
 -  semctl (sem->semid, 0, IPC_RMID, val);
 +  semctl (sem->semid, 0, IPC_RMID, 0);
    osip_free (sem);
-   return 0;
+   return OSIP_SUCCESS;
  }