Index: head/devel/pkgconf/files/patch-fail-on-missing_and_keep-backslash =================================================================== --- head/devel/pkgconf/files/patch-fail-on-missing_and_keep-backslash (revision 302794) +++ head/devel/pkgconf/files/patch-fail-on-missing_and_keep-backslash (nonexistent) @@ -1,63 +0,0 @@ -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" \ Property changes on: head/devel/pkgconf/files/patch-fail-on-missing_and_keep-backslash ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/pkgconf/Makefile =================================================================== --- head/devel/pkgconf/Makefile (revision 302794) +++ head/devel/pkgconf/Makefile (revision 302795) @@ -1,29 +1,29 @@ # New ports collection makefile for: pkgconf # Date created: 2012-07-22 # Whom: Baptiste Daroussin # # $FreeBSD$ # PORTNAME= pkgconf -PORTVERSION= 0.8.6 +PORTVERSION= 0.8.7 CATEGORIES= devel -MASTER_SITES= http://nenolod.net/~nenolod/distfiles/ +MASTER_SITES= http://tortois.es/~nenolod/distfiles/ MAINTAINER= bapt@FreeBSD.org COMMENT= pkg-config compatible utility which does not depend on glib LICENSE= BSD GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig \ --with-system-libdir=/usr/lib \ --with-system-includedir=/usr/include USE_BZIP2= yes CONFLICTS_INSTALL= pkg-config-* post-install: ${LN} -sf ${PREFIX}/bin/pkgconf ${PREFIX}/bin/pkg-config .include Index: head/devel/pkgconf/distinfo =================================================================== --- head/devel/pkgconf/distinfo (revision 302794) +++ head/devel/pkgconf/distinfo (revision 302795) @@ -1,2 +1,2 @@ -SHA256 (pkgconf-0.8.6.tar.bz2) = 05a6f88b7654b93335f9dc292e5e6141d63d43a526337f16c873e301eb5a77d4 -SIZE (pkgconf-0.8.6.tar.bz2) = 79582 +SHA256 (pkgconf-0.8.7.tar.bz2) = ee075e9d601e5d8582085fc662a619b34643550383c75f6aef37016ab99371f9 +SIZE (pkgconf-0.8.7.tar.bz2) = 79823