update to 0.20.1

This switches to the new stable release branch.

4 files changed, 23 insertions, 35 deletions

diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 7171ba2026d..1ffb44fbf6f 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2013/01/26 21:36:40 adam Exp $
+# $NetBSD: Makefile,v 1.20 2013/03/15 18:09:30 drochner Exp $
 #
 
-DISTNAME=	gupnp-0.18.4
-PKGREVISION=	1
+DISTNAME=	gupnp-0.20.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gupnp/0.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gupnp/0.20/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/net/gupnp/distinfo b/net/gupnp/distinfo
index 57dae0f6800..ac358c9c898 100644
--- a/net/gupnp/distinfo
+++ b/net/gupnp/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2012/10/06 08:14:20 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2013/03/15 18:09:30 drochner Exp $
 
-SHA1 (gupnp-0.18.4.tar.xz) = e2ae6fd8e62ab280c0808af9ab122c90f090f274
-RMD160 (gupnp-0.18.4.tar.xz) = 9995aedea4a455024430d5286d4de020e0d45654
-Size (gupnp-0.18.4.tar.xz) = 361524 bytes
+SHA1 (gupnp-0.20.1.tar.xz) = 10d89150a814b4ccd298cc009b4ddc8ae5982696
+RMD160 (gupnp-0.20.1.tar.xz) = 2eefbc333c57082178892b31fcc05d9dd7766844
+Size (gupnp-0.20.1.tar.xz) = 368108 bytes
 SHA1 (patch-ab) = e43380eac64d815fff1a1b62f73e35e1bdfb9633
-SHA1 (patch-ad) = 4e6066594153e3ca10b32618fc3afb1144d50d54
-SHA1 (patch-ae) = 4601bc1d9c56a509241c99e529ea65fe5bf7986c
+SHA1 (patch-ad) = fdf9f8a18c5168130d0c7f1fec7c17813db35ec9
diff --git a/net/gupnp/patches/patch-ad b/net/gupnp/patches/patch-ad
index a10324216cb..47a074a9b88 100644
--- a/net/gupnp/patches/patch-ad
+++ b/net/gupnp/patches/patch-ad
@@ -1,28 +1,28 @@
-$NetBSD: patch-ad,v 1.3 2009/09/19 14:18:31 sno Exp $
+$NetBSD: patch-ad,v 1.4 2013/03/15 18:09:30 drochner Exp $
 
---- libgupnp/gupnp-service.c.orig	2009-06-02 14:10:25.000000000 +0200
-+++ libgupnp/gupnp-service.c	2009-09-19 16:08:38.000000000 +0200
-@@ -30,7 +30,11 @@
- #include <gobject/gvaluecollector.h>
- #include <gmodule.h>
- #include <libsoup/soup-date.h>
+--- libgupnp/gupnp-service.c.orig	2013-02-20 12:35:57.000000000 +0000
++++ libgupnp/gupnp-service.c
+@@ -44,8 +44,12 @@
+ #ifdef G_OS_WIN32
+ #include <rpc.h>
+ #else
 +#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
 +#include <uuid.h>
 +#else
  #include <uuid/uuid.h>
+ #endif
 +#endif
- #include <string.h>
- #include "gupnp-service.h"
- #include "gupnp-root-device.h"
-@@ -843,9 +847,19 @@
- {
+ 
+ #define SUBSCRIPTION_TIMEOUT 300 /* DLNA (7.2.22.1) enforced */
+ 
+@@ -1100,9 +1104,19 @@ generate_sid (void)
+ #else
          uuid_t id;
          char out[39];
--
 +#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
 +	char *myout;
 +#endif
-+
+ 
 +#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
 +	uuid_create(&id, 0);
 +	uuid_to_string(&id, &myout, 0);
@@ -34,4 +34,4 @@ $NetBSD: patch-ad,v 1.3 2009/09/19 14:18:31 sno Exp $
 +#endif
  
          return g_strdup_printf ("uuid:%s", out);
- }
+ #endif
diff --git a/net/gupnp/patches/patch-ae b/net/gupnp/patches/patch-ae
deleted file mode 100644
index b9dc260db7e..00000000000
--- a/net/gupnp/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/08/02 11:35:26 drochner Exp $
-
---- gupnp-1.0.pc.in.orig	2009-04-30 13:54:20.000000000 +0200
-+++ gupnp-1.0.pc.in
-@@ -9,4 +9,4 @@ Version: @VERSION@
- Libs: -L${libdir} -lgupnp-1.0
- Cflags: -I${includedir}/gupnp-1.0
- Requires: gssdp-1.0 libxml-2.0 libsoup-2.4
--Requires.Private: uuid gmodule-2.0
-+Requires.Private: gmodule-2.0