Update libupnp to 1.6.0. Merge from wip/libupnp.

No functionally changes since RC1.

5 files changed, 83 insertions, 3 deletions

diff --git a/net/libupnp/patches/patch-aa b/net/libupnp/patches/patch-aa
new file mode 100644
index 00000000000..d40dd7ca25f
--- /dev/null
+++ b/net/libupnp/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.4 2007/08/19 01:36:22 obache Exp $
+
+--- threadutil/src/ThreadPool.c.orig	2007-06-10 03:48:25.000000000 +0000
++++ threadutil/src/ThreadPool.c
+@@ -96,7 +96,7 @@ SetPolicyType( PolicyType in )
+     #else
+     #ifdef WIN32
+      return sched_setscheduler( 0, in);
+-    #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
++    #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L
+      struct sched_param current;
+ 
+      sched_getparam( 0, &current );
+@@ -125,7 +125,7 @@ SetPolicyType( PolicyType in )
+ static int
+ SetPriority( ThreadPriority priority )
+ {
+-#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
++#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L
+     int currentPolicy;
+     int minPriority = 0;
+     int maxPriority = 0;
diff --git a/net/libupnp/patches/patch-ac b/net/libupnp/patches/patch-ac
new file mode 100644
index 00000000000..b0097b7d534
--- /dev/null
+++ b/net/libupnp/patches/patch-ac
@@ -0,0 +1,34 @@
+$NetBSD: patch-ac,v 1.4 2007/08/19 01:36:22 obache Exp $
+
+--- upnp/src/genlib/net/uri/uri.c.orig	2007-06-09 12:53:47.000000000 +0000
++++ upnp/src/genlib/net/uri/uri.c
+@@ -625,9 +625,9 @@ parse_hostport( const char *in,
+         //call gethostbyname_r (reentrant form of gethostbyname)
+         // TODO: Use autoconf to discover this rather than the
+         // platform-specific stuff below
+-#if defined(WIN32) || defined(__CYGWIN__)
++#if defined(WIN32) || defined(__CYGWIN__) || defined(_AIX50) || defined(__upux11)
+         h=gethostbyname(temp_host_name);
+-#elif defined(SPARC_SOLARIS)
++#elif defined(sun) || defined(__sun) || defined(sgi) || defined(__sgi)
+         errCode = gethostbyname_r( temp_host_name,
+                                    &h,
+                                    temp_hostbyname_buff,
+@@ -640,11 +640,16 @@ parse_hostport( const char *in,
+         if ( h == NULL ) {
+             errCode = 1;
+         }
+-#elif defined(__linux__)
++#elif defined(__GLIBC__)
+         errCode = gethostbyname_r( temp_host_name,
+                                    &h_buf,
+                                    temp_hostbyname_buff,
+                                    BUFFER_SIZE, &h, &errcode );
++#elif defined(__osf1__) || defined(__hpux) || defined(_AIX)
++        errCode = gethostbyname_r( temp_host_name,
++                                   &h_buf,
++                                   (struct hostent_data*)temp_hostbyname_buff);
++        h = &h_buf;
+ #else
+ {
+            struct addrinfo hints, *res, *res0;
diff --git a/net/libupnp/patches/patch-ae b/net/libupnp/patches/patch-ae
new file mode 100644
index 00000000000..c131dba1faa
--- /dev/null
+++ b/net/libupnp/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.3 2007/08/19 01:36:22 obache Exp $
+
+--- libupnp.pc.in.orig	2007-05-26 15:08:41.000000000 +0000
++++ libupnp.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libupnp
+ Description: Linux SDK for UPnP Devices
+ Version: @VERSION@
+-Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
++Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml @LIBS@
+ Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
+ 
diff --git a/net/libupnp/patches/patch-ag b/net/libupnp/patches/patch-ag
new file mode 100644
index 00000000000..872a0f20a16
--- /dev/null
+++ b/net/libupnp/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.4 2007/08/19 01:36:23 obache Exp $
+
+--- docs/dist/Makefile.in.orig	2007-05-26 15:36:17.000000000 +0000
++++ docs/dist/Makefile.in
+@@ -742,6 +742,7 @@ install-nobase_docsDATA: $(nobase_docs_D
+ 	list='$(nobase_docs_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  $(am__vpath_adj) \
++	  $(mkdir_p) `dirname "$(DESTDIR)$(docsdir)/$$f"`; \
+ 	  echo " $(nobase_docsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docsdir)/$$f'"; \
+ 	  $(nobase_docsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docsdir)/$$f"; \
+ 	done
diff --git a/net/libupnp/patches/patch-ah b/net/libupnp/patches/patch-ah
index a8c95fd8023..425cbb4d5a6 100644
--- a/net/libupnp/patches/patch-ah
+++ b/net/libupnp/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2007/06/12 21:59:32 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2007/08/19 01:36:23 obache Exp $
 
---- threadutil/inc/ithread.h.orig	2007-06-12 21:46:07.000000000 +0000
+--- threadutil/inc/ithread.h.orig	2007-05-25 14:39:38.000000000 +0000
 +++ threadutil/inc/ithread.h
-@@ -51,7 +51,7 @@ extern "C" {
+@@ -45,7 +45,7 @@ extern "C" {
  #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
  #endif