diff options
| author | wiz <wiz> | 2015-01-20 10:28:52 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-01-20 10:28:52 +0000 |
| commit | fd3b9232c49037b59479f962c2975957ec53731c (patch) | |
| tree | 8f62a59383aa8dd2741d2dd43385106f07192e40 /net/gupnp-tools | |
| parent | f81bc2863efa5dfe2e412d822858bc8542b6e3d9 (diff) | |
| download | pkgsrc-fd3b9232c49037b59479f962c2975957ec53731c.tar.gz | |
Prepare patch-aa for upstreaming.
Extend to FreeBSD.
Bump PKGREVISION.
Diffstat (limited to 'net/gupnp-tools')
| -rw-r--r-- | net/gupnp-tools/Makefile | 5 | ||||
| -rw-r--r-- | net/gupnp-tools/distinfo | 4 | ||||
| -rw-r--r-- | net/gupnp-tools/patches/patch-aa | 28 |
3 files changed, 19 insertions, 18 deletions
diff --git a/net/gupnp-tools/Makefile b/net/gupnp-tools/Makefile index 5934d334228..039a13763ee 100644 --- a/net/gupnp-tools/Makefile +++ b/net/gupnp-tools/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2014/10/07 16:47:32 adam Exp $ -# +# $NetBSD: Makefile,v 1.45 2015/01/20 10:28:52 wiz Exp $ DISTNAME= gupnp-tools-0.8.9 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gupnp-tools/0.8/} EXTRACT_SUFX= .tar.xz diff --git a/net/gupnp-tools/distinfo b/net/gupnp-tools/distinfo index 9b1b255bfa5..ec47e1e2379 100644 --- a/net/gupnp-tools/distinfo +++ b/net/gupnp-tools/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2014/02/05 17:33:12 drochner Exp $ +$NetBSD: distinfo,v 1.9 2015/01/20 10:28:52 wiz Exp $ SHA1 (gupnp-tools-0.8.9.tar.xz) = afe0855510740bf44bc32b716bd0687edcda0f94 RMD160 (gupnp-tools-0.8.9.tar.xz) = b59c317338bffb9ef2b8b4fba09a703baab73c43 Size (gupnp-tools-0.8.9.tar.xz) = 479616 bytes -SHA1 (patch-aa) = 9fbf1acae567517ca7be3b41b4499adc6c179985 +SHA1 (patch-aa) = 4d651ceaa575d6c6c27a9ec2010aeefeb3bfb3ad diff --git a/net/gupnp-tools/patches/patch-aa b/net/gupnp-tools/patches/patch-aa index a0103cfd7cc..26fc9585d70 100644 --- a/net/gupnp-tools/patches/patch-aa +++ b/net/gupnp-tools/patches/patch-aa @@ -1,12 +1,15 @@ -$NetBSD: patch-aa,v 1.4 2012/10/06 08:21:00 ryoon Exp $ +$NetBSD: patch-aa,v 1.5 2015/01/20 10:28:53 wiz Exp $ ---- src/network-light/upnp.c.orig 2011-07-30 07:39:56.000000000 +0000 +Add UUID support for *BSD +https://bugzilla.gnome.org/show_bug.cgi?id=743234 + +--- src/network-light/upnp.c.orig 2013-10-20 11:15:48.000000000 +0000 +++ src/network-light/upnp.c @@ -27,7 +27,11 @@ #include <string.h> #include <gmodule.h> #ifndef G_OS_WIN32 -+#if defined(__NetBSD__) || defined(__DragonFly__) ++#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) +#include <uuid.h> +#else #include <uuid/uuid.h> @@ -14,19 +17,18 @@ $NetBSD: patch-aa,v 1.4 2012/10/06 08:21:00 ryoon Exp $ #else #include <rpc.h> typedef UUID uuid_t; -@@ -335,8 +339,19 @@ static void init_uuid () +@@ -335,8 +339,18 @@ static void init_uuid () char *udn; #ifndef G_OS_WIN32 -+#if defined(__NetBSD__) || defined(__DragonFly__) -+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); ++#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) ++ { ++ char *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); |