From owner-svn-ports-all@FreeBSD.ORG Mon Mar 2 21:05:17 2015 Return-Path: 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 8C25EFF7; Mon, 2 Mar 2015 21:05:17 +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 772146EC; Mon, 2 Mar 2015 21:05:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t22L5GOK097719; Mon, 2 Mar 2015 21:05:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t22L5GwM097714; Mon, 2 Mar 2015 21:05:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503022105.t22L5GwM097714@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 2 Mar 2015 21:05:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380296 - in head/devel/pkgconf: . 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Mar 2015 21:05:17 -0000 Author: bapt Date: Mon Mar 2 21:05:15 2015 New Revision: 380296 URL: https://svnweb.freebsd.org/changeset/ports/380296 QAT: https://qat.redports.org/buildarchive/r380296/ Log: Add a patch to stream spaces after quoted newlines This fix .pc files with multi line fields Added: head/devel/pkgconf/files/ head/devel/pkgconf/files/patch-fileio.c (contents, props changed) Modified: head/devel/pkgconf/Makefile Modified: head/devel/pkgconf/Makefile ============================================================================== --- head/devel/pkgconf/Makefile Mon Mar 2 20:21:38 2015 (r380295) +++ head/devel/pkgconf/Makefile Mon Mar 2 21:05:15 2015 (r380296) @@ -2,6 +2,7 @@ PORTNAME= pkgconf PORTVERSION= 0.9.7 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://rabbit.dereferenced.org/~nenolod/distfiles/ \ http://files.etoilebsd.net/pkgconf/ Added: head/devel/pkgconf/files/patch-fileio.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pkgconf/files/patch-fileio.c Mon Mar 2 21:05:15 2015 (r380296) @@ -0,0 +1,29 @@ +diff --git fileio.c fileio.c +index fed3da9..2e15833 100644 +--- fileio.c ++++ fileio.c +@@ -37,13 +37,22 @@ pkg_fgetline(char *line, size_t size, FILE *stream) + + else if (c == '\n') + { +- *s++ = c; +- + if (quoted) + { ++ /* Trim spaces */ ++ do { ++ c2 = getc(stream); ++ } while (c2 == '\t' || c2 == ' '); ++ ++ ungetc(c2, stream); ++ + quoted = false; + continue; + } ++ else ++ { ++ *s++ = c; ++ } + + break; + }