From owner-svn-ports-head@FreeBSD.ORG  Tue Sep  4 19:03:46 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 808F1106566C;
	Tue,  4 Sep 2012 19:03:46 +0000 (UTC)
	(envelope-from pawel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BF548FC15;
	Tue,  4 Sep 2012 19:03:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q84J3kIp004017;
	Tue, 4 Sep 2012 19:03:46 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q84J3k4e004014;
	Tue, 4 Sep 2012 19:03:46 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201209041903.q84J3k4e004014@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Tue, 4 Sep 2012 19:03:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303668 - in head/devel/upnp: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Sep 2012 19:03:46 -0000

Author: pawel
Date: Tue Sep  4 19:03:45 2012
New Revision: 303668
URL: http://svn.freebsd.org/changeset/ports/303668

Log:
  Add patch to fix uuid_create() namespace clash with libc, this affects
  at least multimedia/vlc port (crash while checking upnp devices)
  
  Submitted by:   nox

Added:
  head/devel/upnp/files/patch-upnp-src-inc-uuid.h   (contents, props changed)
Modified:
  head/devel/upnp/Makefile

Modified: head/devel/upnp/Makefile
==============================================================================
--- head/devel/upnp/Makefile	Tue Sep  4 18:30:48 2012	(r303667)
+++ head/devel/upnp/Makefile	Tue Sep  4 19:03:45 2012	(r303668)
@@ -7,6 +7,7 @@
 
 PORTNAME=	upnp
 PORTVERSION=	1.6.17
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}

Added: head/devel/upnp/files/patch-upnp-src-inc-uuid.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/upnp/files/patch-upnp-src-inc-uuid.h	Tue Sep  4 19:03:45 2012	(r303668)
@@ -0,0 +1,17 @@
+--- upnp/src/inc/uuid.h.orig	2012-02-23 18:48:42.000000000 +0100
++++ upnp/src/inc/uuid.h	2012-09-04 20:09:52.000000000 +0200
+@@ -22,6 +22,14 @@
+ 
+ #include "sysdep.h"
+ 
++#ifdef __FreeBSD__
++/* Workaround to avoid picking up different uuid_* fns from FreeBSD's libc */
++#define uuid_create		libupnp_uuid_create
++#define uuid_unpack		libupnp_uuid_unpack
++#define uuid_create_from_name	libupnp_uuid_create_from_name
++#define uuid_compare		libupnp_uuid_compare
++#endif
++
+ /*! . */
+ typedef struct _uuid_upnp {
+ 	/*! . */