Update libopendaap to 0.4.0

changed the url to www.craz.net

remove patches that have been integrated upstream or are no more relevant

Main changelog entries:
- Playlist support now exists
- Use a free mdns library, instead of Apple's mDNS library. This means that libopendaap is entirely free now.
- You can now connect to servers with passwords
- Several bug fixes

approved by cube@

7 files changed, 14 insertions, 128 deletions

diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile
index 5d05a7aafab..e481a1d29b8 100644
--- a/audio/libopendaap/Makefile
+++ b/audio/libopendaap/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/05 12:53:08 tonio Exp $
 
-DISTNAME=	libopendaap-0.3.0
-PKGREVISION=	1
+DISTNAME=	libopendaap-0.4.0
 CATEGORIES=	audio
-MASTER_SITES=	http://crazney.net/programs/itunes/files/
+MASTER_SITES=	http://craz.net/programs/itunes/files/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://crazney.net/programs/itunes/libopendaap.html
+HOMEPAGE=	http://craz.net/programs/itunes/libopendaap.html
 COMMENT=	DAAP client library
 
 USE_LIBTOOL=		yes
diff --git a/audio/libopendaap/distinfo b/audio/libopendaap/distinfo
index 173be36b2a9..bd34e69a84e 100644
--- a/audio/libopendaap/distinfo
+++ b/audio/libopendaap/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/03/23 10:52:54 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2005/08/05 12:53:08 tonio Exp $
 
-SHA1 (libopendaap-0.3.0.tar.bz2) = 21817a7886ffc8c4d88c621231569562c61356db
-RMD160 (libopendaap-0.3.0.tar.bz2) = 2218783e40e7f48a7b89b2e27145e4964f7dd687
-Size (libopendaap-0.3.0.tar.bz2) = 365682 bytes
-SHA1 (patch-aa) = 89798e5b906cb3b92748b61f113542dfc4d7d22a
-SHA1 (patch-ab) = 3bd01a3038505721149a8ea56f564442b035cee4
+SHA1 (libopendaap-0.4.0.tar.bz2) = 5fe4382af7ecc97a6cb510ebec87b40d6cf6ef38
+RMD160 (libopendaap-0.4.0.tar.bz2) = ed8732c6c487ef4902ff2d68552a66418cf2760d
+Size (libopendaap-0.4.0.tar.bz2) = 241953 bytes
 SHA1 (patch-ac) = d723c22d11df6d511290d45ccb54861fbecc178d
 SHA1 (patch-ad) = 88b72f80e4a6ed68f7ae74ace3f3dbf07709c0b1
-SHA1 (patch-ae) = 606756fe07c6af4fc0361f5ae5f3f62b4a40d59e
-SHA1 (patch-af) = a038d125bb809d2b74248a8e7996eec363d11283
-SHA1 (patch-ag) = c62cc8b8b1d8ac0cfb64bff69c05fab2c03f504f
+SHA1 (patch-af) = b5811cd930bb45be33cd72f31913e3de85db45f3
diff --git a/audio/libopendaap/patches/patch-aa b/audio/libopendaap/patches/patch-aa
deleted file mode 100644
index 08c91ede434..00000000000
--- a/audio/libopendaap/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/03/23 10:52:54 jmmv Exp $
-
---- thread.h.orig	2004-12-14 05:11:09.000000000 +0100
-+++ thread.h
-@@ -42,8 +42,8 @@
-         pthread_mutexattr_t attr; \
-         pthread_mutexattr_init(&attr) ; \
-         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \
--        pthread_mutexattr_destroy(&attr) ; \
-         pthread_mutex_init(& m, &attr); \
-+        pthread_mutexattr_destroy(&attr) ; \
-     } while (0)
- #define ts_mutex_lock(m)              pthread_mutex_lock(& m)
- #define ts_mutex_unlock(m)            pthread_mutex_unlock(& m)
diff --git a/audio/libopendaap/patches/patch-ab b/audio/libopendaap/patches/patch-ab
deleted file mode 100644
index 5ae510b06d5..00000000000
--- a/audio/libopendaap/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/07 15:30:44 adam Exp $
-
---- discover.c.orig	2004-10-10 03:49:03.000000000 +0000
-+++ discover.c
-@@ -90,9 +90,10 @@ static void NameCallback(mDNS *const m, 
-     {
-         domainlabel name;
-         domainname type, domain;
-+        SDiscover_HostList *new;
-         ts_mutex_lock(pDiscover->mtObjectLock);
- 
--        SDiscover_HostList *new = malloc(sizeof(SDiscover_HostList));
-+        new = malloc(sizeof(SDiscover_HostList));
-         memset(new, 0, sizeof(SDiscover_HostList));
- 
-         if (!AddRecord) new->lost = 1;
-@@ -217,11 +218,11 @@ static void CheckoutHostsWorker(void *pv
-     SDiscover *pDiscover = (SDiscover *)pvDiscoverThis;
-     SDiscover_HostList *cur, *next;
-     int cmd;
-+    int finalized = 0;
- 
-     ts_mutex_lock(pDiscover->mtWorkerLock);
-     ts_mutex_lock(pDiscover->mtObjectLock);
- 
--    int finalized = 0;
- 
-     cur = pDiscover->prenamed;
-     pDiscover->prenamed = NULL;
diff --git a/audio/libopendaap/patches/patch-ae b/audio/libopendaap/patches/patch-ae
deleted file mode 100644
index 6a67740f08f..00000000000
--- a/audio/libopendaap/patches/patch-ae
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/12/19 03:34:17 jlam Exp $
-
---- mDNS/mDNSClientAPI.h.orig	2004-04-13 03:05:11.000000000 -0400
-+++ mDNS/mDNSClientAPI.h
-@@ -408,6 +408,7 @@ Merge in license terms from Quinn's copy
- #define __mDNSClientAPI_h
- 
- #include <stdarg.h>		// stdarg.h is required for for va_list support for the mDNS_vsnprintf declaration
-+#include <sys/types.h>
- #include "mDNSDebug.h"
- 
- #ifdef	__cplusplus
-@@ -478,13 +479,13 @@ typedef enum				// From RFC 1035
- 
- // mDNS defines its own names for these common types to simplify portability across
- // multiple platforms that may each have their own (different) names for these types.
--typedef          int   mDNSBool;
--typedef   signed char  mDNSs8;
--typedef unsigned char  mDNSu8;
--typedef   signed short mDNSs16;
--typedef unsigned short mDNSu16;
--typedef   signed long  mDNSs32;
--typedef unsigned long  mDNSu32;
-+typedef       int mDNSBool;
-+typedef    int8_t mDNSs8;
-+typedef  u_int8_t mDNSu8;
-+typedef   int16_t mDNSs16;
-+typedef u_int16_t mDNSu16;
-+typedef   int32_t mDNSs32;
-+typedef u_int32_t mDNSu32;
- 
- // To enforce useful type checking, we make mDNSInterfaceID be a pointer to a dummy struct
- // This way, mDNSInterfaceIDs can be assigned, and compared with each other, but not with other types
diff --git a/audio/libopendaap/patches/patch-af b/audio/libopendaap/patches/patch-af
index 5d706d4fd3f..8ae04a86345 100644
--- a/audio/libopendaap/patches/patch-af
+++ b/audio/libopendaap/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.1 2005/03/16 11:51:00 rillig Exp $
+$NetBSD: patch-af,v 1.2 2005/08/05 12:53:08 tonio Exp $
 
 gcc-2.95.3 does not like code intermixed with declarations.
 
---- client.c.orig	Mon Jan  3 09:20:54 2005
-+++ client.c	Tue Mar 15 23:34:55 2005
-@@ -1235,11 +1235,10 @@ int DAAP_ClientHost_GetAudioFile(DAAP_SC
+--- client.c.orig	2005-08-04 10:43:47.000000000 +0200
++++ client.c	2005-08-04 10:44:42.000000000 +0200
+@@ -1379,11 +1379,10 @@
      int requestid = 0;
  
      HTTP_Connection *http_connection;
@@ -16,19 +16,4 @@ gcc-2.95.3 does not like code intermixed with declarations.
 -
      if (pCHThis->version_major != 3)
      {
-         sprintf(buf, songUrl_42, databaseid, songid, songformat,
-@@ -1489,13 +1488,13 @@ static void update_watch_cb(void *pv_pCH
- static void AsyncWaitUpdate(void *pv_pCHThis, void *unused)
- {
-     DAAP_SClientHost *pCHThis = (DAAP_SClientHost*)pv_pCHThis;
--    TRACE("()\n");
-     char hash[33] = {0};
-     char updateUrl[] = "/update?session-id=%i&revision-number=%i&delta=%i";
-     char buf[sizeof(updateUrl) + 11 + 11 + 11];
- 
-     HTTP_GetResult *httpRes;
- 
-+    TRACE("()\n");
-     sprintf(buf, updateUrl, pCHThis->sessionid, pCHThis->revision_number,
-             pCHThis->revision_number);
- 
+         buf = safe_sprintf(songUrl_42, databaseid, songid, songformat,
diff --git a/audio/libopendaap/patches/patch-ag b/audio/libopendaap/patches/patch-ag
deleted file mode 100644
index 6385c7f3d55..00000000000
--- a/audio/libopendaap/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/03/16 11:51:00 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- ioloop.c.orig	Tue Dec 14 05:39:31 2004
-+++ ioloop.c	Tue Mar 15 23:35:17 2005
-@@ -113,10 +113,10 @@ void fd_event_signal(fd_event *event)
- 
- void fd_event_reset(fd_event *event)
- {
--    event->signalled = 0;
-     char buf[1] = {0};
-     int flags;
- 
-+    event->signalled = 0;
-     /* set non-blocking on read pipe */
-     flags = fcntl(event->pipe[0], F_GETFL, 0);
-     if (flags == -1) flags = 0;