From owner-svn-ports-all@FreeBSD.ORG  Sat Mar 28 20:29:30 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 76A2889C;
 Sat, 28 Mar 2015 20:29:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6241E342;
 Sat, 28 Mar 2015 20:29:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2SKTU43040653;
 Sat, 28 Mar 2015 20:29:30 GMT (envelope-from demon@FreeBSD.org)
Received: (from demon@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2SKTUhZ040652;
 Sat, 28 Mar 2015 20:29:30 GMT (envelope-from demon@FreeBSD.org)
Message-Id: <201503282029.t2SKTUhZ040652@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: demon set sender to
 demon@FreeBSD.org using -f
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Sat, 28 Mar 2015 20:29:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382553 - head/net-mgmt/collectd5/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Mar 2015 20:29:30 -0000

Author: demon
Date: Sat Mar 28 20:29:29 2015
New Revision: 382553
URL: https://svnweb.freebsd.org/changeset/ports/382553
QAT: https://qat.redports.org/buildarchive/r382553/

Log:
  Fix broken curl_xml plugin.
  Obtained from upstream (https://github.com/collectd/collectd/issues/931)
  
  Approved by:	maintainer

Added:
  head/net-mgmt/collectd5/files/patch-src-curl_xml.c   (contents, props changed)

Added: head/net-mgmt/collectd5/files/patch-src-curl_xml.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/collectd5/files/patch-src-curl_xml.c	Sat Mar 28 20:29:29 2015	(r382553)
@@ -0,0 +1,11 @@
+--- src/curl_xml.c.orig	2015-03-28 23:25:34.546602000 +0300
++++ src/curl_xml.c	2015-03-28 23:25:51.513304000 +0300
+@@ -385,7 +385,7 @@ static int cx_handle_instance_xpath (xml
+   /* If the base xpath returns more than one block, the result is assumed to be
+    * a table. The `Instance' option is not optional in this case. Check for the
+    * condition and inform the user. */
+-  if (is_table)
++  if (is_table && (vl->type_instance == NULL))
+   {
+     WARNING ("curl_xml plugin: "
+         "Base-XPath %s is a table (more than one result was returned), "