Update libupnp to 1.6.1.

While here, add DESTDIR support.

Changes:
*******************************************************************************
Version 1.6.1
*******************************************************************************

2007-11-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* SF Bug Tracker [ 1825278 ] AdvertiseAndReply sleeps with handle lock out
	Applied patch from Alex (afaucher) to change some write locks to read
	locks.

2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Adjusting libtool library numbers to reflect the last changes.

2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* SF Bug Tracker [ 1825278 ] AdvertiseAndReply sleeps with handle lock out
	GlobalHndMutex, which was a mutex is now GlobalHndRWLock, which is a
	rwlock. HandleLock() is mapped to HandleWriteLock() while all other
	instances have not been checked. One instance in AdvertiseAndReply()
	has been changed to HandleReadLock(). Thanks to Alex (afaucher) for the
	bug report and suggestions.

2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Added support for rwlocks.

2007-11-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* SF Bug Tracker [ 1825929 ] woker thread still alive after UpnpFinish()
	Submitted By: Luke Kim - nereusuj
	Worker thread still alive after calling UpnpFinish() because
	ThreadPoolShutdown() is in the #ifdef DEBUG block.
	421
	422 #ifdef DEBUG
	423 ThreadPoolShutdown( &gSendThreadPool );
	424 ThreadPoolShutdown( &gRecvThreadPool );

2007-08-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Changed the calls to virtualDirCallback.open(filename, UPNP_WRITE)
	to (virtualDirCallback.open)(filename, UPNP_WRITE) (notice the
	parenthesis) due to a change in glibc that produces compilation
	errors.

2007-08-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Initialization of the "randomness" struct so that valgrind does not
	complain.

2007-08-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Merge of patch submitted By Keith Brindley - brindlk
	SF Bug Tracker [ 1762758 ] Seek not working for large files
	Problem:
	Requests from the uPnP client to seek to a position beyond 2GB in a large
	file are handled as a request to see from the 2GB point.

	Impact:
	Varies depending on client. The Xbox 360 kills the connection when it
	realises.

	Solution:
	GetNextRange function (webserver.c) is updated to handle large file sizes.
	Fix should also recognise when built on a 32bit platform rather than 64 and
	handle accordingly.

2007-08-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Merge of Mac OS X patch from Stephane Corthesy (davelopper),
	SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
	Some of the proposed changes were already done by Rene Hexel's patch.

5 files changed, 40 insertions, 37 deletions

diff --git a/net/libupnp/Makefile b/net/libupnp/Makefile
index f7ca4d59750..249a7bedb53 100644
--- a/net/libupnp/Makefile
+++ b/net/libupnp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2007/08/19 01:36:22 obache Exp $
+# $NetBSD: Makefile,v 1.7 2007/11/08 03:56:58 obache Exp $
 #
 
-DISTNAME=		libupnp-1.6.0
+DISTNAME=		libupnp-1.6.1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pupnp/}
 EXTRACT_SUFX=		.tar.bz2
@@ -19,5 +19,7 @@ CONFIGURE_ARGS+=	--with-documentation
 
 PKGCONFIG_OVERRIDE+=	libupnp.pc.in
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libupnp/distinfo b/net/libupnp/distinfo
index 19c8879e0b8..4b4d40cb3a4 100644
--- a/net/libupnp/distinfo
+++ b/net/libupnp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2007/08/19 01:36:22 obache Exp $
+$NetBSD: distinfo,v 1.7 2007/11/08 03:56:58 obache Exp $
 
-SHA1 (libupnp-1.6.0.tar.bz2) = 9c8133d0a4364c73f0fba2bbfb763e019875c747
-RMD160 (libupnp-1.6.0.tar.bz2) = be3bb874b20859de80a6104d235a8f93f929b559
-Size (libupnp-1.6.0.tar.bz2) = 1135997 bytes
-SHA1 (patch-aa) = 9ef588b87b54a56dd22e9bdb9fdd8f322338c90a
-SHA1 (patch-ac) = 41ec3e7756d5fefcf9cd3c3072a18b1c132f33e2
+SHA1 (libupnp-1.6.1.tar.bz2) = 80370602a871497091c37ac11a331c36928019cb
+RMD160 (libupnp-1.6.1.tar.bz2) = 10fd2419be4449fe4b62368f84d469af848e445f
+Size (libupnp-1.6.1.tar.bz2) = 1136757 bytes
+SHA1 (patch-aa) = 92ff665d62732956d1e429db0d6d754f65181b41
+SHA1 (patch-ac) = 05ba4584d2ebdb2de041e67f4c8d1c05e4fc1970
 SHA1 (patch-ae) = 7331c61d5b3a47ca3865788cf88a973d5e9352a1
 SHA1 (patch-ag) = b6b555fd2e7d5ddf5f63b25d8b915cdd7d0d03ba
-SHA1 (patch-ah) = 02f0012e2dc4f5cf6ef12340a2be63e4be6e676e
+SHA1 (patch-ah) = f46422955005a8b1b187163e97ee84a45b713847
diff --git a/net/libupnp/patches/patch-aa b/net/libupnp/patches/patch-aa
index d40dd7ca25f..4b7678ac326 100644
--- a/net/libupnp/patches/patch-aa
+++ b/net/libupnp/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2007/08/19 01:36:22 obache Exp $
+$NetBSD: patch-aa,v 1.5 2007/11/08 03:56:58 obache Exp $
 
---- threadutil/src/ThreadPool.c.orig	2007-06-10 03:48:25.000000000 +0000
+--- threadutil/src/ThreadPool.c.orig	2007-11-05 13:38:41.000000000 +0000
 +++ threadutil/src/ThreadPool.c
-@@ -96,7 +96,7 @@ SetPolicyType( PolicyType in )
-     #else
-     #ifdef WIN32
+@@ -98,7 +98,7 @@ SetPolicyType( PolicyType in )
+     return 0;
+ #elif defined(WIN32)
       return sched_setscheduler( 0, in);
--    #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
-+    #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L
+-#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 )
+@@ -126,7 +126,7 @@ SetPolicyType( PolicyType in )
  static int
  SetPriority( ThreadPriority priority )
  {
diff --git a/net/libupnp/patches/patch-ac b/net/libupnp/patches/patch-ac
index b0097b7d534..56fff151392 100644
--- a/net/libupnp/patches/patch-ac
+++ b/net/libupnp/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2007/08/19 01:36:22 obache Exp $
+$NetBSD: patch-ac,v 1.5 2007/11/08 03:56:58 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.orig	2007-08-06 01:21:23.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)
@@ -8,27 +8,28 @@ $NetBSD: patch-ac,v 1.4 2007/08/19 01:36:22 obache Exp $
          // platform-specific stuff below
 -#if defined(WIN32) || defined(__CYGWIN__)
 +#if defined(WIN32) || defined(__CYGWIN__) || defined(_AIX50) || defined(__upux11)
-         h=gethostbyname(temp_host_name);
+         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,
+         errCode = gethostbyname_r(
+                 temp_host_name,
+                 &h,
+@@ -647,12 +647,17 @@ parse_hostport( const char *in,
          if ( h == NULL ) {
-             errCode = 1;
+                 errCode = 1;
          }
 -#elif defined(__linux__)
 +#elif defined(__GLIBC__)
-         errCode = gethostbyname_r( temp_host_name,
-                                    &h_buf,
-                                    temp_hostbyname_buff,
-                                    BUFFER_SIZE, &h, &errcode );
+         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;
+         {
+         struct addrinfo hints, *res, *res0;
diff --git a/net/libupnp/patches/patch-ah b/net/libupnp/patches/patch-ah
index 425cbb4d5a6..500aa069e46 100644
--- a/net/libupnp/patches/patch-ah
+++ b/net/libupnp/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.2 2007/08/19 01:36:23 obache Exp $
+$NetBSD: patch-ah,v 1.3 2007/11/08 03:56:58 obache Exp $
 
---- threadutil/inc/ithread.h.orig	2007-05-25 14:39:38.000000000 +0000
+--- threadutil/inc/ithread.h.orig	2007-11-06 01:46:41.000000000 +0000
 +++ threadutil/inc/ithread.h
 @@ -45,7 +45,7 @@ extern "C" {
- #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+ 	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
  #endif
  
 -#ifdef PTHREAD_MUTEX_RECURSIVE
 +#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
- /* This system has SuS2-compliant mutex attributes.
-  * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
-  */
+ 	/* This system has SuS2-compliant mutex attributes.
+ 	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
+ 	 */