Update libupnp to 1.6.3.

*******************************************************************************
Version 1.6.3
*******************************************************************************

2007-12-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Using pthread flags for the whole project, not just at the places
	individually indicated by several Makefile.am files spread all over
	the directories. That was too much error prone.

2007-12-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Added a configure test to check if pthread_rwlock_t is available.
	Define _GNU_SOURCE if needed. The fallback behaviou will only be
	implemented if _GNU_SOURCE prooves to be insufficient on some
	platforms. Thanks to Jonathan Casiot (no_dice) and Robert Gingher
	(robsbox).

2007-12-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Removed unused iasnprintf.{c,h} files.

2007-12-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Removed STATSONLY() macro from ThreadPool.{c,h}.
	* Removed time() usage from ThreadPool.c.
	* Fixed STATS = 0 compilation.

2007-12-16 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Library was not compiling on FreeBSD 7. Code now no longer uses
	ftime(), using gettimeofday() instead. Thanks to Josh Carroll.

4 files changed, 32 insertions, 22 deletions

diff --git a/net/libupnp/Makefile b/net/libupnp/Makefile
index 053a2608864..322c227aca1 100644
--- a/net/libupnp/Makefile
+++ b/net/libupnp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2007/12/11 00:21:20 obache Exp $
+# $NetBSD: Makefile,v 1.9 2008/01/03 12:32:34 obache Exp $
 #
 
-DISTNAME=		libupnp-1.6.2
+DISTNAME=		libupnp-1.6.3
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pupnp/}
 EXTRACT_SUFX=		.tar.bz2
@@ -19,6 +19,8 @@ CONFIGURE_ARGS+=	--with-documentation
 
 PKGCONFIG_OVERRIDE+=	libupnp.pc.in
 
+BUILDLINK_TRANSFORM+=	rm:-lcompat
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 TEST_TARGET=		check
diff --git a/net/libupnp/PLIST b/net/libupnp/PLIST
index 28c5d4ab077..29675e88ec1 100644
--- a/net/libupnp/PLIST
+++ b/net/libupnp/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2007/08/19 01:36:22 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/01/03 12:32:34 obache Exp $
 include/upnp/FreeList.h
 include/upnp/LinkedList.h
 include/upnp/ThreadPool.h
 include/upnp/TimerThread.h
-include/upnp/iasnprintf.h
 include/upnp/ithread.h
 include/upnp/ixml.h
 include/upnp/upnp.h
diff --git a/net/libupnp/distinfo b/net/libupnp/distinfo
index 81b1d544bc4..416714836eb 100644
--- a/net/libupnp/distinfo
+++ b/net/libupnp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2007/12/11 00:21:20 obache Exp $
+$NetBSD: distinfo,v 1.9 2008/01/03 12:32:34 obache Exp $
 
-SHA1 (libupnp-1.6.2.tar.bz2) = 188dbce61c1757ea2a4dc7ba3120c461f803c9a0
-RMD160 (libupnp-1.6.2.tar.bz2) = ecaddab6e56e5c6f3f3ea78d088e52f4f38dc6f1
-Size (libupnp-1.6.2.tar.bz2) = 1137398 bytes
-SHA1 (patch-aa) = 92ff665d62732956d1e429db0d6d754f65181b41
+SHA1 (libupnp-1.6.3.tar.bz2) = 60c45f2a1090b186cdb4a968f76b85b5cef9b28b
+RMD160 (libupnp-1.6.3.tar.bz2) = 12a36ad263e4e66fb9c4d9d5ca9ea41dcb55d650
+Size (libupnp-1.6.3.tar.bz2) = 1136813 bytes
+SHA1 (patch-aa) = 5999583dfe62e1293f08547008f531c2d3caae8b
 SHA1 (patch-ac) = 05ba4584d2ebdb2de041e67f4c8d1c05e4fc1970
 SHA1 (patch-ae) = 7331c61d5b3a47ca3865788cf88a973d5e9352a1
 SHA1 (patch-ag) = b6b555fd2e7d5ddf5f63b25d8b915cdd7d0d03ba
diff --git a/net/libupnp/patches/patch-aa b/net/libupnp/patches/patch-aa
index 4b7678ac326..d9cc527129b 100644
--- a/net/libupnp/patches/patch-aa
+++ b/net/libupnp/patches/patch-aa
@@ -1,22 +1,31 @@
-$NetBSD: patch-aa,v 1.5 2007/11/08 03:56:58 obache Exp $
+$NetBSD: patch-aa,v 1.6 2008/01/03 12:32:34 obache Exp $
 
---- threadutil/src/ThreadPool.c.orig	2007-11-05 13:38:41.000000000 +0000
+--- threadutil/src/ThreadPool.c.orig	2007-12-25 17:32:22.000000000 +0000
 +++ threadutil/src/ThreadPool.c
-@@ -98,7 +98,7 @@ SetPolicyType( PolicyType in )
-     return 0;
+@@ -234,7 +234,7 @@ static int SetPolicyType( PolicyType in 
+ 	return 0;
  #elif defined(WIN32)
-      return sched_setscheduler( 0, in);
+ 	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;
+ 	struct sched_param current;
  
-      sched_getparam( 0, &current );
-@@ -126,7 +126,7 @@ SetPolicyType( PolicyType in )
- static int
- SetPriority( ThreadPriority priority )
+ 	sched_getparam( 0, &current );
+@@ -261,7 +261,7 @@ static int 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;
+ 	int currentPolicy;
+ 	int minPriority = 0;
+ 	int maxPriority = 0;
+@@ -389,7 +389,7 @@ static void SetSeed()
+ 	gettimeofday(&t, NULL);
+ #if defined(WIN32)
+  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
+ #elif defined(__linux__)
+  	srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );