4 files changed, 31 insertions, 31 deletions
diff --git a/net/gupnp-tools/Makefile b/net/gupnp-tools/Makefile
index 3d28f118964..49a65c1d951 100644
--- a/net/gupnp-tools/Makefile
+++ b/net/gupnp-tools/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2012/10/02 17:11:46 tron Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/06 08:21:00 ryoon Exp $
 #
 
-DISTNAME=	gupnp-tools-0.8
-PKGREVISION=	14
+DISTNAME=	gupnp-tools-0.8.4
 CATEGORIES=	net
-MASTER_SITES=	http://www.gupnp.org/sources/gupnp-tools/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gupnp-tools/0.8/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gupnp.org/
@@ -18,7 +18,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
 
 .include "../../net/gupnp/buildlink3.mk"
 .include "../../net/gupnp-av/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/net/gupnp-tools/PLIST b/net/gupnp-tools/PLIST
index 060309ef3ea..fe91573625f 100644
--- a/net/gupnp-tools/PLIST
+++ b/net/gupnp-tools/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/02 11:41:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/10/06 08:21:00 ryoon Exp $
+bin/gssdp-discover
 bin/gupnp-av-cp
 bin/gupnp-network-light
 bin/gupnp-universal-cp
diff --git a/net/gupnp-tools/distinfo b/net/gupnp-tools/distinfo
index cd9e607e0d6..e87a19d9cba 100644
--- a/net/gupnp-tools/distinfo
+++ b/net/gupnp-tools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2010/02/16 15:30:50 wiz Exp $
+$NetBSD: distinfo,v 1.4 2012/10/06 08:21:00 ryoon Exp $
 
-SHA1 (gupnp-tools-0.8.tar.gz) = a0ef317e752ba08be3e20b3c183b3a0c2dadbb6e
-RMD160 (gupnp-tools-0.8.tar.gz) = 2e0ff56ff148a7bcfba779219421022f88bb1b8b
-Size (gupnp-tools-0.8.tar.gz) = 544621 bytes
-SHA1 (patch-aa) = fc9305718230db24d367394efc840f35bb9330e8
+SHA1 (gupnp-tools-0.8.4.tar.xz) = 540fb8fd8c6a40a5ef75cfd2987af5971fef72a4
+RMD160 (gupnp-tools-0.8.4.tar.xz) = ce45965a77ab77bfc127af178425416e6ccb5187
+Size (gupnp-tools-0.8.4.tar.xz) = 449512 bytes
+SHA1 (patch-aa) = 9fbf1acae567517ca7be3b41b4499adc6c179985
diff --git a/net/gupnp-tools/patches/patch-aa b/net/gupnp-tools/patches/patch-aa
index 0d6d41c149e..a0103cfd7cc 100644
--- a/net/gupnp-tools/patches/patch-aa
+++ b/net/gupnp-tools/patches/patch-aa
@@ -1,37 +1,36 @@
-$NetBSD: patch-aa,v 1.3 2010/02/16 15:30:50 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2012/10/06 08:21:00 ryoon Exp $
 
---- src/network-light/upnp.c.orig	2009-08-26 14:54:42.000000000 +0000
+--- src/network-light/upnp.c.orig	2011-07-30 07:39:56.000000000 +0000
 +++ src/network-light/upnp.c
-@@ -25,7 +25,11 @@
- #include <stdio.h>
- #include <locale.h>
+@@ -27,7 +27,11 @@
  #include <string.h>
+ #include <gmodule.h>
+ #ifndef G_OS_WIN32
 +#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <uuid.h>
 +#else
  #include <uuid/uuid.h>
 +#endif
- #include <glib/gstdio.h>
- 
- #include "gui.h"
-@@ -317,9 +321,19 @@ static void init_uuid ()
-         uuid_t uuid_context;
-         xmlNode *uuid_node;
+ #else
+ #include <rpc.h>
+ typedef UUID uuid_t;
+@@ -335,8 +339,19 @@ static void init_uuid ()
          char *udn;
--
+ 
+ #ifndef G_OS_WIN32
 +#if defined(__NetBSD__) || defined(__DragonFly__)
-+	char *myuuidstr;
++char *myuuidstr;
 +#endif
 +
 +#if defined(__NetBSD__) || defined(__DragonFly__)
-+        uuid_create(&uuid_context, 0);
-+        uuid_to_string(&uuid_context, &myuuidstr, 0);
-+        strncpy(uuid, myuuidstr, sizeof(uuid));
-+        free(myuuidstr);
++	uuid_create(&uuid_context, 0);
++	uuid_to_string(&uuid_context, &myuuidstr, 0);
++	strncpy(uuid, myuuidstr, sizeof(uuid));
++	free(myuuidstr);
 +#else
          uuid_generate (uuid_context);
          uuid_unparse (uuid_context, uuid);
 +#endif
- 
-         uuid_node = xml_util_get_element ((xmlNode *) doc->doc,
-                                           "root",
+ #else
+ 	{
+ 		gchar *tmp_uuid;