Date: Mon, 2 Mar 2015 21:05:16 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380296 - in head/devel/pkgconf: . files Message-ID: <201503022105.t22L5GwM097714@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503022105.t22L5GwM097714>