From owner-svn-ports-head@FreeBSD.ORG Wed Aug 15 21:38:52 2012 Return-Path: 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 AB6FE106564A; Wed, 15 Aug 2012 21:38:52 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 95CB28FC08; Wed, 15 Aug 2012 21:38:52 +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 q7FLcq0b015632; Wed, 15 Aug 2012 21:38:52 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7FLcqL8015628; Wed, 15 Aug 2012 21:38:52 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201208152138.q7FLcqL8015628@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 15 Aug 2012 21:38:52 +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: r302606 - in head/devel/pkgconf: . 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2012 21:38:52 -0000 Author: bapt Date: Wed Aug 15 21:38:51 2012 New Revision: 302606 URL: http://svn.freebsd.org/changeset/ports/302606 Log: - update to 0.8.6 (plus patches from upstream git) - patches are: * fix pkgconf returning 0 when a dependency is missing instead of 1 [1] * fix \" in cflags being lost [2] Reported by: Olivier Smedts [1], tj@ [2] Added: head/devel/pkgconf/files/ head/devel/pkgconf/files/patch-fail-on-missing_and_keep-backslash (contents, props changed) Modified: head/devel/pkgconf/Makefile head/devel/pkgconf/distinfo Modified: head/devel/pkgconf/Makefile ============================================================================== --- head/devel/pkgconf/Makefile Wed Aug 15 21:28:11 2012 (r302605) +++ head/devel/pkgconf/Makefile Wed Aug 15 21:38:51 2012 (r302606) @@ -6,7 +6,7 @@ # PORTNAME= pkgconf -PORTVERSION= 0.8.5 +PORTVERSION= 0.8.6 CATEGORIES= devel MASTER_SITES= http://nenolod.net/~nenolod/distfiles/ Modified: head/devel/pkgconf/distinfo ============================================================================== --- head/devel/pkgconf/distinfo Wed Aug 15 21:28:11 2012 (r302605) +++ head/devel/pkgconf/distinfo Wed Aug 15 21:38:51 2012 (r302606) @@ -1,2 +1,2 @@ -SHA256 (pkgconf-0.8.5.tar.bz2) = 78283c42f6ba80e58f6425a9b2d5878f0cfa3b34f4e9bf130c2b97137b7e41f0 -SIZE (pkgconf-0.8.5.tar.bz2) = 81307 +SHA256 (pkgconf-0.8.6.tar.bz2) = 05a6f88b7654b93335f9dc292e5e6141d63d43a526337f16c873e301eb5a77d4 +SIZE (pkgconf-0.8.6.tar.bz2) = 79582 Added: head/devel/pkgconf/files/patch-fail-on-missing_and_keep-backslash ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pkgconf/files/patch-fail-on-missing_and_keep-backslash Wed Aug 15 21:38:51 2012 (r302606) @@ -0,0 +1,63 @@ +diff --git argvsplit.c argvsplit.c +index cbfb55d..e9ed7b6 100644 +--- argvsplit.c ++++ argvsplit.c +@@ -92,6 +92,8 @@ pkg_argv_split(const char *src, int *argc, char ***argv) + free(argv); + free(buf); + return -1; ++ } else { ++ *dst_iter++ = '\\'; + } + default: + *dst_iter++ = *src_iter; +diff --git fileio.c fileio.c +index f1247c9..2c6b9e9 100644 +--- fileio.c ++++ fileio.c +@@ -73,7 +73,14 @@ pkg_fgetline(char *line, size_t size, FILE *stream) + break; + } + else ++ { ++ if (quoted) { ++ *s++ = '\\'; ++ quoted = false; ++ } + *s++ = c; ++ } ++ + } + + *s = '\0'; +diff --git tests/lib1/quotes.pc tests/lib1/quotes.pc +new file mode 100644 +index 0000000..1aee256 +--- /dev/null ++++ tests/lib1/quotes.pc +@@ -0,0 +1,10 @@ ++prefix=/usr ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include ++ ++Name: quotes ++Description: A testing pkg-config file ++Version: 1.2.3 ++Libs: -L${libdir} -lfoo ++Cflags: -DQUOTED=\"bla\" +diff --git tests/run.sh.in tests/run.sh.in +index 231af22..ee50b3d 100644 +--- tests/run.sh.in ++++ tests/run.sh.in +@@ -167,6 +167,10 @@ run_test "PKG_CONFIG_PATH=${selfdir}/lib1 ${1} --max-version 2.0 'foo '; echo \$ + run_test "PKG_CONFIG_PATH=${selfdir}/lib1 ${1} --cflags missing-require; echo \$?" \ + '1' + ++# test quoted #35 ++run_test "PKG_CONFIG_PATH=${selfdir}/lib1 ${1} --cflags quotes" \ ++ "-DQUOTED=\\\"bla\\\"" ++ + # 10) tests for internal getopt implementation with options at the end + if [ "x@STRICT_MODE@" = "xno" ]; then + run_test "PKG_CONFIG_PATH=${selfdir}/lib1 ${1} foo --libs" \