libpkgconf: personality: return the default personality if loading a personality file failed

2019-08-23 12:47:22 -05:00
78 changed files with 1397 additions and 3357 deletions
--- a/.builds/autoconf-alpine-edge.yml
+++ b/.builds/autoconf-alpine-edge.yml
@ -0,0 +1,23 @@
 image: alpine/edge
 packages:
  - build-base
  - autoconf
  - automake
  - libtool
  - kyua
  - atf
  - xz
  - gzip
 sources:
  - https://git.sr.ht/~kaniini/pkgconf
 tasks:
  - autogen: |
      cd ~/pkgconf
      sh autogen.sh
  - configure: |
      cd ~/pkgconf
      ./configure
  - distcheck: |
      cd ~/pkgconf
      make distcheck
--- a/.builds/autoconf-fedora-rawhide.yml
+++ b/.builds/autoconf-fedora-rawhide.yml
@ -0,0 +1,25 @@
 image: fedora/rawhide
 packages:
  - make
  - kernel-devel
  - gcc
  - gcc-c++
  - autoconf
  - automake
  - libtool
  - kyua
  - libatf-sh
  - xz
  - gzip
 sources:
  - https://git.sr.ht/~kaniini/pkgconf
 tasks:
  - autogen: |
      cd ~/pkgconf
      sh autogen.sh
  - configure: |
      cd ~/pkgconf
      ./configure
  - distcheck: |
      cd ~/pkgconf
      make distcheck
--- a/.builds/autoconf-freebsd-latest.yml
+++ b/.builds/autoconf-freebsd-latest.yml
@ -0,0 +1,19 @@
 image: freebsd/latest
 packages:
  - autoconf
  - automake
  - libtool
  - kyua
  - atf
 sources:
  - https://git.sr.ht/~kaniini/pkgconf
 tasks:
  - autogen: |
      cd ~/pkgconf
      sh autogen.sh
  - configure: |
      cd ~/pkgconf
      ./configure
  - distcheck: |
      cd ~/pkgconf
      make distcheck
--- a/.builds/meson-alpine-edge.yml
+++ b/.builds/meson-alpine-edge.yml
@ -0,0 +1,17 @@
 image: alpine/edge
 packages:
  - build-base
  - meson
  - ninja
  - kyua
  - atf
 sources:
  - https://git.sr.ht/~kaniini/pkgconf
 tasks:
  - configure: |
      cd ~/pkgconf
      meson build
  - distcheck: |
      cd ~/pkgconf
      ninja -C build
      ninja -C build test
--- a/.builds/meson-fedora-rawhide.yml
+++ b/.builds/meson-fedora-rawhide.yml
@ -0,0 +1,16 @@
 image: fedora/rawhide
 packages:
  - meson
  - ninja-build
  - kyua
  - libatf-sh
 sources:
  - https://git.sr.ht/~kaniini/pkgconf
 tasks:
  - configure: |
      cd ~/pkgconf
      meson build
  - distcheck: |
      cd ~/pkgconf
      ninja -C build
      ninja -C build test
--- a/.builds/meson-freebsd-latest.yml
+++ b/.builds/meson-freebsd-latest.yml
@ -0,0 +1,16 @@
 image: freebsd/latest
 packages:
  - meson
  - ninja
  - kyua
  - atf
 sources:
  - https://git.sr.ht/~kaniini/pkgconf
 tasks:
  - configure: |
      cd ~/pkgconf
      meson build
  - distcheck: |
      cd ~/pkgconf
      ninja -C build
      ninja -C build test
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,3 +0,0 @@
 github: kaniini
 patreon: kaniini
 liberapay: kaniini
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -1,153 +0,0 @@
 name: test
 on:
  push:
  pull_request:
 jobs:
  msys2:
    runs-on: windows-latest
    strategy:
      fail-fast: false
      matrix:
        include: [
          { msystem: MINGW64, arch: x86_64},
          { msystem: MINGW32, arch: i686}
        ]
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
      - name: setup-msys2
        uses: msys2/setup-msys2@v2
        with:
          msystem: ${{ matrix.msystem }}
          update: true
          install: >-
            mingw-w64-${{ matrix.arch }}-meson
            mingw-w64-${{ matrix.arch }}-ninja
            mingw-w64-${{ matrix.arch }}-gcc
      - name: Build
        shell: msys2 {0}
        run: |
          # the code assumes msvc style printf atm
          export CFLAGS=-D__USE_MINGW_ANSI_STDIO=0
          meson -Dtests=disabled _build
          meson compile -C _build
  debian-meson:
    runs-on: ubuntu-latest
    container:
      image: debian:testing
    steps:
      - name: Checkout
        uses: actions/checkout@v2
      - name: Update system and add dependencies
        run: |
          apt-get update
          apt-get install -y kyua atf-sh build-essential meson
      - name: Build
        run: |
          meson _build -Dwerror=true
          meson compile -C _build
      - name: Run tests
        run: |
          meson test -v -C _build
  debian-meson-asan:
    runs-on: ubuntu-latest
    container:
      image: debian:testing
    steps:
      - name: Checkout
        uses: actions/checkout@v2
      - name: Update system and add dependencies
        run: |
          apt-get update
          apt-get install -y kyua atf-sh build-essential meson
      - name: Build
        run: |
          meson _build -Db_sanitize=address
          meson compile -C _build
      - name: Run tests
        run: |
          meson test -v -C _build
        env:
          ASAN_OPTIONS: "exitcode=7"
  debian-autotools:
    runs-on: ubuntu-latest
    container:
      image: debian:testing
    steps:
      - name: Checkout
        uses: actions/checkout@v2
      - name: Update system and add dependencies
        run: |
          apt-get update
          apt-get install -y kyua atf-sh build-essential autoconf libtool
      - name: Build
        run: |
          ./autogen.sh
          ./configure
          make -j9
      - name: Run tests
        run: |
          make distcheck
  alpine-meson:
    runs-on: ubuntu-latest
    container:
      image: alpine
    steps:
      - name: Checkout
        uses: actions/checkout@v2
      - name: Update system and add dependencies
        run: |
          apk update
          apk add kyua atf build-base meson
      - name: Build
        run: |
          meson _build -Dwerror=true
          meson compile -C _build
      - name: Run tests
        run: |
          meson test -v -C _build
  alpine-autotools:
    runs-on: ubuntu-latest
    container:
      image: alpine
    steps:
      - name: Checkout
        uses: actions/checkout@v2
      - name: Update system and add dependencies
        run: |
          apk update
          apk add kyua atf build-base autoconf automake libtool xz gzip
      - name: Build
        run: |
          ./autogen.sh
          ./configure
          make -j9
      - name: Run tests
        run: |
          make distcheck
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -1,75 +0,0 @@
 pipeline:
  debian-meson:
    image: debian:testing
    commands:
      - apt-get update
      - apt-get install -y kyua atf-sh build-essential meson
      - meson _build -Dwerror=true
      - meson compile -C _build
      - meson test -v -C _build
    when:
      matrix:
        IMAGE: debian
        BUILD: meson
  debian-meson-asan:
    image: debian:testing
    environment:
      - ASAN_OPTIONS="exitcode=7"
    commands:
      - apt-get update
      - apt-get install -y kyua atf-sh build-essential meson
      - meson _build -Db_sanitize=address
      - meson compile -C _build
      - meson test -v -C _build
    when:
      matrix:
        IMAGE: debian
        BUILD: meson
  debian-autotools:
    image: debian:testing
    commands:
      - apt-get update
      - apt-get install -y kyua atf-sh build-essential autoconf libtool
      - ./autogen.sh
      - ./configure
      - make -j
      - make distcheck
    when:
      matrix:
        IMAGE: debian
        BUILD: autotools
  alpine-meson:
    image: alpine
    commands:
      - apk add -U --no-cache kyua atf build-base meson
      - meson _build -Dwerror=true
      - meson compile -C _build
      - meson test -v -C _build
    when:
      matrix:
        IMAGE: alpine
        BUILD: meson
  alpine-autotools:
    image: alpine
    commands:
      - apk add -U --no-cache kyua atf build-base autoconf automake libtool xz gzip
      - ./autogen.sh
      - ./configure
      - make -j
      - make distcheck
    when:
      matrix:
        IMAGE: alpine
        BUILD: autotools
 matrix:
  IMAGE:
    - debian
    - alpine
  BUILD:
    - meson
    - autotools
--- a/Makefile.am
+++ b/Makefile.am
@ -11,18 +11,14 @@ nodist_pkgconfig_DATA  = libpkgconf.pc
 AM_CFLAGS = -DPERSONALITY_PATH=\"$(personality_dir)\" -DPKG_DEFAULT_PATH=\"$(pkg_default_dir)\" -DSYSTEM_INCLUDEDIR=\"$(system_includedir)\" -DSYSTEM_LIBDIR=\"$(system_libdir)\"
-bin_PROGRAMS = pkgconf bomtool
+bin_PROGRAMS = pkgconf
 lib_LTLIBRARIES = libpkgconf.la
 EXTRA_DIST =	pkg.m4 \
 		meson.build \
 		meson_options.txt \
 		libpkgconf/meson.build \
 		libpkgconf/config.h.meson \
 		libpkgconf/win-dirent.h \
 		tests/lib-relocatable/lib/pkgconfig/foo.pc \
 		tests/lib1/argv-parse-2.pc \
 		tests/lib1/billion-laughs.pc \
 		tests/lib1/dos-lineendings.pc \
 		tests/lib1/paren-quoting.pc \
 		tests/lib1/argv-parse-3.pc \
@ -62,7 +58,6 @@ EXTRA_DIST =	pkg.m4 \
 		tests/lib3/bar.pc \
 		tests/lib1/conflicts.pc \
 		tests/lib1/omg-uninstalled.pc \
 		tests/lib1/omg-sysroot-uninstalled.pc \
 		tests/lib1/isystem.pc \
 		tests/lib1/idirafter.pc \
 		tests/lib1/idirafter-ordering.pc \
@ -78,7 +73,6 @@ EXTRA_DIST =	pkg.m4 \
 		tests/lib1/fragment-collision-intermediary.pc \
 		tests/lib1/fragment-collision-1.pc \
 		tests/lib1/fragment-collision-2.pc \
 		tests/lib1/fragment-comment.pc \
 		tests/lib1/fragment-escaping-1.pc \
 		tests/lib1/fragment-escaping-2.pc \
 		tests/lib1/fragment-escaping-3.pc \
@ -90,9 +84,6 @@ EXTRA_DIST =	pkg.m4 \
 		tests/lib1/malformed-1.pc \
 		tests/lib1/malformed-quoting.pc \
 		tests/lib1/malformed-version.pc \
 		tests/lib1/metapackage.pc \
 		tests/lib1/metapackage-1.pc \
 		tests/lib1/metapackage-2.pc \
 		tests/lib1/explicit-sysroot.pc \
 		tests/lib1/escaped-backslash.pc \
 		tests/lib1/cflags-internal.pc \
@ -103,10 +94,6 @@ EXTRA_DIST =	pkg.m4 \
 		tests/lib1/tuple-quoting.pc \
 		tests/lib1/empty-tuple.pc \
 		tests/lib1/orphaned-requires-private.pc \
 		tests/lib1/sysroot-dir-2.pc \
 		tests/lib1/sysroot-dir-3.pc \
 		tests/lib1/sysroot-dir-4.pc \
 		tests/lib1/sysroot-dir-5.pc \
 		$(test_scripts) \
 		doc/conf.py \
 		doc/extract.py \
@ -135,8 +122,7 @@ test_scripts=	tests/meson.build \
 		tests/sysroot.sh \
 		tests/version.sh
-test_sh = $(filter-out tests/meson.build, $(test_scripts))
+check_SCRIPTS=	$(test_scripts:.sh=)
 check_SCRIPTS = $(test_sh:.sh=)
 SUFFIXES=	.sh
@ -156,7 +142,7 @@ libpkgconf_la_SOURCES  =	\
 		libpkgconf/path.c		\
 		libpkgconf/personality.c	\
 		libpkgconf/parser.c
-libpkgconf_la_LDFLAGS = -no-undefined -version-info 4:0:0 -export-symbols-regex '^pkgconf_'
+libpkgconf_la_LDFLAGS = -no-undefined -version-info 3:0:0 -export-symbols-regex '^pkgconf_'
 dist_man_MANS    = 		\
 	man/pkgconf.1		\
@ -169,17 +155,11 @@ pkgconf_SOURCES  = \
 	cli/main.c				\
 	cli/getopt_long.c			\
 	cli/renderer-msvc.c
-pkgconf_CPPFLAGS = -I$(top_srcdir)/libpkgconf -I$(top_srcdir)/cli
+pkgconf_CPPFLAGS = -Ilibpkgconf -Icli
 noinst_HEADERS   = \
 	cli/getopt_long.h			\
 	cli/renderer-msvc.h
 bomtool_LDADD    = libpkgconf.la
 bomtool_SOURCES  = \
 	cli/bomtool/main.c				\
 	cli/getopt_long.c
 bomtool_CPPFLAGS = -I$(top_srcdir)/libpkgconf -I$(top_srcdir)/cli -I$(top_srcdir)/cli/bomtool
 dist_doc_DATA = README.md AUTHORS
 m4datadir              = $(datadir)/aclocal
--- a/213
+++ b/213
@ -1,219 +1,6 @@
 Changes from previous version of pkgconf
 ========================================
 Changes from 1.9.4 to 1.9.5:
 ----------------------------
 * Fix incorrect assumptions involving the use of ctype(3) functions.
  Patch by Taylor R Campbell.
 * Fix detection of provided functions on autoconf.
  Patches by Harmen Stoppels.
 * Fix deletion of tests/meson.build by the autoconf build system.
  Patch by h30032433.
 * Fix quoting rules in argvsplit.c.
  Patch by huyubiao.
 * Update libpkgconf documentation and documentation building scripts.
  Patches by Andrew Shadura.
 * Enforce maximum package count correctly for --modversion.
 Changes from 1.9.3 to 1.9.4:
 ----------------------------
 * Fix a buffer overflow vulnerability involving very large variable expansions.
  CVE-2023-24056
 * Fix a bunch of minor regressions with the solver.
 * Create separate solutions for `--cflags` and `--libs` when `--static` is not
  used.
 * Remove final trailing whitespace in pkgconf_fragment_render_buf().
 * Revert broken pkg.m4 change involving querying module versions in
  PKG_CHECK_MODULES.
 * Fix handling of tildes in version strings.
 * Various C99 formatting string fixes involving SIZE_FMT_SPECIFIER.
 Changes from 1.9.2 to 1.9.3:
 ----------------------------
 * Fix a bunch of minor code issues pointed out using Clang static analyzer.
 * New API: pkgconf_solution_free(), which frees a compiled solution graph.
 * Fix behavior when overriding global variables with `--define-variable`.
 Changes from 1.9.1 to 1.9.2:
 ----------------------------
 * Do not try to break dependency cycles across dependency lists.  This causes
  the solved graph to sometimes miss required dependency nodes because the
  solver detected an incorrect dependency cycle.
 * New API: pkgconf_queue_solve(), which replaces pkgconf_queue_apply().
  pkgconf_queue_apply is now deprecated and should not be used in new code.
 Changes from 1.9.0 to 1.9.1:
 ----------------------------
 * Skip graph flattening and traversal for query types which only make sense
  for a single pkg-config module.
  The old solver walked these graphs with --maximum-traverse-depth=1 in
  these cases, but this is no longer helpful because the graph is flattened
  by the new solver.
 Changes from 1.8.0 to 1.9.0:
 ----------------------------
 * pkgconf 1.9.0 is the first testing release in the pkgconf 2.0 development
  series.  While it is believed to be suitable for production, there may be
  bugs due to the overall redesign of the solver and other initiatives.
  Additionally, a future release of pkgconf plans will have additional ABI
  breaks for the libpkgconf library before the pkgconf 2.0 release is cut.
 * There is now a new solver that is designed to provide higher performance
  with complicated graphs, which works by flattening the dependency graph
  into a smaller set of dependencies.  This graph can then be evaluated
  instead of the original dependency graph without having to visit every
  edge in the graph.
  NOTE: This solver, while providing significant performance improvements,
  does so, at the cost of changed behavior for some edge cases (such as
  circular dependencies).
 * Bug fixes:
  - Resolved several memory leaks with edge cases when using libpkgconf
    directly.
  - pkgconf CLI now consistently frees libpkgconf resources under all
    circumstances.
  - SYSROOT rules are no longer applied to `-uninstalled` packages by
    default.  Use `PKG_CONFIG_PKGCONF1_SYSROOT_RULES` for legacy behavior.
 * A new `--license` selector has been added to the pkgconf CLI.  This uses
  SPDX expressions which can be set as the `License` field in `.pc` files.
  See the `pc(5)` manpage for more information.
 * The canonical location for pkgconf maintenance going forward is
  <https://gitea.treehouse.systems/ariadne/pkgconf>.  This is presently
  mirrored to GitHub for user convenience, but that mirroring will
  be terminated at some point (due to GitHub Copilot).
 Changes from 1.7.4 to 1.8.0:
 ----------------------------
 * This is the last planned maintenance branch.  I see pkgconf as basically
  a finished tool at this point, and very few people were ultimately interested
  in libpkgconf.  So, from here on out, it will just be bug fixes only and
  very minor enhancements.
 * Bug fixes:
  - Improved path handling on Windows to conform to what the MSYS2
    and Cygwin teams were already modifying pkgconf to do.
    Patches by Christoph Reiter.
  - Fix a minor memory leak relating to cross-personalities.
    Patch by Stone Tickle.
  - Fix static builds for Windows on Meson.
    Patch by Alexander Neumann.
  - Fix some edge cases with --redefine-prefix.
    Patch by midipix.
  - Do not prepend sysroot_dir if the .pc file does not exist in the
    sysroot.
    Patch by Sandro Mani.
  - Do not perform path filtering on default system include and library
    path lists.  This fixes consistency with other mechanisms that modify
    these path lists.
 * Enhancements:
  - Document the --validate option in the manpage.
    Patch by orbea.
 Changes from 1.7.3 to 1.7.4:
 ----------------------------
 * Bug fixes:
  - Fix null-dereference crash when pulling a malformed 'uninstalled'
    .pc file into a dependency tree.  Patch by Tobias Stöckmann.
  - Fix truncation of comment characters when quoted.
  - Fix handling of .pc module names in --list-all on Windows.
    Patch by Ryan Scott.
  - Handle platforms where realpath(3) requires a pre-allocated buffer.
    Patch by Fabian Groffen.
  - Fix version whitespace warning.
    Patch by Christoph Reiter.
 * Enhancements:
  - Rewrite DOS paths on native Windows builds that don't use
    Cygwin/MSYS.
  - Add WantDefaultPure cross-compiler personality option.
  - Prefer --static --pure linking on Windows.
  - Add PKG_CONFIG_DONT_DEFINE_PREFIX environment variable.
    Patch by Jeff Moguillansky.
  - Many improvements when building pkgconf with Meson.
    Patches by Christoph Reiter.
 Changes from 1.7.2 to 1.7.3:
 ----------------------------
 * Bug fixes:
  - Fix a possible out of boundary write when evaluating dependencies.
    Patch by Tobias Stöckmann.
  - Fix escaping logic on Windows.  Patch by Vincent Torri.
  - Fix out of boundary reads and writes with a malformed fragment.
    Patches by Tobias Stöckmann.
  - Fix a possible out of boundary write when evaluating tuples.
    Patch by Tobias Stöckmann.
 Changes from 1.7.1 to 1.7.2:
 ----------------------------
 * Bug fixes:
  - Fix a windows-specific crash relating to path fixups.
 Changes from 1.7.0 to 1.7.1:
 ----------------------------
 * Bug fixes:
  - Fix a possible out of boundary access in the parser for the
    cross-compile database.  Patch by Tobias Stöckmann.
  - Missing files for building with Meson are now included in the
    tarball.  Patch by Neal Gompa.
  - Fix calculation of package atoms on Windows with paths that
    use both directory separator characters.
 Changes from 1.6.3 to 1.7.0:
 ----------------------------
 * Bug fixes:
  - Fix a possible buffer overflow involving newline escaping.
    Patch by Tobias Stöckmann.
  - Fix an out of boundary access in the parser.
    Patch by Tobias Stöckmann.
  - Fix leakage of strcmp() result value in pkgconf_compare_version()
    responses.
  - Return the default personality if loading a cross-compile
    personality file failed.
  - Do not complain about newlines when validating package versions.
  - Properly detect strndup() on Windows when building with Meson.
 * Enhancements:
  - A new --shared option and WantDefaultStatic cross-compile
    configuration option have been added.  This allows for toolchains
    to specify that static linking should be used by default.
  - Support for the PKG_CONFIG_MSVC_SYNTAX environment variable has
    been added.  Patch by Dan Kegel.
  - Support for the PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS
    client flag which disables emulation of freedesktop.org pkg-config
    fragment merging semantics has been added.
    Patch by Karen Arutyunov.
 Changes from 1.6.2 to 1.6.3:
 ----------------------------
--- a/README.md
+++ b/README.md
@ -1,11 +1,11 @@
-# pkgconf [![test](https://github.com/pkgconf/pkgconf/actions/workflows/test.yml/badge.svg)](https://github.com/pkgconf/pkgconf/actions/workflows/test.yml)
+# pkgconf [![builds.sr.ht status](https://builds.sr.ht/~kaniini/pkgconf.svg)](https://builds.sr.ht/~kaniini/pkgconf?)
 `pkgconf` is a program which helps to configure compiler and linker flags for
 development libraries.  It is similar to pkg-config from freedesktop.org.
-`libpkgconf` is a library which provides access to most of `pkgconf`'s functionality, 
+`libpkgconf` is a library which provides access to most of `pkgconf`'s functionality, to allow
-to allow other tooling such as compilers and IDEs to discover and use libraries 
+other tooling such as compilers and IDEs to discover and use libraries configured by
-configured by pkgconf.
+pkgconf.
 ## using `pkgconf` with autotools
@ -41,7 +41,7 @@ to improve this behaviour.
 As of the 1.1 series, pkgconf also fully implements support for `Provides` rules,
 while pkg-config does not.  pkg-config only provides the `--print-provides` functionality
 as a stub.  There are other intentional implementation differences in pkgconf's dependency
-resolver versus pkg-config's dependency resolver in terms of completeness and correctness,
+resolver verses pkg-config's dependency resolver in terms of completeness and correctness,
 such as, for example, how `Conflicts` rules are processed.
 ## linker flags optimization
@ -60,10 +60,6 @@ Doing so is discouraged by the [freedesktop tutorial][fd-tut] anyway.
 ## compatibility with pkg-config
 I really hate that I have to have this section, I like being a nice person, but we
 unfortunately have to say this because otherwise we get passive-aggressive people who
 try to argue with us about what pkg-config compatibility means.
 We do not provide bug-level compatibility with pkg-config.
 What that means is, if you feel that there is a legitimate regression versus pkg-config,
@ -71,26 +67,6 @@ do let us know, but also make sure that the .pc files are valid and follow the r
 the [pkg-config tutorial][fd-tut], as most likely fixing them to follow the specified
 rules will solve the problem.
 Additionally, **we do not consider pkgconf doing what you tell it to do, in cases for 
 which pkg-config fails to do so, to be a bug**.
 If, for example, you use environment variables such as `PKG_CONFIG_SYSTEM_[INCLUDE|LIBRARY]_PATH`
 and then find yourself surprised that `pkgconf` is stripping `-I` and `-L` flags relating
 to those paths, it is not a `pkgconf` problem -- `pkgconf` is doing exactly what you told
 it to do.
 We will reject bugs like this, and if someone insists on fixing such a non-bug, this 
 constitutes a violation of our [Code of Conduct](CODE_OF_CONDUCT.md), which may be 
 addressed by banning from this repository.
 ## debug output
 Please use only the stable interfaces to query pkg-config.  Do not screen-scrape the
 output from `--debug`: this is sent to `stderr` for a reason, it is not intended to be
 scraped.  The `--debug` output is **not** a stable interface, and should **never** be
 depended on as a source of information.  If you need a stable interface to query pkg-config
 which is not covered, please get in touch.
 ## compiling `pkgconf` and `libpkgconf` on UNIX
 pkgconf is basically compiled the same way any other autotools-based project is
@ -112,16 +88,17 @@ flags like so:
    $ make
    $ sudo make install
-## compiling `pkgconf` and `libpkgconf` with Meson (usually for Windows)
+## compiling `pkgconf` and `libpkgconf` with CMake (usually for Windows)
 pkgconf is compiled using CMake on Windows.  In theory, you could also use CMake to build
 on UNIX, but this is not recommended at this time as it pkgconf is typically built much earlier
 than CMake.
-pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use
+    $ mkdir build
-Meson to build on UNIX, but this is not recommended at this time as it pkgconf is typically built
+    $ cd build
-much earlier than Meson.
+    $ cmake ..
-
+    $ make
-    $ meson setup build -Dtests=disabled
+    $ sudo make install
    $ meson compile -C build
    $ meson install -C build
 There are a few defines such as SYSTEM_LIBDIR, PKGCONFIGDIR and SYSTEM_INCLUDEDIR.
 However, on Windows, the default PKGCONFIGDIR value is usually overridden at runtime based
@ -142,8 +119,8 @@ Please only use the tarballs from distfiles.dereferenced.org.
 ## contacts
-You can report bugs at <https://github.com/pkgconf/pkgconf/issues>.
+You can report bugs at <https://todo.sr.ht/~kaniini/pkgconf>.
 There is a mailing list at <https://lists.sr.ht/~kaniini/pkgconf>.
-You can contact us via IRC at `#pkgconf` at `irc.oftc.net`.
+You can contact us via IRC at `#pkgconf` at `irc.freenode.net`.
--- a/cli/bomtool/main.c
+++ b/cli/bomtool/main.c
@ -1,365 +0,0 @@
 /*
 * bomtool/main.c
 * main() routine, printer functions
 *
 * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
 *     pkgconf authors (see AUTHORS).
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
 * copyright notice and this permission notice appear in all copies.
 *
 * This software is provided 'as is' and without any warranty, express or
 * implied.  In no event shall the authors be liable for any damages arising
 * from the use of this software.
 */
 #include "libpkgconf/config.h"
 #include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 #include "getopt_long.h"
 #define PKG_VERSION			(((uint64_t) 1) << 1)
 #define PKG_ABOUT			(((uint64_t) 1) << 2)
 #define PKG_HELP			(((uint64_t) 1) << 3)
 static const char *spdx_version = "SPDX-2.2";
 static const char *bom_license = "CC0-1.0";
 static const char *document_ref = "SPDXRef-DOCUMENT";
 static pkgconf_client_t pkg_client;
 static uint64_t want_flags;
 static size_t maximum_package_count = 0;
 static int maximum_traverse_depth = 2000;
 FILE *error_msgout = NULL;
 static bool
 error_handler(const char *msg, const pkgconf_client_t *client, void *data)
 {
 	(void) client;
 	(void) data;
 	fprintf(error_msgout, "%s", msg);
 	return true;
 }
 static const char *
 sbom_spdx_identity(pkgconf_pkg_t *pkg)
 {
 	static char buf[PKGCONF_ITEM_SIZE];
 	snprintf(buf, sizeof buf, "%sC64%s", pkg->id, pkg->version);
 	return buf;
 }
 static const char *
 sbom_name(pkgconf_pkg_t *world)
 {
 	static char buf[PKGCONF_BUFSIZE];
 	pkgconf_node_t *node;
 	pkgconf_strlcpy(buf, "SBOM-SPDX", sizeof buf);
 	PKGCONF_FOREACH_LIST_ENTRY(world->required.head, node)
 	{
 		pkgconf_dependency_t *dep = node->data;
 		pkgconf_pkg_t *match = dep->match;
 		if (!dep->match)
 			continue;
 		pkgconf_strlcat(buf, "-", sizeof buf);
 		pkgconf_strlcat(buf, sbom_spdx_identity(match), sizeof buf);
 	}
 	return buf;
 }
 static void
 write_sbom_header(pkgconf_client_t *client, pkgconf_pkg_t *world)
 {
 	(void) client;
 	(void) world;
 	printf("SPDXVersion: %s\n", spdx_version);
 	printf("DataLicense: %s\n", bom_license);
 	printf("SPDXID: %s\n", document_ref);
 	printf("DocumentName: %s\n", sbom_name(world));
 	printf("DocumentNamespace: https://spdx.org/spdxdocs/bomtool-%s\n", PACKAGE_VERSION);
 	printf("Creator: Tool: bomtool %s\n", PACKAGE_VERSION);
 	printf("\n\n");
 }
 static const char *
 sbom_identity(pkgconf_pkg_t *pkg)
 {
 	static char buf[PKGCONF_ITEM_SIZE];
 	snprintf(buf, sizeof buf, "%s@%s", pkg->id, pkg->version);
 	return buf;
 }
 static void
 write_sbom_package(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *unused)
 {
 	(void) client;
 	(void) unused;
 	if (pkg->flags & PKGCONF_PKG_PROPF_VIRTUAL)
 		return;
 	printf("##### Package: %s\n\n", sbom_identity(pkg));
 	printf("PackageName: %s\n", sbom_identity(pkg));
 	printf("SPDXID: SPDXRef-Package-%s\n", sbom_spdx_identity(pkg));
 	printf("PackageVersion: %s\n", pkg->version);
 	printf("PackageDownloadLocation: NOASSERTION\n");
 	printf("PackageVerificationCode: NOASSERTION\n");
 	/* XXX: What about projects? */
 	if (pkg->maintainer != NULL)
 		printf("PackageSupplier: Person: %s\n", pkg->maintainer);
 	if (pkg->url != NULL)
 		printf("PackageHomePage: %s\n", pkg->url);
 	printf("PackageLicenseDeclared: %s\n", pkg->license != NULL ? pkg->license : "NOASSERTION");
 	if (pkg->copyright != NULL)
 		printf("PackageCopyrightText: <text>%s</text>\n", pkg->copyright);
 	if (pkg->description != NULL)
 		printf("PackageSummary: <text>%s</text>\n", pkg->description);
 	printf("\n\n");
 }
 static void
 write_sbom_relationships(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *unused)
 {
 	(void) client;
 	(void) unused;
 	char baseref[PKGCONF_ITEM_SIZE];
 	pkgconf_node_t *node;
 	if (pkg->flags & PKGCONF_PKG_PROPF_VIRTUAL)
 		return;
 	snprintf(baseref, sizeof baseref, "SPDXRef-Package-%sC64%s", pkg->id, pkg->version);
 	PKGCONF_FOREACH_LIST_ENTRY(pkg->required.head, node)
 	{
 		pkgconf_dependency_t *dep = node->data;
 		pkgconf_pkg_t *match = dep->match;
 		if (!dep->match)
 			continue;
 		printf("Relationship: %s DEPENDS_ON SPDXRef-Package-%s\n", baseref, sbom_spdx_identity(match));
 		printf("Relationship: SPDXRef-Package-%s DEPENDENCY_OF %s\n", sbom_spdx_identity(match), baseref);
 	}
 	PKGCONF_FOREACH_LIST_ENTRY(pkg->requires_private.head, node)
 	{
 		pkgconf_dependency_t *dep = node->data;
 		pkgconf_pkg_t *match = dep->match;
 		if (!dep->match)
 			continue;
 		printf("Relationship: %s DEPENDS_ON SPDXRef-Package-%s\n", baseref, sbom_spdx_identity(match));
 		printf("Relationship: SPDXRef-Package-%s DEV_DEPENDENCY_OF %s\n", sbom_spdx_identity(match), baseref);
 	}
 	if (pkg->required.head != NULL || pkg->requires_private.head != NULL)
 		printf("\n\n");
 }
 static bool
 generate_sbom_from_world(pkgconf_client_t *client, pkgconf_pkg_t *world)
 {
 	int eflag;
 	pkgconf_node_t *node;
 	write_sbom_header(client, world);
 	eflag = pkgconf_pkg_traverse(client, world, write_sbom_package, NULL, maximum_traverse_depth, 0);
 	if (eflag != PKGCONF_PKG_ERRF_OK)
 		return false;
 	eflag = pkgconf_pkg_traverse(client, world, write_sbom_relationships, NULL, maximum_traverse_depth, 0);
 	if (eflag != PKGCONF_PKG_ERRF_OK)
 		return false;
 	PKGCONF_FOREACH_LIST_ENTRY(world->required.head, node)
 	{
 		pkgconf_dependency_t *dep = node->data;
 		pkgconf_pkg_t *match = dep->match;
 		if (!dep->match)
 			continue;
 		printf("Relationship: %s DESCRIBES SPDXRef-Package-%s\n", document_ref, sbom_spdx_identity(match));
 	}
 	return true;
 }
 static int
 version(void)
 {
 	printf("bomtool %s\n", PACKAGE_VERSION);
 	return EXIT_SUCCESS;
 }
 static int
 about(void)
 {
 	printf("bomtool (%s %s)\n", PACKAGE_NAME, PACKAGE_VERSION);
 	printf("Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021\n");
 	printf("    pkgconf authors (see AUTHORS in documentation directory).\n\n");
 	printf("Permission to use, copy, modify, and/or distribute this software for any\n");
 	printf("purpose with or without fee is hereby granted, provided that the above\n");
 	printf("copyright notice and this permission notice appear in all copies.\n\n");
 	printf("This software is provided 'as is' and without any warranty, express or\n");
 	printf("implied.  In no event shall the authors be liable for any damages arising\n");
 	printf("from the use of this software.\n\n");
 	printf("Report bugs at <%s>.\n", PACKAGE_BUGREPORT);
 	return EXIT_SUCCESS;
 }
 static int
 usage(void)
 {
 	printf("usage: bomtool [--flags] [modules]\n");
 	printf("\nbasic options:\n\n");
 	printf("  --help                            this message\n");
 	printf("  --about                           print bomtool version and license to stdout\n");
 	printf("  --version                         print bomtool version to stdout\n");
 	return EXIT_SUCCESS;
 }
 int
 main(int argc, char *argv[])
 {
 	int ret = EXIT_SUCCESS;
 	pkgconf_list_t pkgq = PKGCONF_LIST_INITIALIZER;
 	unsigned int want_client_flags = PKGCONF_PKG_PKGF_SEARCH_PRIVATE;
 	pkgconf_cross_personality_t *personality = pkgconf_cross_personality_default();
 	pkgconf_pkg_t world = {
 		.id = "virtual:world",
 		.realname = "virtual world package",
 		.flags = PKGCONF_PKG_PROPF_STATIC | PKGCONF_PKG_PROPF_VIRTUAL,
 	};
 	error_msgout = stderr;
 	struct pkg_option options[] = {
 		{ "version", no_argument, &want_flags, PKG_VERSION, },
 		{ "about", no_argument, &want_flags, PKG_ABOUT, },
 		{ "help", no_argument, &want_flags, PKG_HELP, },
 		{ NULL, 0, NULL, 0 }
 	};
 	while ((ret = pkg_getopt_long_only(argc, argv, "", options, NULL)) != -1)
 	{
 		switch (ret)
 		{
 		case '?':
 		case ':':
 			return EXIT_FAILURE;
 		default:
 			break;
 		}
 	}
 	pkgconf_client_init(&pkg_client, error_handler, NULL, personality);
 	/* we have determined what features we want most likely.  in some cases, we override later. */
 	pkgconf_client_set_flags(&pkg_client, want_client_flags);
 	/* at this point, want_client_flags should be set, so build the dir list */
 	pkgconf_client_dir_list_build(&pkg_client, personality);
 	if ((want_flags & PKG_ABOUT) == PKG_ABOUT)
 		return about();
 	if ((want_flags & PKG_VERSION) == PKG_VERSION)
 		return version();
 	if ((want_flags & PKG_HELP) == PKG_HELP)
 		return usage();
 	while (1)
 	{
 		const char *package = argv[pkg_optind];
 		if (package == NULL)
 			break;
 		/* check if there is a limit to the number of packages allowed to be included, if so and we have hit
 		 * the limit, stop adding packages to the queue.
 		 */
 		if (maximum_package_count > 0 && pkgq.length > maximum_package_count)
 			break;
 		while (isspace((unsigned char)package[0]))
 			package++;
 		/* skip empty packages */
 		if (package[0] == '\0') {
 			pkg_optind++;
 			continue;
 		}
 		if (argv[pkg_optind + 1] == NULL || !PKGCONF_IS_OPERATOR_CHAR(*(argv[pkg_optind + 1])))
 		{
 			pkgconf_queue_push(&pkgq, package);
 			pkg_optind++;
 		}
 		else
 		{
 			char packagebuf[PKGCONF_BUFSIZE];
 			snprintf(packagebuf, sizeof packagebuf, "%s %s %s", package, argv[pkg_optind + 1], argv[pkg_optind + 2]);
 			pkg_optind += 3;
 			pkgconf_queue_push(&pkgq, packagebuf);
 		}
 	}
 	if (pkgq.head == NULL)
 	{
 		fprintf(stderr, "Please specify at least one package name on the command line.\n");
 		ret = EXIT_FAILURE;
 		goto out;
 	}
 	ret = EXIT_SUCCESS;
 	if (!pkgconf_queue_solve(&pkg_client, &pkgq, &world, maximum_traverse_depth))
 	{
 		ret = EXIT_FAILURE;
 		goto out;
 	}
 	if (!generate_sbom_from_world(&pkg_client, &world))
 	{
 		ret = EXIT_FAILURE;
 		goto out;
 	}
 out:
 	pkgconf_solution_free(&pkg_client, &world);
 	pkgconf_queue_free(&pkgq);
 	pkgconf_cross_personality_deinit(personality);
 	pkgconf_client_deinit(&pkg_client);
 	return ret;
 }
--- a/cli/main.c
+++ b/cli/main.c
@ -69,8 +69,6 @@
 #define PKG_MSVC_SYNTAX			(((uint64_t) 1) << 41)
 #define PKG_INTERNAL_CFLAGS		(((uint64_t) 1) << 42)
 #define PKG_DUMP_PERSONALITY		(((uint64_t) 1) << 43)
 #define PKG_SHARED			(((uint64_t) 1) << 44)
 #define PKG_DUMP_LICENSE		(((uint64_t) 1) << 45)
 static pkgconf_client_t pkg_client;
 static const pkgconf_fragment_render_ops_t *want_render_ops = NULL;
@ -86,7 +84,7 @@ FILE *error_msgout = NULL;
 FILE *logfile_out = NULL;
 static bool
-error_handler(const char *msg, const pkgconf_client_t *client, void *data)
+error_handler(const char *msg, const pkgconf_client_t *client, const void *data)
 {
 	(void) client;
 	(void) data;
@ -347,6 +345,16 @@ apply_path(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int max
 	return true;
 }
 static void
 print_variable(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *variable)
 {
 	const char *var;
 	var = pkgconf_tuple_find(client, &pkg->vars, variable);
 	if (var != NULL)
 		printf("%s", var);
 }
 static bool
 apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, int maxdepth)
 {
@ -357,12 +365,11 @@ apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, i
 	{
 		pkgconf_dependency_t *dep = iter->data;
 		pkgconf_pkg_t *pkg = dep->match;
 		const char *var;
-		var = pkgconf_tuple_find(client, &pkg->vars, variable);
+		if (iter->prev != NULL)
 			printf(" ");
-		if (var != NULL)
+		print_variable(client, pkg, variable);
 			printf("%s%s", iter->prev != NULL ? " " : "", var);
 	}
 	printf("\n");
@ -407,8 +414,7 @@ apply_env(pkgconf_client_t *client, pkgconf_pkg_t *world, void *env_prefix_p, in
 	char workbuf[PKGCONF_ITEM_SIZE];
 	for (it = want_env_prefix; *it != '\0'; it++)
-		if (!isalpha((unsigned char)*it) &&
+		if (!isalpha(*it) && !isdigit(*it))
 		    !isdigit((unsigned char)*it))
 			return false;
 	snprintf(workbuf, sizeof workbuf, "%s_CFLAGS", want_env_prefix);
@ -586,32 +592,6 @@ apply_simulate(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int m
 }
 #endif
 static void
 print_license(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data)
 {
 	(void) client;
 	(void) data;
 	if (pkg->flags & PKGCONF_PKG_PROPF_VIRTUAL)
 		return;
 	/* NOASSERTION is the default when the license is unknown, per SPDX spec § 3.15 */
 	printf("%s: %s\n", pkg->id, pkg->license != NULL ? pkg->license : "NOASSERTION");
 }
 static bool
 apply_license(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int maxdepth)
 {
 	int eflag;
 	eflag = pkgconf_pkg_traverse(client, world, print_license, data, maxdepth, 0);
 	if (eflag != PKGCONF_PKG_ERRF_OK)
 		return false;
 	return true;
 }
 static void
 version(void)
 {
@ -622,7 +602,7 @@ static void
 about(void)
 {
 	printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
-	printf("Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021\n");
+	printf("Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019\n");
 	printf("    pkgconf authors (see AUTHORS in documentation directory).\n\n");
 	printf("Permission to use, copy, modify, and/or distribute this software for any\n");
 	printf("purpose with or without fee is hereby granted, provided that the above\n");
@ -684,7 +664,6 @@ usage(void)
 	printf("  --maximum-traverse-depth          maximum allowed depth for dependency graph\n");
 	printf("  --static                          be more aggressive when computing dependency graph\n");
 	printf("                                    (for static linking)\n");
 	printf("  --shared                          use a simplified dependency graph (usually default)\n");
 	printf("  --pure                            optimize a static dependency graph as if it were a normal\n");
 	printf("                                    dependency graph\n");
 	printf("  --env-only                        look only for package entries in PKG_CONFIG_PATH\n");
@ -715,7 +694,6 @@ usage(void)
 	printf("  --path                            show the exact filenames for any matching .pc files\n");
 	printf("  --modversion                      print the specified module's version to stdout\n");
 	printf("  --internal-cflags                 do not filter 'internal' cflags from output\n");
 	printf("  --license                         print the specified module's license to stdout if known\n");
 	printf("\nfiltering output:\n\n");
 #ifndef PKGCONF_LITE
@ -821,13 +799,7 @@ main(int argc, char *argv[])
 	char *logfile_arg = NULL;
 	char *want_env_prefix = NULL;
 	unsigned int want_client_flags = PKGCONF_PKG_PKGF_NONE;
-	pkgconf_cross_personality_t *personality = NULL;
+	pkgconf_cross_personality_t *personality;
 	bool opened_error_msgout = false;
 	pkgconf_pkg_t world = {
 		.id = "virtual:world",
 		.realname = "virtual world package",
 		.flags = PKGCONF_PKG_PROPF_STATIC | PKGCONF_PKG_PROPF_VIRTUAL,
 	};
 	want_flags = 0;
@ -855,7 +827,6 @@ main(int argc, char *argv[])
 		{ "short-errors", no_argument, &want_flags, PKG_SHORT_ERRORS, },
 		{ "maximum-traverse-depth", required_argument, NULL, 11, },
 		{ "static", no_argument, &want_flags, PKG_STATIC, },
 		{ "shared", no_argument, &want_flags, PKG_SHARED, },
 		{ "pure", no_argument, &want_flags, PKG_PURE, },
 		{ "print-requires", no_argument, &want_flags, PKG_REQUIRES, },
 		{ "print-variables", no_argument, &want_flags, PKG_VARIABLES|PKG_PRINT_ERRORS, },
@ -908,7 +879,6 @@ main(int argc, char *argv[])
 		{ "dump-personality", no_argument, &want_flags, PKG_DUMP_PERSONALITY },
 		{ "personality", required_argument, NULL, 53 },
 #endif
 		{ "license", no_argument, &want_flags, PKG_DUMP_LICENSE },
 		{ NULL, 0, NULL, 0 }
 	};
@ -920,6 +890,12 @@ main(int argc, char *argv[])
 	}
 #endif
 #ifndef PKGCONF_LITE
 	personality = deduce_personality(argv);
 #else
 	personality = pkgconf_cross_personality_default();
 #endif
 	while ((ret = pkg_getopt_long_only(argc, argv, "", options, NULL)) != -1)
 	{
 		switch (ret)
@ -970,21 +946,13 @@ main(int argc, char *argv[])
 #endif
 		case '?':
 		case ':':
-			ret = EXIT_FAILURE;
+			return EXIT_FAILURE;
-			goto out;
+			break;
 		default:
 			break;
 		}
 	}
 	if (personality == NULL) {
 #ifndef PKGCONF_LITE
 		personality = deduce_personality(argv);
 #else
 		personality = pkgconf_cross_personality_default();
 #endif
 	}
 	pkgconf_path_copy_list(&personality->dir_list, &dir_list);
 	pkgconf_path_free(&dir_list);
@ -1000,7 +968,7 @@ main(int argc, char *argv[])
 	pkgconf_client_init(&pkg_client, error_handler, NULL, personality);
 #ifndef PKGCONF_LITE
-	if ((want_flags & PKG_MSVC_SYNTAX) == PKG_MSVC_SYNTAX || getenv("PKG_CONFIG_MSVC_SYNTAX") != NULL)
+	if ((want_flags & PKG_MSVC_SYNTAX) == PKG_MSVC_SYNTAX)
 		want_render_ops = msvc_renderer_get();
 #endif
@ -1029,33 +997,31 @@ main(int argc, char *argv[])
 	if ((want_flags & PKG_ABOUT) == PKG_ABOUT)
 	{
 		about();
-
+		return EXIT_SUCCESS;
 		ret = EXIT_SUCCESS;
 		goto out;
 	}
 	if ((want_flags & PKG_VERSION) == PKG_VERSION)
 	{
-		version();
+		if (argc > 2)
 		{
 			fprintf(stderr, "%s: --version specified with other options or module names, assuming --modversion.\n", argv[0]);
-		ret = EXIT_SUCCESS;
+			want_flags &= ~PKG_VERSION;
-		goto out;
+			want_flags |= PKG_MODVERSION;
 		}
 		else
 		{
 			version();
 			return EXIT_SUCCESS;
 		}
 	}
 	if ((want_flags & PKG_HELP) == PKG_HELP)
 	{
 		usage();
-
+		return EXIT_SUCCESS;
 		ret = EXIT_SUCCESS;
 		goto out;
 	}
 	if (getenv("PKG_CONFIG_FDO_SYSROOT_RULES"))
 		want_client_flags |= PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES;
 	if (getenv("PKG_CONFIG_PKGCONF1_SYSROOT_RULES"))
 		want_client_flags |= PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES;
 	if ((want_flags & PKG_SHORT_ERRORS) == PKG_SHORT_ERRORS)
 		want_client_flags |= PKGCONF_PKG_PKGF_SIMPLIFY_ERRORS;
@ -1065,25 +1031,20 @@ main(int argc, char *argv[])
 	error_msgout = stderr;
 	if ((want_flags & PKG_ERRORS_ON_STDOUT) == PKG_ERRORS_ON_STDOUT)
 		error_msgout = stdout;
-	if ((want_flags & PKG_SILENCE_ERRORS) == PKG_SILENCE_ERRORS) {
+	if ((want_flags & PKG_SILENCE_ERRORS) == PKG_SILENCE_ERRORS)
 		error_msgout = fopen(PATH_DEV_NULL, "w");
 		opened_error_msgout = true;
 	}
 	if ((want_flags & PKG_IGNORE_CONFLICTS) == PKG_IGNORE_CONFLICTS || getenv("PKG_CONFIG_IGNORE_CONFLICTS") != NULL)
 		want_client_flags |= PKGCONF_PKG_PKGF_SKIP_CONFLICTS;
-	if ((want_flags & PKG_STATIC) == PKG_STATIC || personality->want_default_static)
+	if ((want_flags & PKG_STATIC) == PKG_STATIC)
 		want_client_flags |= (PKGCONF_PKG_PKGF_SEARCH_PRIVATE | PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS);
 	if ((want_flags & PKG_SHARED) == PKG_SHARED)
 		want_client_flags &= ~(PKGCONF_PKG_PKGF_SEARCH_PRIVATE | PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS);
 	/* if --static and --pure are both specified, then disable merge-back.
 	 * this allows for a --static which searches private modules, but has the same fragment behaviour as if
 	 * --static were disabled.  see <https://github.com/pkgconf/pkgconf/issues/83> for rationale.
 	 */
-	if ((want_flags & PKG_PURE) == PKG_PURE || getenv("PKG_CONFIG_PURE_DEPGRAPH") != NULL || personality->want_default_pure)
+	if ((want_flags & PKG_PURE) == PKG_PURE || getenv("PKG_CONFIG_PURE_DEPGRAPH") != NULL)
 		want_client_flags &= ~PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS;
 	if ((want_flags & PKG_ENV_ONLY) == PKG_ENV_ONLY)
@ -1105,17 +1066,23 @@ main(int argc, char *argv[])
 	if ((want_flags & PKG_NO_PROVIDES) == PKG_NO_PROVIDES)
 		want_client_flags |= PKGCONF_PKG_PKGF_SKIP_PROVIDES;
-	if ((want_flags & PKG_DONT_DEFINE_PREFIX) == PKG_DONT_DEFINE_PREFIX  || getenv("PKG_CONFIG_DONT_DEFINE_PREFIX") != NULL)
+	if ((want_flags & PKG_DONT_DEFINE_PREFIX) == PKG_DONT_DEFINE_PREFIX)
 		want_client_flags &= ~PKGCONF_PKG_PKGF_REDEFINE_PREFIX;
 	if ((want_flags & PKG_INTERNAL_CFLAGS) == PKG_INTERNAL_CFLAGS)
 		want_client_flags |= PKGCONF_PKG_PKGF_DONT_FILTER_INTERNAL_CFLAGS;
 #ifdef XXX_NOTYET
 	/* if these selectors are used, it means that we are inquiring about a single package.
 	 * so signal to libpkgconf that we do not want to use the dependency resolver for more than one level,
 	 * and also limit the SAT problem to a single package.
 	 *
 	 * i disabled this because too many upstream maintainers are still invoking pkg-config correctly to have
 	 * the more sane behaviour as default.  use --maximum-traverse-depth=1 or PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH
 	 * environment variable to get the same results in meantime.
 	 */
-	if (((want_flags & PKG_REQUIRES) == PKG_REQUIRES ||
+	if ((want_flags & PKG_EXISTS) == 0 &&
 		((want_flags & PKG_REQUIRES) == PKG_REQUIRES ||
 		(want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE ||
 		(want_flags & PKG_PROVIDES) == PKG_PROVIDES ||
 		(want_flags & PKG_VARIABLES) == PKG_VARIABLES ||
@ -1126,6 +1093,7 @@ main(int argc, char *argv[])
 		maximum_package_count = 1;
 		maximum_traverse_depth = 1;
 	}
 #endif
 	if (getenv("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS") != NULL)
 		want_flags |= PKG_KEEP_SYSTEM_CFLAGS;
@ -1136,25 +1104,9 @@ main(int argc, char *argv[])
 	if ((builddir = getenv("PKG_CONFIG_TOP_BUILD_DIR")) != NULL)
 		pkgconf_client_set_buildroot_dir(&pkg_client, builddir);
 	if ((want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE ||
 		(want_flags & PKG_CFLAGS))
 	{
 		want_client_flags |= PKGCONF_PKG_PKGF_SEARCH_PRIVATE;
 	}
 	if ((sysroot_dir = getenv("PKG_CONFIG_SYSROOT_DIR")) != NULL)
 	{
 		const char *destdir;
 		pkgconf_client_set_sysroot_dir(&pkg_client, sysroot_dir);
 		if ((destdir = getenv("DESTDIR")) != NULL)
 		{
 			if (!strcmp(destdir, sysroot_dir))
 				want_client_flags |= PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES;
 		}
 	}
 	/* we have determined what features we want most likely.  in some cases, we override later. */
 	pkgconf_client_set_flags(&pkg_client, want_client_flags);
@ -1164,25 +1116,21 @@ main(int argc, char *argv[])
 	if (required_pkgconfig_version != NULL)
 	{
 		if (pkgconf_compare_version(PACKAGE_VERSION, required_pkgconfig_version) >= 0)
-			ret = EXIT_SUCCESS;
+			return EXIT_SUCCESS;
 		else
 			ret = EXIT_FAILURE;
-		goto out;
+		return EXIT_FAILURE;
 	}
 	if ((want_flags & PKG_LIST) == PKG_LIST)
 	{
 		pkgconf_scan_all(&pkg_client, NULL, print_list_entry);
-		ret = EXIT_SUCCESS;
+		return EXIT_SUCCESS;
 		goto out;
 	}
 	if ((want_flags & PKG_LIST_PACKAGE_NAMES) == PKG_LIST_PACKAGE_NAMES)
 	{
 		pkgconf_scan_all(&pkg_client, NULL, print_package_entry);
-		ret = EXIT_SUCCESS;
+		return EXIT_SUCCESS;
 		goto out;
 	}
 	if (logfile_arg == NULL)
@ -1196,7 +1144,7 @@ main(int argc, char *argv[])
 	if (required_module_version != NULL)
 	{
-		pkgconf_pkg_t *pkg = NULL;
+		pkgconf_pkg_t *pkg;
 		pkgconf_node_t *node;
 		pkgconf_list_t deplist = PKGCONF_LIST_INITIALIZER;
@ -1215,28 +1163,18 @@ main(int argc, char *argv[])
 			{
 				if (want_flags & PKG_PRINT_ERRORS)
 					pkgconf_error(&pkg_client, "Package '%s' was not found\n", pkgiter->package);
-
+				return EXIT_FAILURE;
 				ret = EXIT_FAILURE;
 				goto cleanup;
 			}
 			if (pkgconf_compare_version(pkg->version, required_module_version) >= 0)
-			{
+				return EXIT_SUCCESS;
 				ret = EXIT_SUCCESS;
 				goto cleanup;
 			}
 		}
-		ret = EXIT_FAILURE;
+		return EXIT_FAILURE;
 cleanup:
 		if (pkg != NULL)
 			pkgconf_pkg_unref(&pkg_client, pkg);
 		pkgconf_dependency_free(&deplist);
 		goto out;
 	}
 	else if (required_exact_module_version != NULL)
 	{
-		pkgconf_pkg_t *pkg = NULL;
+		pkgconf_pkg_t *pkg;
 		pkgconf_node_t *node;
 		pkgconf_list_t deplist = PKGCONF_LIST_INITIALIZER;
@ -1255,28 +1193,18 @@ cleanup:
 			{
 				if (want_flags & PKG_PRINT_ERRORS)
 					pkgconf_error(&pkg_client, "Package '%s' was not found\n", pkgiter->package);
-
+				return EXIT_FAILURE;
 				ret = EXIT_FAILURE;
 				goto cleanup2;
 			}
 			if (pkgconf_compare_version(pkg->version, required_exact_module_version) == 0)
-			{
+				return EXIT_SUCCESS;
 				ret = EXIT_SUCCESS;
 				goto cleanup2;
 			}
 		}
-		ret = EXIT_FAILURE;
+		return EXIT_FAILURE;
 cleanup2:
 		if (pkg != NULL)
 			pkgconf_pkg_unref(&pkg_client, pkg);
 		pkgconf_dependency_free(&deplist);
 		goto out;
 	}
 	else if (required_max_module_version != NULL)
 	{
-		pkgconf_pkg_t *pkg = NULL;
+		pkgconf_pkg_t *pkg;
 		pkgconf_node_t *node;
 		pkgconf_list_t deplist = PKGCONF_LIST_INITIALIZER;
@ -1295,24 +1223,14 @@ cleanup2:
 			{
 				if (want_flags & PKG_PRINT_ERRORS)
 					pkgconf_error(&pkg_client, "Package '%s' was not found\n", pkgiter->package);
-
+				return EXIT_FAILURE;
 				ret = EXIT_FAILURE;
 				goto cleanup3;
 			}
 			if (pkgconf_compare_version(pkg->version, required_max_module_version) <= 0)
-			{
+				return EXIT_SUCCESS;
 				ret = EXIT_SUCCESS;
 				goto cleanup3;
 			}
 		}
-		ret = EXIT_FAILURE;
+		return EXIT_FAILURE;
 cleanup3:
 		if (pkg != NULL)
 			pkgconf_pkg_unref(&pkg_client, pkg);
 		pkgconf_dependency_free(&deplist);
 		goto out;
 	}
 	while (1)
@ -1325,10 +1243,10 @@ cleanup3:
 		/* check if there is a limit to the number of packages allowed to be included, if so and we have hit
 		 * the limit, stop adding packages to the queue.
 		 */
-		if (maximum_package_count > 0 && pkgq.length >= maximum_package_count)
+		if (maximum_package_count > 0 && pkgq.length > maximum_package_count)
 			break;
-		while (isspace((unsigned char)package[0]))
+		while (isspace((unsigned int)package[0]))
 			package++;
 		/* skip empty packages */
@ -1356,68 +1274,85 @@ cleanup3:
 	if (pkgq.head == NULL)
 	{
 		fprintf(stderr, "Please specify at least one package name on the command line.\n");
-		ret = EXIT_FAILURE;
+		return EXIT_FAILURE;
 		goto out;
 	}
 	ret = EXIT_SUCCESS;
 	if (!pkgconf_queue_solve(&pkg_client, &pkgq, &world, maximum_traverse_depth))
 	{
 		ret = EXIT_FAILURE;
 		goto out;
 	}
 #ifndef PKGCONF_LITE
 	if ((want_flags & PKG_SIMULATE) == PKG_SIMULATE)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
 		pkgconf_client_set_flags(&pkg_client, want_client_flags | PKGCONF_PKG_PKGF_SKIP_ERRORS);
-		apply_simulate(&pkg_client, &world, NULL, -1);
+		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_simulate, -1, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 	}
 #endif
-	if ((want_flags & PKG_VALIDATE) == PKG_VALIDATE)
+	if (!pkgconf_queue_validate(&pkg_client, &pkgq, maximum_traverse_depth))
 		goto out;
 	if ((want_flags & PKG_DUMP_LICENSE) == PKG_DUMP_LICENSE)
 	{
-		apply_license(&pkg_client, &world, &ret, 2);
+		ret = EXIT_FAILURE;
 		goto out;
 	}
 	if ((want_flags & PKG_VALIDATE) == PKG_VALIDATE)
 		return 0;
 	if ((want_flags & PKG_UNINSTALLED) == PKG_UNINSTALLED)
 	{
 		ret = EXIT_FAILURE;
-		apply_uninstalled(&pkg_client, &world, &ret, 2);
+		pkgconf_queue_apply(&pkg_client, &pkgq, apply_uninstalled, maximum_traverse_depth, &ret);
 		goto out;
 	}
 	if (want_env_prefix != NULL)
 	{
-		apply_env(&pkg_client, &world, want_env_prefix, 2);
+		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_env, maximum_traverse_depth, want_env_prefix))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 		want_flags = 0;
 	}
 	if ((want_flags & PKG_PROVIDES) == PKG_PROVIDES)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
-		apply_provides(&pkg_client, &world, NULL, 2);
+
 		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_provides, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 	}
 #ifndef PKGCONF_LITE
 	if ((want_flags & PKG_DIGRAPH) == PKG_DIGRAPH)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
-		apply_digraph(&pkg_client, &world, NULL, 2);
+
 		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_digraph, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 	}
 #endif
 	if ((want_flags & PKG_MODVERSION) == PKG_MODVERSION)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
-		apply_modversion(&pkg_client, &world, NULL, 2);
+
 		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_modversion, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 	}
 	if ((want_flags & PKG_PATH) == PKG_PATH)
@ -1425,13 +1360,22 @@ cleanup3:
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
 		pkgconf_client_set_flags(&pkg_client, want_client_flags | PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL);
-		apply_path(&pkg_client, &world, NULL, 2);
+		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_path, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 	}
 	if ((want_flags & PKG_VARIABLES) == PKG_VARIABLES)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
-		apply_variables(&pkg_client, &world, NULL, 2);
+
 		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_variables, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 	}
 	if (want_variable)
@ -1439,63 +1383,72 @@ cleanup3:
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
 		pkgconf_client_set_flags(&pkg_client, want_client_flags | PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL);
-		apply_variable(&pkg_client, &world, want_variable, 2);
+		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_variable, maximum_traverse_depth, want_variable))
 	}
 	if ((want_flags & PKG_REQUIRES) == PKG_REQUIRES)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
 		apply_requires(&pkg_client, &world, NULL, 2);
 	}
 	if ((want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
 		apply_requires_private(&pkg_client, &world, NULL, 2);
 	}
 	if ((want_flags & PKG_CFLAGS))
 	{
 		apply_cflags(&pkg_client, &world, NULL, 2);
 	}
 	if ((want_flags & PKG_LIBS))
 	{
 		if (want_flags & PKG_CFLAGS)
 			printf(" ");
 		if (!(want_flags & PKG_STATIC))
 		{
 			pkgconf_client_set_flags(&pkg_client, pkg_client.flags & ~PKGCONF_PKG_PKGF_SEARCH_PRIVATE);
 			/* redo the solution for the library set: free the solution itself, and any cached graph nodes */
 			pkgconf_solution_free(&pkg_client, &world);
 			pkgconf_cache_free(&pkg_client);
 			if (!pkgconf_queue_solve(&pkg_client, &pkgq, &world, maximum_traverse_depth))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 	}
-		apply_libs(&pkg_client, &world, NULL, 2);
+	if ((want_flags & PKG_REQUIRES) == PKG_REQUIRES)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
 		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_requires, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 	}
 	if ((want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE)
 	{
 		want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
 		pkgconf_client_set_flags(&pkg_client, want_client_flags | PKGCONF_PKG_PKGF_SEARCH_PRIVATE);
 		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_requires_private, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out;
 		}
 		pkgconf_client_set_flags(&pkg_client, want_client_flags);
 	}
 	if ((want_flags & PKG_CFLAGS))
 	{
 		pkgconf_client_set_flags(&pkg_client, want_client_flags | PKGCONF_PKG_PKGF_SEARCH_PRIVATE);
 		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_cflags, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out_println;
 		}
 		pkgconf_client_set_flags(&pkg_client, want_client_flags);
 	}
 	if ((want_flags & PKG_LIBS))
 	{
 		if (!pkgconf_queue_apply(&pkg_client, &pkgq, apply_libs, maximum_traverse_depth, NULL))
 		{
 			ret = EXIT_FAILURE;
 			goto out_println;
 		}
 	}
 	pkgconf_queue_free(&pkgq);
 out_println:
 	if (want_flags & (PKG_CFLAGS|PKG_LIBS))
 		printf("\n");
 out:
 	pkgconf_solution_free(&pkg_client, &world);
 	pkgconf_queue_free(&pkgq);
 	pkgconf_cross_personality_deinit(personality);
 	pkgconf_client_deinit(&pkg_client);
 	if (logfile_out != NULL)
 		fclose(logfile_out);
 	if (opened_error_msgout)
 		fclose(error_msgout);
 	return ret;
 }
--- a/cli/renderer-msvc.c
+++ b/cli/renderer-msvc.c
@ -149,6 +149,7 @@ msvc_renderer_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, b
 		{
 			cnt = pkgconf_strlcpy(bptr, ".lib", buf_remaining);
 			bptr += cnt;
 			buf_remaining -= cnt;
 		}
 		if (escape)
--- a/configure.ac
+++ b/configure.ac
@ -11,10 +11,10 @@ dnl This software is provided 'as is' and without any warranty, express or
 dnl implied.  In no event shall the authors be liable for any damages arising
 dnl from the use of this software.
-AC_PREREQ([2.71])
+AC_PREREQ([2.68])
-AC_INIT([pkgconf],[1.9.5],[https://github.com/pkgconf/pkgconf/issues/new])
+AC_INIT([pkgconf], [1.9.90], [https://todo.sr.ht/~kaniini/pkgconf])
 AC_CONFIG_SRCDIR([cli/main.c])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
 AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS="$CFLAGS -Wextra"])
 AX_CHECK_COMPILE_FLAG([-Wformat=2], [CFLAGS="$CFLAGS -Wformat=2"])
@ -22,8 +22,7 @@ AX_CHECK_COMPILE_FLAG([-std=gnu99], [CFLAGS="$CFLAGS -std=gnu99"], [
 	AX_CHECK_COMPILE_FLAG([-std=c99], [CFLAGS="$CFLAGS -std=c99"])
 ])
 AC_CONFIG_HEADERS([libpkgconf/config.h])
-AC_CHECK_DECLS([strlcpy, strlcat, strndup], [], [], [[#include <string.h>]])
+AC_CHECK_FUNCS([strlcpy strlcat strndup cygwin_conv_path])
 AC_CHECK_DECLS([reallocarray])
 AC_CHECK_HEADERS([sys/stat.h])
 AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
 AM_SILENT_RULES([yes])
@ -31,26 +30,26 @@ LT_INIT
 AC_SYS_LARGEFILE
-AC_ARG_WITH([personality-dir],[AS_HELP_STRING([--with-personality-dir],[specify
+AC_ARG_WITH([personality-dir],[AC_HELP_STRING([--with-personality-dir],[specify
 	     the place where cross-compile personality files will be found])],
 	     PERSONALITY_PATH="$withval",
 	     PERSONALITY_PATH="${datadir}/pkgconfig/personality.d:${sysconfdir}/pkgconfig/personality.d")
 AC_SUBST([PERSONALITY_PATH])
-AC_ARG_WITH([pkg-config-dir],[AS_HELP_STRING([--with-pkg-config-dir],[specify
+AC_ARG_WITH([pkg-config-dir],[AC_HELP_STRING([--with-pkg-config-dir],[specify
 	     the place where pc files will be found])],PKG_DEFAULT_PATH="$withval",
 	     PKG_DEFAULT_PATH="${libdir}/pkgconfig:${datadir}/pkgconfig")
 AC_SUBST([PKG_DEFAULT_PATH])
-AC_ARG_WITH([system-libdir],[AS_HELP_STRING([--with-system-libdir],[specify the
+AC_ARG_WITH([system-libdir],[AC_HELP_STRING([--with-system-libdir],[specify the
 	     system library directory (default LIBDIR)])],
 	     SYSTEM_LIBDIR="$withval", SYSTEM_LIBDIR="${libdir}")
 AC_SUBST([SYSTEM_LIBDIR])
-AC_ARG_WITH([system-includedir],[AS_HELP_STRING([--with-system-includedir],[specify the
+AC_ARG_WITH([system-includedir],[AC_HELP_STRING([--with-system-includedir],[specify the
 	     system include directory (default INCLUDEDIR)])],
 	     SYSTEM_INCLUDEDIR="$withval", SYSTEM_INCLUDEDIR="${includedir}")
--- a/doc/extract.py
+++ b/doc/extract.py
@ -70,21 +70,21 @@ def extract_comments(filename):
            while True:
                char = source_file.read(1)
                if not char:
-                    if state == 3 or state == 4:
+                    if state is 3 or state is 4:
                        raise UnterminatedCommentError()
-                    if state == 2:
+                    if state is 2:
                        # Was in single line comment. Create comment.
                        comment = Comment(current_comment, line_counter, False)
                        comments.append(comment)
                    return comments
-                if state == 0:
+                if state is 0:
                    # Waiting for comment start character or beginning of
                    # string.
                    if char == '/':
                        state = 1
                    elif char == '"':
                        state = 5
-                elif state == 1:
+                elif state is 1:
                    # Found comment start character, classify next character and
                    # determine if single or multiline comment.
                    if char == '/':
@ -94,7 +94,7 @@ def extract_comments(filename):
                        state = 3
                    else:
                        state = 0
-                elif state == 2:
+                elif state is 2:
                    # In single line comment, read characters until EOL.
                    if char == '\n':
                        comment = Comment(current_comment, line_counter, False)
@ -103,14 +103,14 @@ def extract_comments(filename):
                        state = 0
                    else:
                        current_comment += char
-                elif state == 3:
+                elif state is 3:
                    # In multi-line comment, add characters until '*'
                    # encountered.
                    if char == '*':
                        state = 4
                    else:
                        current_comment += char
-                elif state == 4:
+                elif state is 4:
                    # In multi-line comment with asterisk found. Determine if
                    # comment is ending.
                    if char == '/':
@ -125,13 +125,13 @@ def extract_comments(filename):
                        if char != '*':
                            current_comment += char
                            state = 3
-                elif state == 5:
+                elif state is 5:
                    # In string literal, expect literal end or escape char.
                    if char == '"':
                        state = 0
                    elif char == '\\':
                        state = 6
-                elif state == 6:
+                elif state is 6:
                    # In string literal, escaping current char.
                    state = 5
                if char == '\n':
--- a/doc/libpkgconf-client.rst
+++ b/doc/libpkgconf-client.rst
@ -9,32 +9,21 @@ in parallel.
 Client objects are not thread safe, in other words, a client object should not be shared across
 thread boundaries.
-.. c:function:: void pkgconf_client_dir_list_build(pkgconf_client_t *client)
+.. c:function:: void pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler)
   Bootstraps the package search paths.  If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is set on the client,
   then only the ``PKG_CONFIG_PATH`` environment variable will be used, otherwise both the
   ``PKG_CONFIG_PATH`` and ``PKG_CONFIG_LIBDIR`` environment variables will be used.
   :param pkgconf_client_t* client: The pkgconf client object to bootstrap.
   :return: nothing
 .. c:function:: void pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality)
   Initialise a pkgconf client object.
   :param pkgconf_client_t* client: The client to initialise.
   :param pkgconf_error_handler_func_t error_handler: An optional error handler to use for logging errors.
   :param void* error_handler_data: user data passed to optional error handler
   :param pkgconf_cross_personality_t* personality: the cross-compile personality to use for defaults
   :return: nothing
-.. c:function:: pkgconf_client_t* pkgconf_client_new(pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality)
+.. c:function:: pkgconf_client_t* pkgconf_client_new(pkgconf_error_handler_func_t error_handler)
   Allocate and initialise a pkgconf client object.
   :param pkgconf_error_handler_func_t error_handler: An optional error handler to use for logging errors.
   :param void* error_handler_data: user data passed to optional error handler
   :param pkgconf_cross_personality_t* personality: cross-compile personality to use
   :return: A pkgconf client object.
   :rtype: pkgconf_client_t*
@ -108,14 +97,11 @@ thread boundaries.
   :return: true if the warn handler processed the message, else false.
   :rtype: bool
-.. c:function:: bool pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t len, const char *funcname, const char *format, ...)
+.. c:function:: bool pkgconf_trace(const pkgconf_client_t *client, const char *format, ...)
   Report a message to a client-registered trace handler.
   :param pkgconf_client_t* client: The pkgconf client object to report the trace message to.
   :param char* filename: The file the function is in.
   :param size_t lineno: The line number currently being executed.
   :param char* funcname: The function name to use.
   :param char* format: A printf-style format string to use for formatting the trace message.
   :return: true if the trace handler processed the message, else false.
   :rtype: bool
--- a/doc/libpkgconf-dependency.rst
+++ b/doc/libpkgconf-dependency.rst
@ -14,7 +14,6 @@ The `dependency` module provides support for building `dependency lists` (the ba
   :param char* package: The package `atom` to set on the dependency node.
   :param char* version: The package `version` to set on the dependency node.
   :param pkgconf_pkg_comparator_t compare: The comparison operator to set on the dependency node.
   :param uint flags: Any flags to attach to the dependency node.
   :return: A dependency node.
   :rtype: pkgconf_dependency_t *
@ -26,29 +25,6 @@ The `dependency` module provides support for building `dependency lists` (the ba
   :param pkgconf_dependency_t* tail: The dependency node to add to the tail of the dependency list.
   :return: nothing
 .. c:function:: void pkgconf_dependency_free_one(pkgconf_dependency_t *dep)
   Frees a dependency node.
   :param pkgconf_dependency_t* dep: The dependency node to free.
   :return: nothing
 .. c:function:: pkgconf_dependency_t *pkgconf_dependency_ref(pkgconf_client_t *owner, pkgconf_dependency_t *dep)
   Increases a dependency node's refcount.
   :param pkgconf_client_t* owner: The client object which owns the memory of this dependency node.
   :param pkgconf_dependency_t* dep: The dependency to increase the refcount of.
   :return: the dependency node on success, else NULL
 .. c:function:: void pkgconf_dependency_unref(pkgconf_client_t *owner, pkgconf_dependency_t *dep)
   Decreases a dependency node's refcount and frees it if necessary.
   :param pkgconf_client_t* owner: The client object which owns the memory of this dependency node.
   :param pkgconf_dependency_t* dep: The dependency to decrease the refcount of.
   :return: nothing
 .. c:function:: void pkgconf_dependency_free(pkgconf_list_t *list)
   Release a dependency list and it's child dependency nodes.
@ -65,7 +41,6 @@ The `dependency` module provides support for building `dependency lists` (the ba
   :param pkgconf_client_t* client: The client object that owns the package this dependency list belongs to.
   :param pkgconf_list_t* deplist_head: The dependency list to populate with dependency nodes.
   :param char* depends: The dependency data to parse.
   :param uint flags: Any flags to attach to the dependency nodes.
   :return: nothing
 .. c:function:: void pkgconf_dependency_parse(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist, const char *depends)
@ -78,13 +53,4 @@ The `dependency` module provides support for building `dependency lists` (the ba
   :param pkgconf_pkg_t* pkg: The package object that owns this dependency list.
   :param pkgconf_list_t* deplist: The dependency list to populate with dependency nodes.
   :param char* depends: The dependency data to parse.
   :param uint flags: Any flags to attach to the dependency nodes.
   :return: nothing
 .. c:function:: pkgconf_dependency_t *pkgconf_dependency_copy(pkgconf_client_t *client, const pkgconf_dependency_t *dep)
   Copies a dependency node to a new one.
   :param pkgconf_client_t* client: The client object that will own this dependency.
   :param pkgconf_dependency_t* dep: The dependency node to copy.
   :return: a pointer to a new dependency node, else NULL
--- a/doc/libpkgconf-fragment.rst
+++ b/doc/libpkgconf-fragment.rst
@ -6,14 +6,13 @@ The `fragment` module provides low-level management and rendering of fragment li
 `fragment list` contains various `fragments` of text (such as ``-I /usr/include``) in a matter
 which is composable, mergeable and reorderable.
-.. c:function:: void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags)
+.. c:function:: void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string)
   Adds a `fragment` of text to a `fragment list`, possibly modifying the fragment if a sysroot is set.
   :param pkgconf_client_t* client: The pkgconf client being accessed.
   :param pkgconf_list_t* list: The fragment list.
   :param char* string: The string of text to add as a fragment to the fragment list.
   :param uint flags: Parsing-related flags for the package.
   :return: nothing
 .. c:function:: bool pkgconf_fragment_has_system_dir(const pkgconf_client_t *client, const pkgconf_fragment_t *frag)
@ -111,6 +110,5 @@ which is composable, mergeable and reorderable.
   :param pkgconf_client_t* client: The pkgconf client being accessed.
   :param pkgconf_list_t* list: The `fragment list` to add the fragment entries to.
   :param pkgconf_list_t* vars: A list of variables to use for variable substitution.
   :param uint flags: Any parsing flags to be aware of.
   :param char* value: The string to parse into fragments.
   :return: true on success, false on parse error
--- a/doc/libpkgconf-path.rst
+++ b/doc/libpkgconf-path.rst
@ -25,12 +25,12 @@ variables.
   :return: number of path nodes added to the path list
   :rtype: size_t
-.. c:function:: size_t pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist)
+.. c:function:: size_t pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist)
   Adds the paths specified in an environment variable to a path list.  If the environment variable is not set,
   an optional default set of paths is added.
-   :param char* envvarname: The environment variable to look up.
+   :param char* environ: The environment variable to look up.
   :param char* fallback: The fallback paths to use if the environment variable is not set.
   :param pkgconf_list_t* dirlist: The path list to add the path nodes to.
   :param bool filter: Whether to perform duplicate filtering.
@ -46,14 +46,6 @@ variables.
   :return: true if the path list has a matching prefix, otherwise false
   :rtype: bool
 .. c:function:: void pkgconf_path_copy_list(pkgconf_list_t *dst, const pkgconf_list_t *src)
   Copies a path list to another path list.
   :param pkgconf_list_t* dst: The path list to copy to.
   :param pkgconf_list_t* src: The path list to copy from.
   :return: nothing
 .. c:function:: void pkgconf_path_free(pkgconf_list_t *dirlist)
   Releases any path nodes attached to the given path list.
@ -63,7 +55,7 @@ variables.
 .. c:function:: bool pkgconf_path_relocate(char *buf, size_t buflen)
-   Relocates a path, possibly calling normpath() on it.
+   Relocates a path, possibly calling normpath() or cygwin_conv_path() on it.
   :param char* buf: The path to relocate.
   :param size_t buflen: The buffer length the path is contained in.
--- a/doc/libpkgconf-personality.rst
+++ b/doc/libpkgconf-personality.rst
@ -1,27 +0,0 @@
 libpkgconf `personality` module
 =========================
 .. c:function:: const pkgconf_cross_personality_t *pkgconf_cross_personality_default(void)
   Returns the default cross-compile personality.
   Not thread safe.
   :rtype: pkgconf_cross_personality_t*
   :return: the default cross-compile personality
 .. c:function:: void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *)
   Decrements the count of default cross personality instances.
   Not thread safe.
   :rtype: void
 .. c:function:: pkgconf_cross_personality_t *pkgconf_cross_personality_find(const char *triplet)
   Attempts to find a cross-compile personality given a triplet.
   :rtype: pkgconf_cross_personality_t*
   :return: the default cross-compile personality
--- a/doc/libpkgconf-pkg.rst
+++ b/doc/libpkgconf-pkg.rst
@ -5,14 +5,22 @@ libpkgconf `pkg` module
 The `pkg` module provides dependency resolution services and the overall `.pc` file parsing
 routines.
-.. c:function:: pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename, FILE *f, unsigned int flags)
+.. c:function:: void pkgconf_pkg_dir_list_build(pkgconf_client_t *client)
   Bootstraps the package search paths.  If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is set on the client,
   then only the ``PKG_CONFIG_PATH`` environment variable will be used, otherwise both the
   ``PKG_CONFIG_PATH`` and ``PKG_CONFIG_LIBDIR`` environment variables will be used.
   :param pkgconf_client_t* client: The pkgconf client object to bootstrap.
   :return: nothing
 .. c:function:: pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename, FILE *f)
   Parse a .pc file into a pkgconf_pkg_t object structure.
   :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
   :param char* filename: The filename of the package file (including full path).
   :param FILE* f: The file object to read from.
   :param uint flags: The flags to use when parsing.
   :returns: A ``pkgconf_pkg_t`` object which contains the package data.
   :rtype: pkgconf_pkg_t *
@ -68,7 +76,7 @@ routines.
   :param char* a: The first version to compare in the pair.
   :param char* b: The second version to compare in the pair.
-   :return: -1 if the first version is less than, 0 if both versions are equal, 1 if the second version is less than.
+   :return: -1 if the first version is greater, 0 if both versions are equal, 1 if the second version is greater.
   :rtype: int
 .. c:function:: pkgconf_pkg_t *pkgconf_builtin_pkg_get(const char *name)
@ -118,7 +126,7 @@ routines.
   :return: On success, ``PKGCONF_PKG_ERRF_OK`` (0), else an error code.
   :rtype: unsigned int
-.. c:function:: unsigned int pkgconf_pkg_traverse(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_pkg_traverse_func_t func, void *data, int maxdepth, unsigned int skip_flags)
+.. c:function:: unsigned int pkgconf_pkg_traverse(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_pkg_traverse_func_t func, void *data, int maxdepth)
   Walk and resolve the dependency graph up to `maxdepth` levels.
@ -127,7 +135,6 @@ routines.
   :param pkgconf_pkg_traverse_func_t func: A traversal function to call for each resolved node in the dependency graph.
   :param void* data: An opaque pointer to data to be passed to the traversal function.
   :param int maxdepth: The maximum depth to walk the dependency graph for.  -1 means infinite recursion.
   :param uint skip_flags: Skip over dependency nodes containing the specified flags.  A setting of 0 skips no dependency nodes.
   :return: ``PKGCONF_PKG_ERRF_OK`` on success, else an error code.
   :rtype: unsigned int
--- a/doc/libpkgconf-queue.rst
+++ b/doc/libpkgconf-queue.rst
@ -33,32 +33,11 @@ Using the `queue` module functions is the recommended way of working with depend
   :param pkgconf_list_t* list: The dependency resolution queue to release.
   :return: nothing
 .. c:function:: void pkgconf_solution_free(pkgconf_client_t *client, pkgconf_pkg_t *world, int maxdepth)
   Removes references to package nodes contained in a solution.
   :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
   :param pkgconf_pkg_t* world: The root for the generated dependency graph.  Should have PKGCONF_PKG_PROPF_VIRTUAL flag.
   :returns: nothing
 .. c:function:: bool pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_t *world, int maxdepth)
   Solves and flattens the dependency graph for the supplied dependency list.
   :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
   :param pkgconf_list_t* list: The list of dependency requests to consider.
   :param pkgconf_pkg_t* world: The root for the generated dependency graph, provided by the caller.  Should have PKGCONF_PKG_PROPF_VIRTUAL flag.
   :param int maxdepth: The maximum allowed depth for the dependency resolver.  A depth of -1 means unlimited.
   :returns: true if the dependency resolver found a solution, otherwise false.
   :rtype: bool
 .. c:function:: void pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data)
   Attempt to compile a dependency resolution queue into a dependency resolution problem, then attempt to solve the problem and
   feed the solution to a callback function if a complete dependency graph is found.
   This function should not be used in new code.  Use pkgconf_queue_solve instead.
   :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
   :param pkgconf_list_t* list: The list of dependency requests to consider.
   :param pkgconf_queue_apply_func_t func: The callback function to call if a solution is found by the dependency resolver.
--- a/doc/libpkgconf-tuple.rst
+++ b/doc/libpkgconf-tuple.rst
@ -64,14 +64,13 @@ attached to a given client object.
   :return: the value of the variable or ``NULL``
   :rtype: char *
-.. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags)
+.. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
   Parse an expression for variable substitution.
   :param pkgconf_client_t* client: The pkgconf client object to access.
   :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list).
   :param char* value: The ``key=value`` string to parse.
   :param uint flags: Any flags to consider while parsing.
   :return: the variable data with any variables substituted
   :rtype: char *
--- a/doc/libpkgconf.rst
+++ b/doc/libpkgconf.rst
@ -11,7 +11,6 @@ libpkgconf - an API for managing `pkg-config` modules
   libpkgconf-dependency
   libpkgconf-fragment
   libpkgconf-path
   libpkgconf-personality
   libpkgconf-pkg
   libpkgconf-queue
   libpkgconf-tuple
--- a/libpkgconf.pc.in
+++ b/libpkgconf.pc.in
@ -5,8 +5,7 @@ libdir=@libdir@
 Name: libpkgconf
 Description: a library for accessing and manipulating development framework configuration
-URL: https://gitea.treehouse.systems/ariadne/pkgconf
+URL: http://github.com/pkgconf/pkgconf
 License: ISC
 Version: @PACKAGE_VERSION@
 CFlags: -I${includedir}/pkgconf
 Libs: -L${libdir} -lpkgconf
--- a/libpkgconf/argvsplit.c
+++ b/libpkgconf/argvsplit.c
@ -80,7 +80,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
 		if (escaped)
 		{
 			/* POSIX: only \CHAR is special inside a double quote if CHAR is {$, `, ", \, newline}. */
-			if (quote == '"')
+			if (quote == '\"')
 			{
 				if (!(*src_iter == '$' || *src_iter == '`' || *src_iter == '"' || *src_iter == '\\'))
 					*dst_iter++ = '\\';
@ -88,9 +88,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
 				*dst_iter++ = *src_iter;
 			}
 			else
 			{
 				*dst_iter++ = *src_iter;
 			}
 			escaped = false;
 		}
@ -103,7 +101,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
 			else
 				*dst_iter++ = *src_iter;
 		}
-		else if (isspace((unsigned char)*src_iter))
+		else if (isspace((unsigned int)*src_iter))
 		{
 			if ((*argv)[argc_count] != NULL)
 			{
--- a/libpkgconf/bsdstubs.c
+++ b/libpkgconf/bsdstubs.c
@ -20,12 +20,11 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
 #include <errno.h>
 #include <libpkgconf/bsdstubs.h>
 #include <libpkgconf/config.h>
-#if !HAVE_DECL_STRLCPY
+#ifndef HAVE_STRLCPY
 /*
 * Copy src to string dst of size siz.  At most siz-1 characters
 * will be copied.  Always NUL terminates (unless siz == 0).
@ -58,7 +57,7 @@ strlcpy(char *dst, const char *src, size_t siz)
 }
 #endif
-#if !HAVE_DECL_STRLCAT
+#ifndef HAVE_STRLCAT
 /*
 * Appends src to string dst of size siz (unlike strncat, siz is the
 * full size of dst, not space left).  At most siz-1 characters
@ -107,7 +106,7 @@ strlcat(char *dst, const char *src, size_t siz)
 * from the use of this software.
 */
-#if !HAVE_DECL_STRNDUP
+#ifndef HAVE_STRNDUP
 /*
 * Creates a memory buffer and copies at most 'len' characters to it.
 * If 'len' is less than the length of the source string, truncation occured.
@ -138,23 +137,3 @@ pkgconf_strndup(const char *src, size_t len)
 {
 	return strndup(src, len);
 }
 #if !HAVE_DECL_REALLOCARRAY
 void *
 reallocarray(void *ptr, size_t m, size_t n)
 {
 	if (n && m > -1 / n)
 	{
 		errno = ENOMEM;
 		return 0;
 	}
 	return realloc(ptr, m * n);
 }
 #endif
 void *
 pkgconf_reallocarray(void *ptr, size_t m, size_t n)
 {
 	return reallocarray(ptr, m, n);
 }
--- a/libpkgconf/bsdstubs.h
+++ b/libpkgconf/bsdstubs.h
@ -25,7 +25,6 @@ extern "C" {
 PKGCONF_API extern size_t pkgconf_strlcpy(char *dst, const char *src, size_t siz);
 PKGCONF_API extern size_t pkgconf_strlcat(char *dst, const char *src, size_t siz);
 PKGCONF_API extern char *pkgconf_strndup(const char *src, size_t len);
 PKGCONF_API extern void *pkgconf_reallocarray(void *ptr, size_t m, size_t n);
 #ifdef __cplusplus
 }
--- a/libpkgconf/cache.c
+++ b/libpkgconf/cache.c
@ -16,8 +16,6 @@
 #include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 #include <assert.h>
 /*
 * !doc
 *
@ -31,46 +29,6 @@
 * be shared across threads.
 */
 static int
 cache_member_cmp(const void *a, const void *b)
 {
 	const char *key = a;
 	const pkgconf_pkg_t *pkg = *(void **) b;
 	return strcmp(key, pkg->id);
 }
 static int
 cache_member_sort_cmp(const void *a, const void *b)
 {
 	const pkgconf_pkg_t *pkgA = *(void **) a;
 	const pkgconf_pkg_t *pkgB = *(void **) b;
 	if (pkgA == NULL)
 		return 1;
 	if (pkgB == NULL)
 		return -1;
 	return strcmp(pkgA->id, pkgB->id);
 }
 static void
 cache_dump(const pkgconf_client_t *client)
 {
 	size_t i;
 	PKGCONF_TRACE(client, "dumping package cache contents");
 	for (i = 0; i < client->cache_count; i++)
 	{
 		const pkgconf_pkg_t *pkg = client->cache_table[i];
 		PKGCONF_TRACE(client, SIZE_FMT_SPECIFIER": %p(%s)",
 			i, pkg, pkg == NULL ? "NULL" : pkg->id);
 	}
 }
 /*
 * !doc
 *
@ -88,19 +46,17 @@ cache_dump(const pkgconf_client_t *client)
 pkgconf_pkg_t *
 pkgconf_cache_lookup(pkgconf_client_t *client, const char *id)
 {
-	if (client->cache_table == NULL)
+	pkgconf_node_t *node;
 		return NULL;
-	pkgconf_pkg_t **pkg;
+	PKGCONF_FOREACH_LIST_ENTRY(client->pkg_cache.head, node)
 	pkg = bsearch(id, client->cache_table,
 		client->cache_count, sizeof (void *),
 		cache_member_cmp);
 	if (pkg != NULL)
 	{
-		PKGCONF_TRACE(client, "found: %s @%p", id, *pkg);
+		pkgconf_pkg_t *pkg = node->data;
-		return pkgconf_pkg_ref(client, *pkg);
+
 		if (!strcmp(pkg->id, id))
 		{
 			PKGCONF_TRACE(client, "found: %s @%p", id, pkg);
 			return pkgconf_pkg_ref(client, pkg);
 		}
 	}
 	PKGCONF_TRACE(client, "miss: %s", id);
@ -126,19 +82,12 @@ pkgconf_cache_add(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 		return;
 	pkgconf_pkg_ref(client, pkg);
 	pkgconf_node_insert(&pkg->cache_iter, pkg, &client->pkg_cache);
 	PKGCONF_TRACE(client, "added @%p to cache", pkg);
 	/* mark package as cached */
 	pkg->flags |= PKGCONF_PKG_PROPF_CACHED;
 	++client->cache_count;
 	client->cache_table = pkgconf_reallocarray(client->cache_table,
 		client->cache_count, sizeof (void *));
 	client->cache_table[client->cache_count - 1] = pkg;
 	qsort(client->cache_table, client->cache_count,
 		sizeof(void *), cache_member_sort_cmp);
 }
 /*
@ -155,9 +104,6 @@ pkgconf_cache_add(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 void
 pkgconf_cache_remove(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 {
 	if (client->cache_table == NULL)
 		return;
 	if (pkg == NULL)
 		return;
@ -166,41 +112,7 @@ pkgconf_cache_remove(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 	PKGCONF_TRACE(client, "removed @%p from cache", pkg);
-	pkgconf_pkg_t **slot;
+	pkgconf_node_delete(&pkg->cache_iter, &client->pkg_cache);
 	slot = bsearch(pkg->id, client->cache_table,
 		client->cache_count, sizeof (void *),
 		cache_member_cmp);
 	if (slot == NULL)
 		return;
 	(*slot)->flags &= ~PKGCONF_PKG_PROPF_CACHED;
 	pkgconf_pkg_unref(client, *slot);
 	*slot = NULL;
 	qsort(client->cache_table, client->cache_count,
 		sizeof(void *), cache_member_sort_cmp);
 	if (client->cache_table[client->cache_count - 1] != NULL)
 	{
 		PKGCONF_TRACE(client, "end of cache table refers to %p, not NULL",
 			client->cache_table[client->cache_count - 1]);
 		cache_dump(client);
 		abort();
 	}
 	client->cache_count--;
 	if (client->cache_count > 0)
 	{
 		client->cache_table = pkgconf_reallocarray(client->cache_table,
 			client->cache_count, sizeof(void *));
 	}
 	else
 	{
 		free(client->cache_table);
 		client->cache_table = NULL;
 	}
 }
 /*
@ -217,15 +129,15 @@ pkgconf_cache_remove(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 void
 pkgconf_cache_free(pkgconf_client_t *client)
 {
-	if (client->cache_table == NULL)
+	pkgconf_node_t *iter, *iter2;
 		return;
-	while (client->cache_count > 0)
+	PKGCONF_FOREACH_LIST_ENTRY_SAFE(client->pkg_cache.head, iter2, iter)
-		pkgconf_cache_remove(client, client->cache_table[0]);
+	{
 		pkgconf_pkg_t *pkg = iter->data;
 		pkgconf_pkg_unref(client, pkg);
 	}
-	free(client->cache_table);
+	memset(&client->pkg_cache, 0, sizeof client->pkg_cache);
 	client->cache_table = NULL;
 	client->cache_count = 0;
 	PKGCONF_TRACE(client, "cleared package cache");
 }
--- a/libpkgconf/client.c
+++ b/libpkgconf/client.c
@ -98,8 +98,6 @@ pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error
 	client->error_handler_data = error_handler_data;
 	client->error_handler = error_handler;
 	client->auditf = NULL;
 	client->cache_table = NULL;
 	client->cache_count = 0;
 #ifndef PKGCONF_LITE
 	if (client->trace_handler == NULL)
@ -403,7 +401,7 @@ pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t linen
 *    :rtype: bool
 */
 bool
-pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, void *data)
+pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, const void *data)
 {
 	(void) msg;
 	(void) client;
--- a/libpkgconf/config.h.meson
+++ b/libpkgconf/config.h.meson
@ -1,5 +1,29 @@
 /* libpkgconf/config.h.in.  Generated from configure.ac by autoheader.  */
 /* Define to 1 if you have the `cygwin_conv_path' function. */
 #mesondefine HAVE_CYGWIN_CONV_PATH
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #mesondefine HAVE_DLFCN_H
 /* Define to 1 if you have the <inttypes.h> header file. */
 #mesondefine HAVE_INTTYPES_H
 /* Define to 1 if you have the <memory.h> header file. */
 #mesondefine HAVE_MEMORY_H
 /* Define to 1 if you have the <stdint.h> header file. */
 #mesondefine HAVE_STDINT_H
 /* Define to 1 if you have the <stdlib.h> header file. */
 #mesondefine HAVE_STDLIB_H
 /* Define to 1 if you have the <strings.h> header file. */
 #mesondefine HAVE_STRINGS_H
 /* Define to 1 if you have the <string.h> header file. */
 #mesondefine HAVE_STRING_H
 /* Define to 1 if you have the `strlcat' function. */
 #mesondefine HAVE_STRLCAT
@ -9,20 +33,17 @@
 /* Define to 1 if you have the `strndup' function. */
 #mesondefine HAVE_STRNDUP
-/* Define to 1 if you have the `reallocarray' function. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
-#mesondefine HAVE_REALLOCARRAY
+#mesondefine HAVE_SYS_STAT_H
-/* Define to 1 if you have the `strlcat' function. */
+/* Define to 1 if you have the <sys/types.h> header file. */
-#mesondefine HAVE_DECL_STRLCAT
+#mesondefine HAVE_SYS_TYPES_H
-/* Define to 1 if you have the `strlcpy' function. */
+/* Define to 1 if you have the <unistd.h> header file. */
-#mesondefine HAVE_DECL_STRLCPY
+#mesondefine HAVE_UNISTD_H
-/* Define to 1 if you have the `strndup' function. */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#mesondefine HAVE_DECL_STRNDUP
+#mesondefine LT_OBJDIR
 /* Define to 1 if you have the `reallocarray' function. */
 #mesondefine HAVE_DECL_REALLOCARRAY
 /* Name of package */
 #mesondefine PACKAGE
--- a/libpkgconf/dependency.c
+++ b/libpkgconf/dependency.c
@ -73,7 +73,7 @@ find_colliding_dependency(const pkgconf_dependency_t *dep, const pkgconf_list_t
 }
 static inline pkgconf_dependency_t *
-add_or_replace_dependency_node(pkgconf_client_t *client, pkgconf_dependency_t *dep, pkgconf_list_t *list)
+add_or_replace_dependency_node(const pkgconf_client_t *client, pkgconf_dependency_t *dep, pkgconf_list_t *list)
 {
 	char depbuf[PKGCONF_ITEM_SIZE];
 	pkgconf_dependency_t *dep2 = find_colliding_dependency(dep, list);
@ -92,7 +92,7 @@ add_or_replace_dependency_node(pkgconf_client_t *client, pkgconf_dependency_t *d
 		{
 			PKGCONF_TRACE(client, "dropping dependency [%s]@%p because of collision", depbuf, dep);
-			pkgconf_dependency_unref(dep->owner, dep);
+			free(dep);
 			return NULL;
 		}
 		else if (dep2->flags && dep->flags == 0)
@ -100,7 +100,7 @@ add_or_replace_dependency_node(pkgconf_client_t *client, pkgconf_dependency_t *d
 			PKGCONF_TRACE(client, "dropping dependency [%s]@%p because of collision", depbuf2, dep2);
 			pkgconf_node_delete(&dep2->iter, list);
-			pkgconf_dependency_unref(dep2->owner, dep2);
+			free(dep2);
 		}
 		else
 			/* If both dependencies have equal strength, we keep both, because of situations like:
@ -113,20 +113,13 @@ add_or_replace_dependency_node(pkgconf_client_t *client, pkgconf_dependency_t *d
 	}
 	PKGCONF_TRACE(client, "added dependency [%s] to list @%p; flags=%x", dependency_to_str(dep, depbuf, sizeof depbuf), list, dep->flags);
-	pkgconf_node_insert_tail(&dep->iter, pkgconf_dependency_ref(dep->owner, dep), list);
+	pkgconf_node_insert_tail(&dep->iter, dep, list);
 	/* This dependency is intentionally unowned.
 	 *
 	 * Internally we have no use for the returned type, and usually just
 	 * discard it. However, there is a publig pkgconf_dependency_add
 	 * function, which references this return value before returning it,
 	 * giving ownership at that point.
 	 */
 	return dep;
 }
 static inline pkgconf_dependency_t *
-pkgconf_dependency_addraw(pkgconf_client_t *client, pkgconf_list_t *list, const char *package, size_t package_sz, const char *version, size_t version_sz, pkgconf_pkg_comparator_t compare, unsigned int flags)
+pkgconf_dependency_addraw(const pkgconf_client_t *client, pkgconf_list_t *list, const char *package, size_t package_sz, const char *version, size_t version_sz, pkgconf_pkg_comparator_t compare, unsigned int flags)
 {
 	pkgconf_dependency_t *dep;
@ -138,8 +131,6 @@ pkgconf_dependency_addraw(pkgconf_client_t *client, pkgconf_list_t *list, const
 	dep->compare = compare;
 	dep->flags = flags;
 	dep->owner = client;
 	dep->refcount = 0;
 	return add_or_replace_dependency_node(client, dep, list);
 }
@ -161,12 +152,12 @@ pkgconf_dependency_addraw(pkgconf_client_t *client, pkgconf_list_t *list, const
 *    :rtype: pkgconf_dependency_t *
 */
 pkgconf_dependency_t *
-pkgconf_dependency_add(pkgconf_client_t *client, pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare, unsigned int flags)
+pkgconf_dependency_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare, unsigned int flags)
 {
-	pkgconf_dependency_t *dep;
+	if (version != NULL)
-	dep = pkgconf_dependency_addraw(client, list, package, strlen(package), version,
+		return pkgconf_dependency_addraw(client, list, package, strlen(package), version, strlen(version), compare, flags);
-					version != NULL ? strlen(version) : 0, compare, flags);
+
-	return pkgconf_dependency_ref(dep->owner, dep);
+	return pkgconf_dependency_addraw(client, list, package, strlen(package), NULL, 0, compare, flags);
 }
 /*
@ -186,77 +177,6 @@ pkgconf_dependency_append(pkgconf_list_t *list, pkgconf_dependency_t *tail)
 	pkgconf_node_insert_tail(&tail->iter, tail, list);
 }
 /*
 * !doc
 *
 * .. c:function:: void pkgconf_dependency_free_one(pkgconf_dependency_t *dep)
 *
 *    Frees a dependency node.
 *
 *    :param pkgconf_dependency_t* dep: The dependency node to free.
 *    :return: nothing
 */
 void
 pkgconf_dependency_free_one(pkgconf_dependency_t *dep)
 {
 	if (dep->match != NULL)
 		pkgconf_pkg_unref(dep->match->owner, dep->match);
 	if (dep->package != NULL)
 		free(dep->package);
 	if (dep->version != NULL)
 		free(dep->version);
 	free(dep);
 }
 /*
 * !doc
 *
 * .. c:function:: pkgconf_dependency_t *pkgconf_dependency_ref(pkgconf_client_t *owner, pkgconf_dependency_t *dep)
 *
 *    Increases a dependency node's refcount.
 *
 *    :param pkgconf_client_t* owner: The client object which owns the memory of this dependency node.
 *    :param pkgconf_dependency_t* dep: The dependency to increase the refcount of.
 *    :return: the dependency node on success, else NULL
 */
 pkgconf_dependency_t *
 pkgconf_dependency_ref(pkgconf_client_t *client, pkgconf_dependency_t *dep)
 {
 	if (client != dep->owner)
 		return NULL;
 	dep->refcount++;
 	PKGCONF_TRACE(client, "%s refcount@%p: %d", dep->package, dep, dep->refcount);
 	return dep;
 }
 /*
 * !doc
 *
 * .. c:function:: void pkgconf_dependency_unref(pkgconf_client_t *owner, pkgconf_dependency_t *dep)
 *
 *    Decreases a dependency node's refcount and frees it if necessary.
 *
 *    :param pkgconf_client_t* owner: The client object which owns the memory of this dependency node.
 *    :param pkgconf_dependency_t* dep: The dependency to decrease the refcount of.
 *    :return: nothing
 */
 void
 pkgconf_dependency_unref(pkgconf_client_t *client, pkgconf_dependency_t *dep)
 {
 	if (client != dep->owner)
 		return;
 	--dep->refcount;
 	PKGCONF_TRACE(client, "%s refcount@%p: %d", dep->package, dep, dep->refcount);
 	if (dep->refcount <= 0)
 		pkgconf_dependency_free_one(dep);
 }
 /*
 * !doc
 *
@ -276,11 +196,17 @@ pkgconf_dependency_free(pkgconf_list_t *list)
 	{
 		pkgconf_dependency_t *dep = node->data;
-		pkgconf_node_delete(&dep->iter, list);
+		if (dep->match != NULL)
-		pkgconf_dependency_unref(dep->owner, dep);
+			pkgconf_pkg_unref(NULL, dep->match);
 	}
-	pkgconf_list_zero(list);
+		if (dep->package != NULL)
 			free(dep->package);
 		if (dep->version != NULL)
 			free(dep->version);
 		free(dep);
 	}
 }
 /*
@ -299,7 +225,7 @@ pkgconf_dependency_free(pkgconf_list_t *list)
 *    :return: nothing
 */
 void
-pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags)
+pkgconf_dependency_parse_str(const pkgconf_client_t *client, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags)
 {
 	parse_state_t state = OUTSIDE_MODULE;
 	pkgconf_pkg_comparator_t compare = PKGCONF_CMP_ANY;
@ -311,7 +237,6 @@ pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_h
 	char *vstart = NULL;
 	char *package = NULL, *version = NULL;
 	char *cnameptr = cmpname;
 	char *cnameend = cmpname + PKGCONF_ITEM_SIZE - 1;
 	memset(cmpname, '\0', sizeof cmpname);
@ -329,11 +254,11 @@ pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_h
 			break;
 		case INSIDE_MODULE_NAME:
-			if (isspace((unsigned char)*ptr))
+			if (isspace((unsigned int)*ptr))
 			{
 				const char *sptr = ptr;
-				while (*sptr && isspace((unsigned char)*sptr))
+				while (*sptr && isspace((unsigned int)*sptr))
 					sptr++;
 				if (*sptr == '\0')
@ -379,7 +304,6 @@ pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_h
 			if (PKGCONF_IS_OPERATOR_CHAR(*ptr))
 			{
 				state = INSIDE_OPERATOR;
 				if (cnameptr < cnameend)
 				*cnameptr++ = *ptr;
 			}
@ -391,13 +315,13 @@ pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_h
 				state = AFTER_OPERATOR;
 				compare = pkgconf_pkg_comparator_lookup_by_name(cmpname);
 			}
-			else if (cnameptr < cnameend)
+			else
 				*cnameptr++ = *ptr;
 			break;
 		case AFTER_OPERATOR:
-			if (!isspace((unsigned char)*ptr))
+			if (!isspace((unsigned int)*ptr))
 			{
 				vstart = ptr;
 				state = INSIDE_VERSION;
@ -445,43 +369,10 @@ pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_h
 *    :return: nothing
 */
 void
-pkgconf_dependency_parse(pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist, const char *depends, unsigned int flags)
+pkgconf_dependency_parse(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist, const char *depends, unsigned int flags)
 {
-	char *kvdepends = pkgconf_tuple_parse(client, &pkg->vars, depends, pkg->flags);
+	char *kvdepends = pkgconf_tuple_parse(client, &pkg->vars, depends);
 	pkgconf_dependency_parse_str(client, deplist, kvdepends, flags);
 	free(kvdepends);
 }
 /*
 * !doc
 *
 * .. c:function:: pkgconf_dependency_t *pkgconf_dependency_copy(pkgconf_client_t *client, const pkgconf_dependency_t *dep)
 *
 *    Copies a dependency node to a new one.
 *
 *    :param pkgconf_client_t* client: The client object that will own this dependency.
 *    :param pkgconf_dependency_t* dep: The dependency node to copy.
 *    :return: a pointer to a new dependency node, else NULL
 */
 pkgconf_dependency_t *
 pkgconf_dependency_copy(pkgconf_client_t *client, const pkgconf_dependency_t *dep)
 {
 	pkgconf_dependency_t *new_dep;
 	new_dep = calloc(sizeof(pkgconf_dependency_t), 1);
 	new_dep->package = strdup(dep->package);
 	if (dep->version != NULL)
 		new_dep->version = strdup(dep->version);
 	new_dep->compare = dep->compare;
 	new_dep->flags = dep->flags;
 	new_dep->owner = client;
 	new_dep->refcount = 0;
 	if (dep->match != NULL)
 		new_dep->match = pkgconf_pkg_ref(client, dep->match);
 	return pkgconf_dependency_ref(client, new_dep);
 }
--- a/libpkgconf/fileio.c
+++ b/libpkgconf/fileio.c
@ -20,7 +20,7 @@ char *
 pkgconf_fgetline(char *line, size_t size, FILE *stream)
 {
 	char *s = line;
-	char *end = line + size - 2;
+	char *end = line + size - 1;
 	bool quoted = false;
 	int c = '\0', c2;
@ -44,9 +44,6 @@ pkgconf_fgetline(char *line, size_t size, FILE *stream)
 				*s++ = c;
 				break;
 			}
 			else
 				*s++ = c;
 			quoted = false;
 			continue;
 		}
--- a/libpkgconf/fragment.c
+++ b/libpkgconf/fragment.c
@ -93,18 +93,15 @@ pkgconf_fragment_is_special(const char *string)
 }
 static inline void
-pkgconf_fragment_munge(const pkgconf_client_t *client, char *buf, size_t buflen, const char *source, const char *sysroot_dir, unsigned int flags)
+pkgconf_fragment_munge(const pkgconf_client_t *client, char *buf, size_t buflen, const char *source, const char *sysroot_dir)
 {
 	*buf = '\0';
 	if (!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES))
 	{
 	if (sysroot_dir == NULL)
 		sysroot_dir = pkgconf_tuple_find_global(client, "pc_sysrootdir");
 	if (sysroot_dir != NULL && pkgconf_fragment_should_munge(source, sysroot_dir))
 		pkgconf_strlcat(buf, sysroot_dir, buflen);
 	}
 	pkgconf_strlcat(buf, source, buflen);
@ -113,40 +110,39 @@ pkgconf_fragment_munge(const pkgconf_client_t *client, char *buf, size_t buflen,
 }
 static inline char *
-pkgconf_fragment_copy_munged(const pkgconf_client_t *client, const char *source, unsigned int flags)
+pkgconf_fragment_copy_munged(const pkgconf_client_t *client, const char *source)
 {
 	char mungebuf[PKGCONF_ITEM_SIZE];
-	pkgconf_fragment_munge(client, mungebuf, sizeof mungebuf, source, client->sysroot_dir, flags);
+	pkgconf_fragment_munge(client, mungebuf, sizeof mungebuf, source, client->sysroot_dir);
 	return strdup(mungebuf);
 }
 /*
 * !doc
 *
- * .. c:function:: void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags)
+ * .. c:function:: void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string)
 *
 *    Adds a `fragment` of text to a `fragment list`, possibly modifying the fragment if a sysroot is set.
 *
 *    :param pkgconf_client_t* client: The pkgconf client being accessed.
 *    :param pkgconf_list_t* list: The fragment list.
 *    :param char* string: The string of text to add as a fragment to the fragment list.
 *    :param uint flags: Parsing-related flags for the package.
 *    :return: nothing
 */
 void
-pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags)
+pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string)
 {
 	pkgconf_fragment_t *frag;
 	if (*string == '\0')
 		return;
-	if (strlen(string) > 1 && !pkgconf_fragment_is_special(string))
+	if (!pkgconf_fragment_is_special(string))
 	{
 		frag = calloc(sizeof(pkgconf_fragment_t), 1);
 		frag->type = *(string + 1);
-		frag->data = pkgconf_fragment_copy_munged(client, string + 2, flags);
+		frag->data = pkgconf_fragment_copy_munged(client, string + 2);
 		PKGCONF_TRACE(client, "added fragment {%c, '%s'} to list @%p", frag->type, frag->data, list);
 	}
@ -154,18 +150,17 @@ pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const
 	{
 		char mungebuf[PKGCONF_ITEM_SIZE];
-		if (list->tail != NULL && list->tail->data != NULL &&
+		if (list->tail != NULL && list->tail->data != NULL)
 		    !(client->flags & PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS))
 		{
 			pkgconf_fragment_t *parent = list->tail->data;
 			/* only attempt to merge 'special' fragments together */
-			if (!parent->type && parent->data != NULL && pkgconf_fragment_is_unmergeable(parent->data))
+			if (!parent->type && pkgconf_fragment_is_unmergeable(parent->data))
 			{
 				size_t len;
 				char *newdata;
-				pkgconf_fragment_munge(client, mungebuf, sizeof mungebuf, string, NULL, flags);
+				pkgconf_fragment_munge(client, mungebuf, sizeof mungebuf, string, NULL);
 				len = strlen(parent->data) + strlen(mungebuf) + 2;
 				newdata = malloc(len);
@ -437,11 +432,7 @@ fragment_quote(const pkgconf_fragment_t *frag)
 		    (*src > ')' && *src < '+') ||
 		    (*src > ':' && *src < '=') ||
 		    (*src > '=' && *src < '@') ||
-		    (*src > 'Z' && *src < '\\') ||
+		    (*src > 'Z' && *src < '^') ||
 #ifndef _WIN32
 		    (*src == '\\') ||
 #endif
 		    (*src > '\\' && *src < '^') ||
 		    (*src == '`') ||
 		    (*src > 'z' && *src < '~') ||
 		    (*src > '~')))
@ -451,10 +442,8 @@ fragment_quote(const pkgconf_fragment_t *frag)
 		if ((ptrdiff_t)(dst - out) + 2 > outlen)
 		{
 			ptrdiff_t offset = dst - out;
 			outlen *= 2;
 			out = realloc(out, outlen);
 			dst = out + offset;
 		}
 	}
@ -531,7 +520,6 @@ fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, bool e
 			free(quoted);
 		}
 		if (node->next != NULL)
 		*bptr++ = ' ';
 	}
@ -668,16 +656,15 @@ pkgconf_fragment_free(pkgconf_list_t *list)
 *    :param pkgconf_client_t* client: The pkgconf client being accessed.
 *    :param pkgconf_list_t* list: The `fragment list` to add the fragment entries to.
 *    :param pkgconf_list_t* vars: A list of variables to use for variable substitution.
 *    :param uint flags: Any parsing flags to be aware of.
 *    :param char* value: The string to parse into fragments.
 *    :return: true on success, false on parse error
 */
 bool
-pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value, unsigned int flags)
+pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value)
 {
 	int i, ret, argc;
 	char **argv;
-	char *repstr = pkgconf_tuple_parse(client, vars, value, flags);
+	char *repstr = pkgconf_tuple_parse(client, vars, value);
 	PKGCONF_TRACE(client, "post-subst: [%s] -> [%s]", value, repstr);
@ -691,8 +678,6 @@ pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkg
 	for (i = 0; i < argc; i++)
 	{
 		PKGCONF_TRACE(client, "processing %s", argv[i]);
 		if (argv[i] == NULL)
 		{
 			PKGCONF_TRACE(client, "parsed fragment string is inconsistent: argc = %d while argv[%d] == NULL", argc, i);
@ -701,7 +686,7 @@ pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkg
 			return false;
 		}
-		pkgconf_fragment_add(client, list, argv[i], flags);
+		pkgconf_fragment_add(client, list, argv[i]);
 	}
 	pkgconf_argv_free(argv);
--- a/libpkgconf/iter.h
+++ b/libpkgconf/iter.h
@ -34,14 +34,6 @@ typedef struct {
 #define PKGCONF_LIST_INITIALIZER		{ NULL, NULL, 0 }
 static inline void
 pkgconf_list_zero(pkgconf_list_t *list)
 {
 	list->head = NULL;
 	list->tail = NULL;
 	list->length = 0;
 }
 static inline void
 pkgconf_node_insert(pkgconf_node_t *node, void *data, pkgconf_list_t *list)
 {
--- a/libpkgconf/libpkgconf-api.h
+++ b/libpkgconf/libpkgconf-api.h
@ -2,7 +2,8 @@
 #define LIBPKGCONF_LIBPKGCONF_API_H
 /* Makefile.am specifies visibility using the libtool option -export-symbols-regex '^pkgconf_'
- * Unfortunately, that is not available when building with meson, so use attributes instead.
+ * Unfortunately, that is not available when building with cmake, so use attributes instead,
 * in a way that doesn't depend on any cmake magic.
 */
 #if defined(PKGCONFIG_IS_STATIC)
 # define PKGCONF_API
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@ -20,7 +20,6 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <libpkgconf/libpkgconf-api.h>
 #include <libpkgconf/iter.h>
 #include <libpkgconf/bsdstubs.h>
@ -79,8 +78,8 @@ typedef struct pkgconf_cross_personality_ pkgconf_cross_personality_t;
 #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \
 	for ((value) = (tail); (value) != NULL; (value) = (value)->prev)
-#define LIBPKGCONF_VERSION	10905
+#define LIBPKGCONF_VERSION	10990
-#define LIBPKGCONF_VERSION_STR	"1.9.5"
+#define LIBPKGCONF_VERSION_STR	"1.9.90"
 struct pkgconf_fragment_ {
 	pkgconf_node_t iter;
@ -101,9 +100,6 @@ struct pkgconf_dependency_ {
 	pkgconf_pkg_t *match;
 	unsigned int flags;
 	int refcount;
 	pkgconf_client_t *owner;
 };
 struct pkgconf_tuple_ {
@ -111,12 +107,8 @@ struct pkgconf_tuple_ {
 	char *key;
 	char *value;
 	unsigned int flags;
 };
 #define PKGCONF_PKG_TUPLEF_OVERRIDE		0x1
 struct pkgconf_path_ {
 	pkgconf_node_t lnode;
@ -128,10 +120,13 @@ struct pkgconf_path_ {
 #define PKGCONF_PKG_PROPF_NONE			0x00
 #define PKGCONF_PKG_PROPF_STATIC		0x01
 #define PKGCONF_PKG_PROPF_CACHED		0x02
 #define PKGCONF_PKG_PROPF_SEEN			0x04
 #define PKGCONF_PKG_PROPF_UNINSTALLED		0x08
 #define PKGCONF_PKG_PROPF_VIRTUAL		0x10
 struct pkgconf_pkg_ {
 	pkgconf_node_t cache_iter;
 	int refcount;
 	char *id;
 	char *filename;
@ -140,9 +135,6 @@ struct pkgconf_pkg_ {
 	char *description;
 	char *url;
 	char *pc_filedir;
 	char *license;
 	char *maintainer;
 	char *copyright;
 	pkgconf_list_t libs;
 	pkgconf_list_t libs_private;
@ -165,19 +157,16 @@ struct pkgconf_pkg_ {
 	 */
 	pkgconf_tuple_t *orig_prefix;
 	pkgconf_tuple_t *prefix;
 	uint64_t serial;
 	size_t hits;
 };
 typedef bool (*pkgconf_pkg_iteration_func_t)(const pkgconf_pkg_t *pkg, void *data);
 typedef void (*pkgconf_pkg_traverse_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data);
 typedef bool (*pkgconf_queue_apply_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int maxdepth);
-typedef bool (*pkgconf_error_handler_func_t)(const char *msg, const pkgconf_client_t *client, void *data);
+typedef bool (*pkgconf_error_handler_func_t)(const char *msg, const pkgconf_client_t *client, const void *data);
 struct pkgconf_client_ {
 	pkgconf_list_t dir_list;
 	pkgconf_list_t pkg_cache;
 	pkgconf_list_t filter_libdirs;
 	pkgconf_list_t filter_includedirs;
@ -202,11 +191,6 @@ struct pkgconf_client_ {
 	char *prefix_varname;
 	bool already_sent_notice;
 	uint64_t serial;
 	pkgconf_pkg_t **cache_table;
 	size_t cache_count;
 };
 struct pkgconf_cross_personality_ {
@ -218,9 +202,6 @@ struct pkgconf_cross_personality_ {
 	pkgconf_list_t filter_includedirs;
 	char *sysroot_dir;
 	bool want_default_static;
 	bool want_default_pure;
 };
 /* client.c */
@ -247,9 +228,8 @@ PKGCONF_API void pkgconf_client_dir_list_build(pkgconf_client_t *client, const p
 /* personality.c */
 PKGCONF_API pkgconf_cross_personality_t *pkgconf_cross_personality_default(void);
 PKGCONF_API pkgconf_cross_personality_t *pkgconf_cross_personality_find(const char *triplet);
 PKGCONF_API void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *personality);
-#define PKGCONF_IS_MODULE_SEPARATOR(c) ((c) == ',' || isspace ((unsigned char)(c)))
+#define PKGCONF_IS_MODULE_SEPARATOR(c) ((c) == ',' || isspace ((unsigned int)(c)))
 #define PKGCONF_IS_OPERATOR_CHAR(c) ((c) == '<' || (c) == '>' || (c) == '!' || (c) == '=')
 #define PKGCONF_PKG_PKGF_NONE				0x0000
@ -267,12 +247,8 @@ PKGCONF_API void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *p
 #define PKGCONF_PKG_PKGF_DONT_RELOCATE_PATHS		0x0800
 #define PKGCONF_PKG_PKGF_SIMPLIFY_ERRORS		0x1000
 #define PKGCONF_PKG_PKGF_DONT_FILTER_INTERNAL_CFLAGS	0x2000
 #define PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS	0x4000
 #define PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES		0x8000
 #define PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES         0x10000
 #define PKGCONF_PKG_DEPF_INTERNAL		0x1
 #define PKGCONF_PKG_DEPF_PRIVATE		0x2
 #define PKGCONF_PKG_ERRF_OK			0x0
 #define PKGCONF_PKG_ERRF_PACKAGE_NOT_FOUND	0x1
@ -300,17 +276,17 @@ PKGCONF_API void pkgconf_parser_parse(FILE *f, void *data, const pkgconf_parser_
 PKGCONF_API bool pkgconf_error(const pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3);
 PKGCONF_API bool pkgconf_warn(const pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3);
 PKGCONF_API bool pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t lineno, const char *funcname, const char *format, ...) PRINTFLIKE(5, 6);
-PKGCONF_API bool pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, void *data);
+PKGCONF_API bool pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, const void *data);
 #ifndef PKGCONF_LITE
 #if defined(__GNUC__) || defined(__INTEL_COMPILER)
 #define PKGCONF_TRACE(client, ...) do { \
 		pkgconf_trace(client, __FILE__, __LINE__, __PRETTY_FUNCTION__, __VA_ARGS__); \
-	} while (0)
+	} while (0);
 #else
 #define PKGCONF_TRACE(client, ...) do { \
 		pkgconf_trace(client, __FILE__, __LINE__, __func__, __VA_ARGS__); \
-	} while (0)
+	} while (0);
 #endif
 #else
 #define PKGCONF_TRACE(client, ...)
@ -333,16 +309,12 @@ PKGCONF_API int pkgconf_compare_version(const char *a, const char *b);
 PKGCONF_API pkgconf_pkg_t *pkgconf_scan_all(pkgconf_client_t *client, void *ptr, pkgconf_pkg_iteration_func_t func);
 /* parse.c */
-PKGCONF_API pkgconf_pkg_t *pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *path, FILE *f, unsigned int flags);
+PKGCONF_API pkgconf_pkg_t *pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *path, FILE *f);
-PKGCONF_API void pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags);
+PKGCONF_API void pkgconf_dependency_parse_str(const pkgconf_client_t *client, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags);
-PKGCONF_API void pkgconf_dependency_parse(pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags);
+PKGCONF_API void pkgconf_dependency_parse(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags);
 PKGCONF_API void pkgconf_dependency_append(pkgconf_list_t *list, pkgconf_dependency_t *tail);
 PKGCONF_API void pkgconf_dependency_free(pkgconf_list_t *list);
-PKGCONF_API void pkgconf_dependency_free_one(pkgconf_dependency_t *dep);
+PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare, unsigned int flags);
 PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_add(pkgconf_client_t *client, pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare, unsigned int flags);
 PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_ref(pkgconf_client_t *client, pkgconf_dependency_t *dep);
 PKGCONF_API void pkgconf_dependency_unref(pkgconf_client_t *client, pkgconf_dependency_t *dep);
 PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_copy(pkgconf_client_t *client, const pkgconf_dependency_t *dep);
 /* argvsplit.c */
 PKGCONF_API int pkgconf_argv_split(const char *src, int *argc, char ***argv);
@ -355,8 +327,8 @@ typedef struct pkgconf_fragment_render_ops_ {
 } pkgconf_fragment_render_ops_t;
 typedef bool (*pkgconf_fragment_filter_func_t)(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, void *data);
-PKGCONF_API bool pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value, unsigned int flags);
+PKGCONF_API bool pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value);
-PKGCONF_API void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags);
+PKGCONF_API void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string);
 PKGCONF_API void pkgconf_fragment_copy(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_fragment_t *base, bool is_private);
 PKGCONF_API void pkgconf_fragment_copy_list(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_list_t *base);
 PKGCONF_API void pkgconf_fragment_delete(pkgconf_list_t *list, pkgconf_fragment_t *node);
@ -371,9 +343,9 @@ PKGCONF_API bool pkgconf_fragment_has_system_dir(const pkgconf_client_t *client,
 PKGCONF_API char *pkgconf_fgetline(char *line, size_t size, FILE *stream);
 /* tuple.c */
-PKGCONF_API pkgconf_tuple_t *pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *parent, const char *key, const char *value, bool parse, unsigned int flags);
+PKGCONF_API pkgconf_tuple_t *pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *parent, const char *key, const char *value, bool parse);
 PKGCONF_API char *pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key);
-PKGCONF_API char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *list, const char *value, unsigned int flags);
+PKGCONF_API char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *list, const char *value);
 PKGCONF_API void pkgconf_tuple_free(pkgconf_list_t *list);
 PKGCONF_API void pkgconf_tuple_free_entry(pkgconf_tuple_t *tuple, pkgconf_list_t *list);
 PKGCONF_API void pkgconf_tuple_add_global(pkgconf_client_t *client, const char *key, const char *value);
@ -384,11 +356,9 @@ PKGCONF_API void pkgconf_tuple_define_global(pkgconf_client_t *client, const cha
 /* queue.c */
 PKGCONF_API void pkgconf_queue_push(pkgconf_list_t *list, const char *package);
 PKGCONF_API bool pkgconf_queue_compile(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_list_t *list);
 PKGCONF_API bool pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_t *world, int maxdepth);
 PKGCONF_API void pkgconf_queue_free(pkgconf_list_t *list);
 PKGCONF_API bool pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data);
 PKGCONF_API bool pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, int maxdepth);
 PKGCONF_API void pkgconf_solution_free(pkgconf_client_t *client, pkgconf_pkg_t *world);
 /* cache.c */
 PKGCONF_API pkgconf_pkg_t *pkgconf_cache_lookup(pkgconf_client_t *client, const char *id);
--- a/libpkgconf/meson.build
+++ b/libpkgconf/meson.build
@ -8,5 +8,5 @@ install_headers('libpkgconf.h',
  'iter.h',
  'bsdstubs.h',
  'libpkgconf-api.h',
-  subdir : 'pkgconf/libpkgconf')
+  subdir : 'libpkgconf')
--- a/libpkgconf/parser.c
+++ b/libpkgconf/parser.c
@ -44,23 +44,14 @@ pkgconf_parser_parse(FILE *f, void *data, const pkgconf_parser_operand_func_t *o
 		lineno++;
 		p = readbuf;
-		while (*p && isspace((unsigned char)*p))
+		while (*p && (isalpha((unsigned int)*p) || isdigit((unsigned int)*p) || *p == '_' || *p == '.'))
 			p++;
 		if (*p && p != readbuf)
 		{
 			warnfunc(data, "%s:" SIZE_FMT_SPECIFIER ": warning: whitespace encountered while parsing key section\n",
 				filename, lineno);
 			warned_key_whitespace = true;
 		}
 		key = p;
 		while (*p && (isalpha((unsigned char)*p) || isdigit((unsigned char)*p) || *p == '_' || *p == '.'))
 			p++;
-		if (!isalpha((unsigned char)*key) &&
+		key = readbuf;
-		    !isdigit((unsigned char)*p))
+		if (!isalpha((unsigned int)*key) && !isdigit((unsigned int)*p))
 			continue;
-		while (*p && isspace((unsigned char)*p))
+		while (*p && isspace((unsigned int)*p))
 		{
 			if (!warned_key_whitespace)
 			{
@ -75,18 +66,15 @@ pkgconf_parser_parse(FILE *f, void *data, const pkgconf_parser_operand_func_t *o
 		}
 		op = *p;
 		if (*p != '\0')
 		{
 		*p = '\0';
 		p++;
 		}
-		while (*p && isspace((unsigned char)*p))
+		while (*p && isspace((unsigned int)*p))
 			p++;
 		value = p;
 		p = value + (strlen(value) - 1);
-		while (*p && isspace((unsigned char) *p) && p > value)
+		while (*p && isspace((unsigned int) *p) && p > value)
 		{
 			if (!warned_value_whitespace && op == '=')
 			{
@ -98,6 +86,7 @@ pkgconf_parser_parse(FILE *f, void *data, const pkgconf_parser_operand_func_t *o
 			*p = '\0';
 			p--;
 		}
 		if (ops[(unsigned char) op])
 			ops[(unsigned char) op](data, lineno, key, value);
 	}
--- a/libpkgconf/path.c
+++ b/libpkgconf/path.c
@ -17,6 +17,10 @@
 #include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 #if defined(HAVE_CYGWIN_CONV_PATH) && defined(__MSYS__)
 # include <sys/cygwin.h>
 #endif
 #if defined(HAVE_SYS_STAT_H) && ! defined(_WIN32)
 # include <sys/stat.h>
 # define PKGCONF_CACHE_INODES
@ -88,12 +92,16 @@ pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter)
 			return;
 		if (S_ISLNK(st.st_mode))
 		{
-			char pathbuf[PKGCONF_ITEM_SIZE * 4];
+			char *linkdest = realpath(path, NULL);
 			char *linkdest = realpath(path, pathbuf);
 			if (linkdest != NULL && stat(linkdest, &st) == -1)
 			{
 				free(linkdest);
 				return;
 			}
 			free(linkdest);
 		}
 		if (path_list_contains_entry(path, dirlist, &st))
 			return;
 	}
@ -268,8 +276,6 @@ pkgconf_path_free(pkgconf_list_t *dirlist)
 		free(pnode->path);
 		free(pnode);
 	}
 	pkgconf_list_zero(dirlist);
 }
 static char *
@ -304,7 +310,7 @@ normpath(const char *path)
 *
 * .. c:function:: bool pkgconf_path_relocate(char *buf, size_t buflen)
 *
- *    Relocates a path, possibly calling normpath() on it.
+ *    Relocates a path, possibly calling normpath() or cygwin_conv_path() on it.
 *
 *    :param char* buf: The path to relocate.
 *    :param size_t buflen: The buffer length the path is contained in.
@ -314,10 +320,28 @@ normpath(const char *path)
 bool
 pkgconf_path_relocate(char *buf, size_t buflen)
 {
-#ifdef _WIN32
+#if defined(HAVE_CYGWIN_CONV_PATH) && defined(__MSYS__)
-	char *ti;
+	ssize_t size;
-#endif
+	char *tmpbuf, *ti;
 	size = cygwin_conv_path(CCP_POSIX_TO_WIN_A, buf, NULL, 0);
 	if (size < 0 || (size_t) size > buflen)
 		return false;
 	tmpbuf = malloc(size);
 	if (cygwin_conv_path(CCP_POSIX_TO_WIN_A, buf, tmpbuf, size))
 		return false;
 	pkgconf_strlcpy(buf, tmpbuf, buflen);
 	free(tmpbuf);
 	/* rewrite any backslash arguments for best compatibility */
 	for (ti = buf; *ti != '\0'; ti++)
 	{
 		if (*ti == '\\')
 			*ti = '/';
 	}
 #else
 	char *tmpbuf;
 	if ((tmpbuf = normpath(buf)) != NULL)
@ -332,6 +356,7 @@ pkgconf_path_relocate(char *buf, size_t buflen)
 		pkgconf_strlcpy(buf, tmpbuf, buflen);
 		free(tmpbuf);
 	}
 #endif
 	return true;
 }
--- a/libpkgconf/personality.c
+++ b/libpkgconf/personality.c
@ -17,30 +17,13 @@
 #include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 /*
 * !doc
 *
 * libpkgconf `personality` module
 * =========================
 */
 #ifdef _WIN32
 #	define strcasecmp _stricmp
 #endif
-/*
+static bool default_personality_init = false;
 * Increment each time the default personality is inited, decrement each time
 * it's deinited. Whenever it is 0, then the deinit frees the personality. In
 * that case an additional call to init will create it anew.
 */
 static unsigned default_personality_init = 0;
 static pkgconf_cross_personality_t default_personality = {
 	.name = "default",
 #ifdef _WIN32
 	.want_default_static = true,
 	.want_default_pure = true,
 #endif
 };
 static inline void
@ -98,49 +81,24 @@ build_default_search_path(pkgconf_list_t* dirlist)
 *
 *    Returns the default cross-compile personality.
 *
 *    Not thread safe.
 *
 *    :rtype: pkgconf_cross_personality_t*
 *    :return: the default cross-compile personality
 */
 pkgconf_cross_personality_t *
 pkgconf_cross_personality_default(void)
 {
-	if (default_personality_init) {
+	if (default_personality_init)
 		++default_personality_init;
 		return &default_personality;
 	}
 	build_default_search_path(&default_personality.dir_list);
-	pkgconf_path_split(SYSTEM_LIBDIR, &default_personality.filter_libdirs, false);
+	pkgconf_path_split(SYSTEM_LIBDIR, &default_personality.filter_libdirs, true);
-	pkgconf_path_split(SYSTEM_INCLUDEDIR, &default_personality.filter_includedirs, false);
+	pkgconf_path_split(SYSTEM_INCLUDEDIR, &default_personality.filter_includedirs, true);
-	++default_personality_init;
+	default_personality_init = true;
 	return &default_personality;
 }
 /*
 * !doc
 *
 * .. c:function:: void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *)
 *
 *    Decrements the count of default cross personality instances.
 *
 *    Not thread safe.
 *
 *    :rtype: void
 */
 void
 pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *personality)
 {
    if (--default_personality_init == 0) {
        pkgconf_path_free(&personality->dir_list);
        pkgconf_path_free(&personality->filter_libdirs);
        pkgconf_path_free(&personality->filter_includedirs);
    }
 }
 #ifndef PKGCONF_LITE
 static bool
 valid_triplet(const char *triplet)
@ -148,7 +106,7 @@ valid_triplet(const char *triplet)
 	const char *c = triplet;
 	for (; *c; c++)
-		if (!isalnum((unsigned char)*c) && *c != '-' && *c != '_')
+		if (!isalnum(*c) && *c != '-' && *c != '_')
 			return false;
 	return true;
@ -161,16 +119,6 @@ typedef struct {
 	const ptrdiff_t offset;
 } personality_keyword_pair_t;
 static void
 personality_bool_func(pkgconf_cross_personality_t *p, const char *keyword, const size_t lineno, const ptrdiff_t offset, char *value)
 {
 	(void) keyword;
 	(void) lineno;
 	bool *dest = (bool *)((char *) p + offset);
 	*dest = strcasecmp(value, "true") || strcasecmp(value, "yes") || *value == '1';
 }
 static void
 personality_copy_func(pkgconf_cross_personality_t *p, const char *keyword, const size_t lineno, const ptrdiff_t offset, char *value)
 {
@ -198,8 +146,6 @@ static const personality_keyword_pair_t personality_keyword_pairs[] = {
 	{"SystemIncludePaths", personality_fragment_func, offsetof(pkgconf_cross_personality_t, filter_includedirs)},
 	{"SystemLibraryPaths", personality_fragment_func, offsetof(pkgconf_cross_personality_t, filter_libdirs)},
 	{"Triplet", personality_copy_func, offsetof(pkgconf_cross_personality_t, name)},
 	{"WantDefaultPure", personality_bool_func, offsetof(pkgconf_cross_personality_t, want_default_pure)},
 	{"WantDefaultStatic", personality_bool_func, offsetof(pkgconf_cross_personality_t, want_default_static)},
 };
 static int
@ -222,7 +168,7 @@ personality_keyword_set(pkgconf_cross_personality_t *p, const size_t lineno, con
 	pair->func(p, keyword, lineno, pair->offset, value);
 }
-static const pkgconf_parser_operand_func_t personality_parser_ops[256] = {
+static const pkgconf_parser_operand_func_t personality_parser_ops[] = {
 	[':'] = (pkgconf_parser_operand_func_t) personality_keyword_set
 };
--- a/libpkgconf/pkg.c
+++ b/libpkgconf/pkg.c
@ -37,14 +37,6 @@
 #define PKG_CONFIG_EXT ".pc"
 static unsigned int
 pkgconf_pkg_traverse_main(pkgconf_client_t *client,
 	pkgconf_pkg_t *root,
 	pkgconf_pkg_traverse_func_t func,
 	void *data,
 	int maxdepth,
 	unsigned int skip_flags);
 static inline bool
 str_has_suffix(const char *str, const char *suffix)
 {
@ -72,7 +64,7 @@ pkg_get_parent_dir(pkgconf_pkg_t *pkg)
 	return strdup(buf);
 }
-typedef void (*pkgconf_pkg_parser_keyword_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value);
+typedef void (*pkgconf_pkg_parser_keyword_func_t)(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value);
 typedef struct {
 	const char *keyword;
 	const pkgconf_pkg_parser_keyword_func_t func;
@ -86,17 +78,17 @@ static int pkgconf_pkg_parser_keyword_pair_cmp(const void *key, const void *ptr)
 }
 static void
-pkgconf_pkg_parser_tuple_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
+pkgconf_pkg_parser_tuple_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
 {
 	(void) keyword;
 	(void) lineno;
 	char **dest = (char **)((char *) pkg + offset);
-	*dest = pkgconf_tuple_parse(client, &pkg->vars, value, pkg->flags);
+	*dest = pkgconf_tuple_parse(client, &pkg->vars, value);
 }
 static void
-pkgconf_pkg_parser_version_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
+pkgconf_pkg_parser_version_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
 {
 	(void) keyword;
 	(void) lineno;
@ -105,10 +97,10 @@ pkgconf_pkg_parser_version_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, co
 	char **dest = (char **)((char *) pkg + offset);
 	/* cut at any detected whitespace */
-	p = pkgconf_tuple_parse(client, &pkg->vars, value, pkg->flags);
+	p = pkgconf_tuple_parse(client, &pkg->vars, value);
-	len = strcspn(p, " \t");
+	len = strcspn(p, " \t\r\n");
-	if (len != strlen(p))
+	if (len)
 	{
 		i = p + (ptrdiff_t) len;
 		*i = '\0';
@ -121,10 +113,10 @@ pkgconf_pkg_parser_version_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, co
 }
 static void
-pkgconf_pkg_parser_fragment_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
+pkgconf_pkg_parser_fragment_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
 {
 	pkgconf_list_t *dest = (pkgconf_list_t *)((char *) pkg + offset);
-	bool ret = pkgconf_fragment_parse(client, dest, &pkg->vars, value, pkg->flags);
+	bool ret = pkgconf_fragment_parse(client, dest, &pkg->vars, value);
 	if (!ret)
 	{
@ -134,7 +126,7 @@ pkgconf_pkg_parser_fragment_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, c
 }
 static void
-pkgconf_pkg_parser_dependency_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
+pkgconf_pkg_parser_dependency_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
 {
 	(void) keyword;
 	(void) lineno;
@ -145,7 +137,7 @@ pkgconf_pkg_parser_dependency_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg,
 /* a variant of pkgconf_pkg_parser_dependency_func which colors the dependency node as an "internal" dependency. */
 static void
-pkgconf_pkg_parser_internal_dependency_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
+pkgconf_pkg_parser_internal_dependency_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
 {
 	(void) keyword;
 	(void) lineno;
@ -154,34 +146,19 @@ pkgconf_pkg_parser_internal_dependency_func(pkgconf_client_t *client, pkgconf_pk
 	pkgconf_dependency_parse(client, pkg, dest, value, PKGCONF_PKG_DEPF_INTERNAL);
 }
 /* a variant of pkgconf_pkg_parser_dependency_func which colors the dependency node as a "private" dependency. */
 static void
 pkgconf_pkg_parser_private_dependency_func(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value)
 {
 	(void) keyword;
 	(void) lineno;
 	pkgconf_list_t *dest = (pkgconf_list_t *)((char *) pkg + offset);
 	pkgconf_dependency_parse(client, pkg, dest, value, PKGCONF_PKG_DEPF_PRIVATE);
 }
 /* keep this in alphabetical order */
 static const pkgconf_pkg_parser_keyword_pair_t pkgconf_pkg_parser_keyword_funcs[] = {
 	{"CFLAGS", pkgconf_pkg_parser_fragment_func, offsetof(pkgconf_pkg_t, cflags)},
 	{"CFLAGS.private", pkgconf_pkg_parser_fragment_func, offsetof(pkgconf_pkg_t, cflags_private)},
 	{"Conflicts", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, conflicts)},
 	{"Copyright", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, copyright)},
 	{"Description", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, description)},
 	{"LIBS", pkgconf_pkg_parser_fragment_func, offsetof(pkgconf_pkg_t, libs)},
 	{"LIBS.private", pkgconf_pkg_parser_fragment_func, offsetof(pkgconf_pkg_t, libs_private)},
 	{"License", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, license)},
 	{"Maintainer", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, maintainer)},
 	{"Name", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, realname)},
 	{"Provides", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, provides)},
 	{"Requires", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, required)},
 	{"Requires.internal", pkgconf_pkg_parser_internal_dependency_func, offsetof(pkgconf_pkg_t, requires_private)},
-	{"Requires.private", pkgconf_pkg_parser_private_dependency_func, offsetof(pkgconf_pkg_t, requires_private)},
+	{"Requires.private", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires_private)},
 	{"URL", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, url)},
 	{"Version", pkgconf_pkg_parser_version_func, offsetof(pkgconf_pkg_t, version)},
 };
@ -237,37 +214,6 @@ determine_prefix(const pkgconf_pkg_t *pkg, char *buf, size_t buflen)
 	return buf;
 }
 /*
 * Takes a real path and converts it to a pkgconf value. This means normalizing
 * directory separators and escaping things (only spaces covered atm).
 *
 * This is useful for things like prefix/pcfiledir which might get injected
 * at runtime and are not sourced from the .pc file.
 *
 * "C:\foo bar\baz" -> "C:/foo\ bar/baz"
 * "/foo bar/baz" -> "/foo\ bar/baz"
 */
 static char *
 convert_path_to_value(const char *path)
 {
 	char *buf = calloc((strlen(path) + 1) * 2, 1);
 	char *bptr = buf;
 	const char *i;
 	for (i = path; *i != '\0'; i++)
 	{
 		if (*i == PKG_DIR_SEP_S)
 			*bptr++ = '/';
 		else if (*i == ' ') {
 			*bptr++ = '\\';
 			*bptr++ = *i;
 		} else
 			*bptr++ = *i;
 	}
 	return buf;
 }
 static void
 remove_additional_separators(char *buf)
 {
@ -292,6 +238,16 @@ remove_additional_separators(char *buf)
 static void
 canonicalize_path(char *buf)
 {
 #ifdef _WIN32
 	char *p = buf;
 	while (*p) {
 		if (*p == '\\')
 			*p = '/';
 		p++;
 	}
 #endif
 	remove_additional_separators(buf);
 }
@ -327,10 +283,10 @@ pkgconf_pkg_parser_value_set(void *opaque, const size_t lineno, const char *keyw
 		pkgconf_strlcpy(newvalue, pkg->prefix->value, sizeof newvalue);
 		pkgconf_strlcat(newvalue, canonicalized_value + strlen(pkg->orig_prefix->value), sizeof newvalue);
-		pkgconf_tuple_add(pkg->owner, &pkg->vars, keyword, newvalue, false, pkg->flags);
+		pkgconf_tuple_add(pkg->owner, &pkg->vars, keyword, newvalue, false);
 	}
 	else if (strcmp(keyword, pkg->owner->prefix_varname) || !(pkg->owner->flags & PKGCONF_PKG_PKGF_REDEFINE_PREFIX))
-		pkgconf_tuple_add(pkg->owner, &pkg->vars, keyword, value, true, pkg->flags);
+		pkgconf_tuple_add(pkg->owner, &pkg->vars, keyword, value, true);
 	else
 	{
 		char pathbuf[PKGCONF_ITEM_SIZE];
@ -338,13 +294,11 @@ pkgconf_pkg_parser_value_set(void *opaque, const size_t lineno, const char *keyw
 		if (relvalue != NULL)
 		{
-			char *prefix_value = convert_path_to_value(relvalue);
+			pkg->orig_prefix = pkgconf_tuple_add(pkg->owner, &pkg->vars, "orig_prefix", canonicalized_value, true);
-			pkg->orig_prefix = pkgconf_tuple_add(pkg->owner, &pkg->vars, "orig_prefix", canonicalized_value, true, pkg->flags);
+			pkg->prefix = pkgconf_tuple_add(pkg->owner, &pkg->vars, keyword, relvalue, false);
 			pkg->prefix = pkgconf_tuple_add(pkg->owner, &pkg->vars, keyword, prefix_value, false, pkg->flags);
 			free(prefix_value);
 		}
 		else
-			pkgconf_tuple_add(pkg->owner, &pkg->vars, keyword, value, true, pkg->flags);
+			pkgconf_tuple_add(pkg->owner, &pkg->vars, keyword, value, true);
 	}
 }
@ -402,19 +356,18 @@ pkgconf_pkg_validate(const pkgconf_client_t *client, const pkgconf_pkg_t *pkg)
 /*
 * !doc
 *
- * .. c:function:: pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename, FILE *f, unsigned int flags)
+ * .. c:function:: pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename, FILE *f)
 *
 *    Parse a .pc file into a pkgconf_pkg_t object structure.
 *
 *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
 *    :param char* filename: The filename of the package file (including full path).
 *    :param FILE* f: The file object to read from.
 *    :param uint flags: The flags to use when parsing.
 *    :returns: A ``pkgconf_pkg_t`` object which contains the package data.
 *    :rtype: pkgconf_pkg_t *
 */
 pkgconf_pkg_t *
-pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *f, unsigned int flags)
+pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *f)
 {
 	pkgconf_pkg_t *pkg;
 	char *idptr;
@ -423,35 +376,18 @@ pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *
 	pkg->owner = client;
 	pkg->filename = strdup(filename);
 	pkg->pc_filedir = pkg_get_parent_dir(pkg);
-	pkg->flags = flags;
+	pkgconf_tuple_add(client, &pkg->vars, "pcfiledir", pkg->pc_filedir, true);
 	char *pc_filedir_value = convert_path_to_value(pkg->pc_filedir);
 	pkgconf_tuple_add(client, &pkg->vars, "pcfiledir", pc_filedir_value, true, pkg->flags);
 	free(pc_filedir_value);
 	/* If pc_filedir is outside of sysroot_dir, override sysroot_dir for this
 	 * package.
 	 * See https://github.com/pkgconf/pkgconf/issues/213
 	 */
 	if (client->sysroot_dir && strncmp(pkg->pc_filedir, client->sysroot_dir, strlen(client->sysroot_dir)))
 		pkgconf_tuple_add(client, &pkg->vars, "pc_sysrootdir", "", false, pkg->flags);
 	/* make module id */
 	if ((idptr = strrchr(pkg->filename, PKG_DIR_SEP_S)) != NULL)
 		idptr++;
 #ifdef _WIN32
 	else if ((idptr = strrchr(pkg->filename, '/')) != NULL)
 		idptr++;
 #endif
 	else
 		idptr = pkg->filename;
 #ifdef _WIN32
 	/* On Windows, both \ and / are allowed in paths, so we have to chop both.
 	 * strrchr() took us to the last \ in that case, so we just have to see if
 	 * it is followed by a /.  If so, lop it off.
 	 */
 	char *mungeptr;
 	if ((mungeptr = strrchr(idptr, '/')) != NULL)
 		idptr = ++mungeptr;
 #endif
 	pkg->id = strdup(idptr);
 	idptr = strrchr(pkg->id, '.');
 	if (idptr)
@ -466,8 +402,7 @@ pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *
 		return NULL;
 	}
-	pkgconf_dependency_t *dep = pkgconf_dependency_add(client, &pkg->provides, pkg->id, pkg->version, PKGCONF_CMP_EQUAL, 0);
+	pkgconf_dependency_add(client, &pkg->provides, pkg->id, pkg->version, PKGCONF_CMP_EQUAL, 0);
 	pkgconf_dependency_unref(dep->owner, dep);
 	return pkgconf_pkg_ref(client, pkg);
 }
@ -530,15 +465,6 @@ pkgconf_pkg_free(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 	if (pkg->pc_filedir != NULL)
 		free(pkg->pc_filedir);
 	if (pkg->license != NULL)
 		free(pkg->license);
 	if (pkg->maintainer != NULL)
 		free(pkg->maintainer);
 	if (pkg->copyright != NULL)
 		free(pkg->copyright);
 	free(pkg);
 }
@ -561,7 +487,7 @@ pkgconf_pkg_ref(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 		PKGCONF_TRACE(client, "WTF: client %p refers to package %p owned by other client %p", client, pkg, pkg->owner);
 	pkg->refcount++;
-	PKGCONF_TRACE(client, "%s refcount@%p: %d", pkg->id, pkg, pkg->refcount);
+	PKGCONF_TRACE(client, "refcount@%p: %d", pkg, pkg->refcount);
 	return pkg;
 }
@ -584,7 +510,7 @@ pkgconf_pkg_unref(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 		PKGCONF_TRACE(client, "WTF: client %p unrefs package %p owned by other client %p", client, pkg, pkg->owner);
 	pkg->refcount--;
-	PKGCONF_TRACE(pkg->owner, "%s refcount@%p: %d", pkg->id, pkg, pkg->refcount);
+	PKGCONF_TRACE(pkg->owner, "refcount@%p: %d", pkg, pkg->refcount);
 	if (pkg->refcount <= 0)
 		pkgconf_pkg_free(pkg->owner, pkg);
@ -600,18 +526,19 @@ pkgconf_pkg_try_specific_path(pkgconf_client_t *client, const char *path, const
 	PKGCONF_TRACE(client, "trying path: %s for %s", path, name);
-	snprintf(locbuf, sizeof locbuf, "%s%c%s" PKG_CONFIG_EXT, path, PKG_DIR_SEP_S, name);
+	snprintf(locbuf, sizeof locbuf, "%s/%s" PKG_CONFIG_EXT, path, name);
-	snprintf(uninst_locbuf, sizeof uninst_locbuf, "%s%c%s-uninstalled" PKG_CONFIG_EXT, path, PKG_DIR_SEP_S, name);
+	snprintf(uninst_locbuf, sizeof uninst_locbuf, "%s/%s-uninstalled" PKG_CONFIG_EXT, path, name);
 	if (!(client->flags & PKGCONF_PKG_PKGF_NO_UNINSTALLED) && (f = fopen(uninst_locbuf, "r")) != NULL)
 	{
 		PKGCONF_TRACE(client, "found (uninstalled): %s", uninst_locbuf);
-		pkg = pkgconf_pkg_new_from_file(client, uninst_locbuf, f, PKGCONF_PKG_PROPF_UNINSTALLED);
+		pkg = pkgconf_pkg_new_from_file(client, uninst_locbuf, f);
 		pkg->flags |= PKGCONF_PKG_PROPF_UNINSTALLED;
 	}
 	else if ((f = fopen(locbuf, "r")) != NULL)
 	{
 		PKGCONF_TRACE(client, "found: %s", locbuf);
-		pkg = pkgconf_pkg_new_from_file(client, locbuf, f, 0);
+		pkg = pkgconf_pkg_new_from_file(client, locbuf, f);
 	}
 	return pkg;
@ -649,7 +576,7 @@ pkgconf_pkg_scan_dir(pkgconf_client_t *client, const char *path, void *data, pkg
 		if (f == NULL)
 			continue;
-		pkg = pkgconf_pkg_new_from_file(client, filebuf, f, 0);
+		pkg = pkgconf_pkg_new_from_file(client, filebuf, f);
 		if (pkg != NULL)
 		{
 			if (func(pkg, data))
@ -769,7 +696,7 @@ pkgconf_pkg_find(pkgconf_client_t *client, const char *name)
 			PKGCONF_TRACE(client, "%s is a file", name);
-			pkg = pkgconf_pkg_new_from_file(client, name, f, 0);
+			pkg = pkgconf_pkg_new_from_file(client, name, f);
 			if (pkg != NULL)
 			{
 				pkgconf_path_add(pkg->pc_filedir, &client->dir_list, true);
@ -826,7 +753,7 @@ out:
 *
 *    :param char* a: The first version to compare in the pair.
 *    :param char* b: The second version to compare in the pair.
- *    :return: -1 if the first version is less than, 0 if both versions are equal, 1 if the second version is less than.
+ *    :return: -1 if the first version is greater, 0 if both versions are equal, 1 if the second version is greater.
 *    :rtype: int
 */
 int
@ -841,10 +768,10 @@ pkgconf_compare_version(const char *a, const char *b)
 	/* optimization: if version matches then it's the same version. */
 	if (a == NULL)
-		return -1;
+		return 1;
 	if (b == NULL)
-		return 1;
+		return -1;
 	if (!strcasecmp(a, b))
 		return 0;
@ -852,22 +779,22 @@ pkgconf_compare_version(const char *a, const char *b)
 	pkgconf_strlcpy(buf1, a, sizeof buf1);
 	pkgconf_strlcpy(buf2, b, sizeof buf2);
-	one = buf1;
+	one = str1 = buf1;
-	two = buf2;
+	two = str2 = buf2;
 	while (*one || *two)
 	{
-		while (*one && !isalnum((unsigned char)*one) && *one != '~')
+		while (*one && !isalnum((unsigned int)*one) && *one != '~')
 			one++;
-		while (*two && !isalnum((unsigned char)*two) && *two != '~')
+		while (*two && !isalnum((unsigned int)*two) && *two != '~')
 			two++;
 		if (*one == '~' || *two == '~')
 		{
 			if (*one != '~')
 				return 1;
 			if (*two != '~')
 				return -1;
 			if (*two != '~')
 				return 1;
 			one++;
 			two++;
@ -880,22 +807,22 @@ pkgconf_compare_version(const char *a, const char *b)
 		str1 = one;
 		str2 = two;
-		if (isdigit((unsigned char)*str1))
+		if (isdigit((unsigned int)*str1))
 		{
-			while (*str1 && isdigit((unsigned char)*str1))
+			while (*str1 && isdigit((unsigned int)*str1))
 				str1++;
-			while (*str2 && isdigit((unsigned char)*str2))
+			while (*str2 && isdigit((unsigned int)*str2))
 				str2++;
 			isnum = true;
 		}
 		else
 		{
-			while (*str1 && isalpha((unsigned char)*str1))
+			while (*str1 && isalpha((unsigned int)*str1))
 				str1++;
-			while (*str2 && isalpha((unsigned char)*str2))
+			while (*str2 && isalpha((unsigned int)*str2))
 				str2++;
 			isnum = false;
@ -933,8 +860,8 @@ pkgconf_compare_version(const char *a, const char *b)
 		}
 		ret = strcmp(one, two);
-		if (ret != 0)
+		if (ret)
-			return ret < 0 ? -1 : 1;
+			return ret;
 		*str1 = oldch1;
 		*str2 = oldch2;
@ -988,7 +915,6 @@ static pkgconf_pkg_t pkgconf_virtual = {
 	.description = "virtual package defining pkgconf API version supported",
 	.url = PACKAGE_BUGREPORT,
 	.version = PACKAGE_VERSION,
 	.license = "ISC",
 	.flags = PKGCONF_PKG_PROPF_STATIC,
 	.vars = {
 		.head = &(pkgconf_node_t){
@ -1470,9 +1396,9 @@ pkgconf_pkg_walk_list(pkgconf_client_t *client,
 	unsigned int skip_flags)
 {
 	unsigned int eflags = PKGCONF_PKG_ERRF_OK;
-	pkgconf_node_t *node, *next;
+	pkgconf_node_t *node;
-	PKGCONF_FOREACH_LIST_ENTRY_SAFE(deplist->head, next, node)
+	PKGCONF_FOREACH_LIST_ENTRY(deplist->head, node)
 	{
 		unsigned int eflags_local = PKGCONF_PKG_ERRF_OK;
 		pkgconf_dependency_t *depnode = node->data;
@ -1492,41 +1418,23 @@ pkgconf_pkg_walk_list(pkgconf_client_t *client,
 		if (pkgdep == NULL)
 			continue;
-		if (pkgdep->serial == client->serial && !(parent->flags & PKGCONF_PKG_PROPF_VIRTUAL))
+		if (pkgdep->flags & PKGCONF_PKG_PROPF_SEEN)
 		{
-			pkgdep->hits++;
+			pkgconf_pkg_unref(client, pkgdep);
-
+			continue;
 			/* In this case we have a circular reference.
 			 * We break that by deleteing the circular node from the
 			 * the list, so that we dont create a situation where
 			 * memory is leaked due to circular ownership.
 			 * i.e: A owns B owns A
 			 *
 			 * TODO(ariadne): Breaking circular references between Requires and Requires.private
 			 * lists causes problems.  Find a way to refactor the Requires.private list out.
 			 */
 			if (!(depnode->flags & PKGCONF_PKG_DEPF_PRIVATE) &&
 			    !(parent->flags & PKGCONF_PKG_PROPF_VIRTUAL))
 			{
 				pkgconf_warn(client, "%s: breaking circular reference (%s -> %s -> %s)\n",
 					     parent->id, parent->id, pkgdep->id, parent->id);
 				pkgconf_node_delete(node, deplist);
 				pkgconf_dependency_unref(client, depnode);
 			}
 			goto next;
 		}
 		if (skip_flags && (depnode->flags & skip_flags) == skip_flags)
-			goto next;
+		{
 			pkgconf_pkg_unref(client, pkgdep);
 			continue;
 		}
 		pkgconf_audit_log_dependency(client, pkgdep, depnode);
-		pkgdep->hits++;
+		pkgdep->flags |= PKGCONF_PKG_PROPF_SEEN;
-		pkgdep->serial = client->serial;
+		eflags |= pkgconf_pkg_traverse(client, pkgdep, func, data, depth - 1, skip_flags);
-		eflags |= pkgconf_pkg_traverse_main(client, pkgdep, func, data, depth - 1, skip_flags);
+		pkgdep->flags &= ~PKGCONF_PKG_PROPF_SEEN;
 next:
 		pkgconf_pkg_unref(client, pkgdep);
 	}
@ -1596,8 +1504,8 @@ pkgconf_pkg_walk_conflicts_list(pkgconf_client_t *client,
 *    :return: ``PKGCONF_PKG_ERRF_OK`` on success, else an error code.
 *    :rtype: unsigned int
 */
-static unsigned int
+unsigned int
-pkgconf_pkg_traverse_main(pkgconf_client_t *client,
+pkgconf_pkg_traverse(pkgconf_client_t *client,
 	pkgconf_pkg_t *root,
 	pkgconf_pkg_traverse_func_t func,
 	void *data,
@ -1609,7 +1517,7 @@ pkgconf_pkg_traverse_main(pkgconf_client_t *client,
 	if (maxdepth == 0)
 		return eflags;
-	PKGCONF_TRACE(client, "%s: level %d, serial %lu", root->id, maxdepth, client->serial);
+	PKGCONF_TRACE(client, "%s: level %d", root->id, maxdepth);
 	if ((root->flags & PKGCONF_PKG_PROPF_VIRTUAL) != PKGCONF_PKG_PROPF_VIRTUAL || (client->flags & PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) != PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL)
 	{
@ -1645,20 +1553,6 @@ pkgconf_pkg_traverse_main(pkgconf_client_t *client,
 	return eflags;
 }
 unsigned int
 pkgconf_pkg_traverse(pkgconf_client_t *client,
 	pkgconf_pkg_t *root,
 	pkgconf_pkg_traverse_func_t func,
 	void *data,
 	int maxdepth,
 	unsigned int skip_flags)
 {
 	if (root->flags & PKGCONF_PKG_PROPF_VIRTUAL)
 		client->serial++;
 	return pkgconf_pkg_traverse_main(client, root, func, data, maxdepth, skip_flags);
 }
 static void
 pkgconf_pkg_cflags_collect(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data)
 {
--- a/libpkgconf/queue.c
+++ b/libpkgconf/queue.c
@ -51,7 +51,7 @@ pkgconf_queue_push(pkgconf_list_t *list, const char *package)
 	pkgconf_queue_t *pkgq = calloc(sizeof(pkgconf_queue_t), 1);
 	pkgq->package = strdup(package);
-	pkgconf_node_insert(&pkgq->iter, pkgq, list);
+	pkgconf_node_insert_tail(&pkgq->iter, pkgq, list);
 }
 /*
@ -107,199 +107,13 @@ pkgconf_queue_free(pkgconf_list_t *list)
 	}
 }
 static void
 pkgconf_queue_collect_dependents(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data)
 {
 	pkgconf_node_t *node;
 	pkgconf_pkg_t *world = data;
 	if (pkg == world)
 		return;
 	PKGCONF_FOREACH_LIST_ENTRY(pkg->required.head, node)
 	{
 		pkgconf_dependency_t *flattened_dep;
 		flattened_dep = pkgconf_dependency_copy(client, node->data);
 		pkgconf_node_insert(&flattened_dep->iter, flattened_dep, &world->required);
 	}
 	if (client->flags & PKGCONF_PKG_PKGF_SEARCH_PRIVATE)
 	{
 		PKGCONF_FOREACH_LIST_ENTRY(pkg->requires_private.head, node)
 		{
 			pkgconf_dependency_t *flattened_dep;
 			flattened_dep = pkgconf_dependency_copy(client, node->data);
 			pkgconf_node_insert(&flattened_dep->iter, flattened_dep, &world->requires_private);
 		}
 	}
 }
 static int
 dep_sort_cmp(const void *a, const void *b)
 {
 	const pkgconf_dependency_t *depA = *(void **) a;
 	const pkgconf_dependency_t *depB = *(void **) b;
 	return depB->match->hits - depA->match->hits;
 }
 static inline void
 flatten_dependency_set(pkgconf_client_t *client, pkgconf_list_t *list)
 {
 	pkgconf_node_t *node, *next;
 	pkgconf_dependency_t **deps = NULL;
 	size_t dep_count = 0, i;
 	PKGCONF_FOREACH_LIST_ENTRY_SAFE(list->head, next, node)
 	{
 		pkgconf_dependency_t *dep = node->data;
 		pkgconf_pkg_t *pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
 		if (pkg == NULL)
 			continue;
 		if (pkg->serial == client->serial)
 		{
 			pkgconf_node_delete(node, list);
 			pkgconf_dependency_unref(client, dep);
 			goto next;
 		}
 		if (dep->match == NULL)
 		{
 			PKGCONF_TRACE(client, "WTF: unmatched dependency %p <%s>", dep, dep->package);
 			abort();
 		}
 		/* for virtuals, we need to check to see if there are dupes */
 		for (i = 0; i < dep_count; i++)
 		{
 			pkgconf_dependency_t *other_dep = deps[i];
 			PKGCONF_TRACE(client, "dedup %s = %s?", dep->package, other_dep->package);
 			if (!strcmp(dep->package, other_dep->package))
 			{
 				PKGCONF_TRACE(client, "skipping, "SIZE_FMT_SPECIFIER" deps", dep_count);
 				goto next;
 			}
 		}
 		pkg->serial = client->serial;
 		/* copy to the deps table */
 		dep_count++;
 		deps = pkgconf_reallocarray(deps, dep_count, sizeof (void *));
 		deps[dep_count - 1] = dep;
 		PKGCONF_TRACE(client, "added %s to dep table", dep->package);
 next:
 		pkgconf_pkg_unref(client, pkg);
 	}
 	if (deps == NULL)
 		return;
 	qsort(deps, dep_count, sizeof (void *), dep_sort_cmp);
 	/* zero the list and start readding */
 	pkgconf_list_zero(list);
 	for (i = 0; i < dep_count; i++)
 	{
 		pkgconf_dependency_t *dep = deps[i];
 		if (dep->match == NULL)
 			continue;
 		memset(&dep->iter, '\0', sizeof (dep->iter));
 		pkgconf_node_insert(&dep->iter, dep, list);
 		PKGCONF_TRACE(client, "slot "SIZE_FMT_SPECIFIER": dep %s matched to %p<%s> hits "SIZE_FMT_SPECIFIER, i, dep->package, dep->match, dep->match->id, dep->match->hits);
 	}
 	free(deps);
 }
 static inline unsigned int
 pkgconf_queue_verify(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_list_t *list, int maxdepth)
 {
 	unsigned int result;
 	if (!pkgconf_queue_compile(client, world, list))
 		return PKGCONF_PKG_ERRF_DEPGRAPH_BREAK;
-	/* collect all the dependencies */
+	return pkgconf_pkg_verify_graph(client, world, maxdepth);
 	result = pkgconf_pkg_traverse(client, world, pkgconf_queue_collect_dependents, world, maxdepth, 0);
 	if (result != PKGCONF_PKG_ERRF_OK)
 		return result;
 	/* flatten the dependency set using serials.
 	 * we copy the dependencies to a vector, and then erase the list.
 	 * then we copy them back to the list.
 	 */
 	++client->serial;
 	PKGCONF_TRACE(client, "flattening requires deps");
 	flatten_dependency_set(client, &world->required);
 	++client->serial;
 	PKGCONF_TRACE(client, "flattening requires.private deps");
 	flatten_dependency_set(client, &world->requires_private);
 	return PKGCONF_PKG_ERRF_OK;
 }
 /*
 * !doc
 *
 * .. c:function:: void pkgconf_solution_free(pkgconf_client_t *client, pkgconf_pkg_t *world, int maxdepth)
 *
 *    Removes references to package nodes contained in a solution.
 *
 *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
 *    :param pkgconf_pkg_t* world: The root for the generated dependency graph.  Should have PKGCONF_PKG_PROPF_VIRTUAL flag.
 *    :returns: nothing
 */
 void
 pkgconf_solution_free(pkgconf_client_t *client, pkgconf_pkg_t *world)
 {
 	(void) client;
 	if (world->flags & PKGCONF_PKG_PROPF_VIRTUAL)
 	{
 		pkgconf_dependency_free(&world->required);
 		pkgconf_dependency_free(&world->requires_private);
 	}
 }
 /*
 * !doc
 *
 * .. c:function:: bool pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_t *world, int maxdepth)
 *
 *    Solves and flattens the dependency graph for the supplied dependency list.
 *
 *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
 *    :param pkgconf_list_t* list: The list of dependency requests to consider.
 *    :param pkgconf_pkg_t* world: The root for the generated dependency graph, provided by the caller.  Should have PKGCONF_PKG_PROPF_VIRTUAL flag.
 *    :param int maxdepth: The maximum allowed depth for the dependency resolver.  A depth of -1 means unlimited.
 *    :returns: true if the dependency resolver found a solution, otherwise false.
 *    :rtype: bool
 */
 bool
 pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_t *world, int maxdepth)
 {
 	/* if maxdepth is one, then we will not traverse deeper than our virtual package. */
 	if (!maxdepth)
 		maxdepth = -1;
 	return pkgconf_queue_verify(client, world, list, maxdepth) == PKGCONF_PKG_ERRF_OK;
 }
 /*
@ -310,8 +124,6 @@ pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_
 *    Attempt to compile a dependency resolution queue into a dependency resolution problem, then attempt to solve the problem and
 *    feed the solution to a callback function if a complete dependency graph is found.
 *
 *    This function should not be used in new code.  Use pkgconf_queue_solve instead.
 *
 *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
 *    :param pkgconf_list_t* list: The list of dependency requests to consider.
 *    :param pkgconf_queue_apply_func_t func: The callback function to call if a solution is found by the dependency resolver.
@ -323,7 +135,6 @@ pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_
 bool
 pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data)
 {
 	bool ret = false;
 	pkgconf_pkg_t world = {
 		.id = "virtual:world",
 		.realname = "virtual world package",
@ -334,18 +145,18 @@ pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queu
 	if (!maxdepth)
 		maxdepth = -1;
-	if (!pkgconf_queue_solve(client, list, &world, maxdepth))
+	if (pkgconf_queue_verify(client, &world, list, maxdepth) != PKGCONF_PKG_ERRF_OK)
-		goto cleanup;
+		return false;
 	/* the world dependency set is flattened after it is returned from pkgconf_queue_verify */
 	if (!func(client, &world, data, maxdepth))
-		goto cleanup;
+	{
 	ret = true;
 cleanup:
 		pkgconf_pkg_free(client, &world);
-	return ret;
+		return false;
 	}
 	pkgconf_pkg_free(client, &world);
 	return true;
 }
 /*
--- a/libpkgconf/stdinc.h
+++ b/libpkgconf/stdinc.h
@ -59,7 +59,6 @@
 # include <dirent.h>
 # include <unistd.h>
 # include <limits.h>
 # include <strings.h>
 # ifdef PATH_MAX
 #  define PKGCONF_ITEM_SIZE (PATH_MAX + 1024)
 # else
--- a/libpkgconf/tuple.c
+++ b/libpkgconf/tuple.c
@ -45,23 +45,7 @@
 void
 pkgconf_tuple_add_global(pkgconf_client_t *client, const char *key, const char *value)
 {
-	pkgconf_tuple_add(client, &client->global_vars, key, value, false, 0);
+	pkgconf_tuple_add(client, &client->global_vars, key, value, false);
 }
 static pkgconf_tuple_t *
 lookup_global_tuple(const pkgconf_client_t *client, const char *key)
 {
 	pkgconf_node_t *node;
 	PKGCONF_FOREACH_LIST_ENTRY(client->global_vars.head, node)
 	{
 		pkgconf_tuple_t *tuple = node->data;
 		if (!strcmp(tuple->key, key))
 			return tuple;
 	}
 	return NULL;
 }
 /*
@ -79,15 +63,19 @@ lookup_global_tuple(const pkgconf_client_t *client, const char *key)
 char *
 pkgconf_tuple_find_global(const pkgconf_client_t *client, const char *key)
 {
-	pkgconf_tuple_t *tuple;
+	pkgconf_node_t *node;
-	tuple = lookup_global_tuple(client, key);
+	PKGCONF_FOREACH_LIST_ENTRY(client->global_vars.head, node)
-	if (tuple == NULL)
+	{
-		return NULL;
+		pkgconf_tuple_t *tuple = node->data;
 		if (!strcmp(tuple->key, key))
 			return tuple->value;
 	}
 	return NULL;
 }
 /*
 * !doc
 *
@ -120,18 +108,13 @@ pkgconf_tuple_define_global(pkgconf_client_t *client, const char *kv)
 {
 	char *workbuf = strdup(kv);
 	char *value;
 	pkgconf_tuple_t *tuple;
 	value = strchr(workbuf, '=');
 	if (value == NULL)
 		goto out;
 	*value++ = '\0';
-
+	pkgconf_tuple_add_global(client, workbuf, value);
 	tuple = pkgconf_tuple_add(client, &client->global_vars, workbuf, value, false, 0);
 	if (tuple != NULL)
 		tuple->flags = PKGCONF_PKG_TUPLEF_OVERRIDE;
 out:
 	free(workbuf);
 }
@ -178,45 +161,6 @@ dequote(const char *value)
 	return buf;
 }
 static const char *
 find_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars)
 {
 	const char *sysroot_dir;
 	sysroot_dir = pkgconf_tuple_find(client, vars, "pc_sysrootdir");
 	if (sysroot_dir == NULL)
 		sysroot_dir = client->sysroot_dir;
 	return sysroot_dir;
 }
 static bool
 should_rewrite_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *buf, unsigned int flags)
 {
 	const char *sysroot_dir;
 	if (flags & PKGCONF_PKG_PROPF_UNINSTALLED && !(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES))
 		return false;
 	sysroot_dir = find_sysroot(client, vars);
 	if (sysroot_dir == NULL)
 		return false;
 	if (*buf != '/')
 		return false;
 	if (!strcmp(sysroot_dir, "/"))
 		return false;
 	if (strlen(buf) <= strlen(sysroot_dir))
 		return false;
 	if (strstr(buf + strlen(sysroot_dir), sysroot_dir) == NULL)
 		return false;
 	return true;
 }
 /*
 * !doc
 *
@ -233,7 +177,7 @@ should_rewrite_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, con
 *    :rtype: pkgconf_tuple_t *
 */
 pkgconf_tuple_t *
-pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key, const char *value, bool parse, unsigned int flags)
+pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key, const char *value, bool parse)
 {
 	char *dequote_value;
 	pkgconf_tuple_t *tuple = calloc(sizeof(pkgconf_tuple_t), 1);
@ -242,14 +186,14 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch
 	dequote_value = dequote(value);
 	PKGCONF_TRACE(client, "adding tuple to @%p: %s => %s (parsed? %d)", list, key, dequote_value, parse);
 	tuple->key = strdup(key);
 	if (parse)
-		tuple->value = pkgconf_tuple_parse(client, list, dequote_value, flags);
+		tuple->value = pkgconf_tuple_parse(client, list, dequote_value);
 	else
 		tuple->value = strdup(dequote_value);
 	PKGCONF_TRACE(client, "adding tuple to @%p: %s => %s (parsed? %d)", list, key, tuple->value, parse);
 	pkgconf_node_insert(&tuple->iter, tuple, list);
 	free(dequote_value);
@ -274,11 +218,10 @@ char *
 pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key)
 {
 	pkgconf_node_t *node;
-	pkgconf_tuple_t *global_tuple;
+	char *res;
-	global_tuple = lookup_global_tuple(client, key);
+	if ((res = pkgconf_tuple_find_global(client, key)) != NULL)
-	if (global_tuple != NULL && global_tuple->flags & PKGCONF_PKG_TUPLEF_OVERRIDE)
+		return res;
 		return global_tuple->value;
 	PKGCONF_FOREACH_LIST_ENTRY(list->head, node)
 	{
@ -288,39 +231,31 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c
 			return tuple->value;
 	}
 	if (global_tuple != NULL)
 		return global_tuple->value;
 	return NULL;
 }
 /*
 * !doc
 *
- * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags)
+ * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
 *
 *    Parse an expression for variable substitution.
 *
 *    :param pkgconf_client_t* client: The pkgconf client object to access.
 *    :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list).
 *    :param char* value: The ``key=value`` string to parse.
 *    :param uint flags: Any flags to consider while parsing.
 *    :return: the variable data with any variables substituted
 *    :rtype: char *
 */
 char *
-pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags)
+pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
 {
 	char buf[PKGCONF_BUFSIZE];
 	const char *ptr;
 	char *bptr = buf;
 	if (!(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES) &&
 		(!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES)))
 	{
 	if (*value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir)))
 		bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf);
 	}
 	for (ptr = value; *ptr != '\0' && bptr - buf < PKGCONF_BUFSIZE; ptr++)
 	{
@ -329,7 +264,6 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 		else if (*(ptr + 1) == '{')
 		{
 			char varname[PKGCONF_ITEM_SIZE];
 			char *vend = varname + PKGCONF_ITEM_SIZE - 1;
 			char *vptr = varname;
 			const char *pptr;
 			char *kv, *parsekv;
@ -339,8 +273,6 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 			for (pptr = ptr + 2; *pptr != '\0'; pptr++)
 			{
 				if (*pptr != '}')
 				{
 					if (vptr < vend)
 					*vptr++ = *pptr;
 				else
 				{
@ -348,30 +280,13 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 					break;
 				}
 			}
 				else
 				{
 					*vptr = '\0';
 					break;
 				}
 			}
 			PKGCONF_TRACE(client, "lookup tuple %s", varname);
 			size_t remain = PKGCONF_BUFSIZE - (bptr - buf);
 			ptr += (pptr - ptr);
 			kv = pkgconf_tuple_find_global(client, varname);
 			if (kv != NULL)
 			{
-				size_t nlen = pkgconf_strlcpy(bptr, kv, remain);
+				strncpy(bptr, kv, PKGCONF_BUFSIZE - (bptr - buf));
-				if (nlen > remain)
+				bptr += strlen(kv);
 				{
 					pkgconf_warn(client, "warning: truncating very long variable to 64KB\n");
 					bptr = buf + (PKGCONF_BUFSIZE - 1);
 					break;
 				}
 				bptr += nlen;
 			}
 			else
 			{
@ -379,21 +294,12 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 				if (kv != NULL)
 				{
-					size_t nlen;
+					parsekv = pkgconf_tuple_parse(client, vars, kv);
 					strncpy(bptr, parsekv, PKGCONF_BUFSIZE - (bptr - buf));
 					bptr += strlen(parsekv);
 					parsekv = pkgconf_tuple_parse(client, vars, kv, flags);
 					nlen = pkgconf_strlcpy(bptr, parsekv, remain);
 					free(parsekv);
 					if (nlen > remain)
 					{
 						pkgconf_warn(client, "warning: truncating very long variable to 64KB\n");
 						bptr = buf + (PKGCONF_BUFSIZE - 1);
 						break;
 					}
 					bptr += nlen;
 				}
 			}
 		}
@ -415,15 +321,16 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 	 * safe to skip ahead in the string to scan for our sysroot dir.
 	 *
 	 * Finally, we call pkgconf_path_relocate() to clean the path of spurious elements.
 	 *
 	 * New in 1.9: Only attempt to rewrite the sysroot if we are not processing an uninstalled package.
 	 */
-	if (should_rewrite_sysroot(client, vars, buf, flags))
+	if (*buf == '/' &&
 	    client->sysroot_dir != NULL &&
 	    strcmp(client->sysroot_dir, "/") != 0 &&
 	    strlen(buf) > strlen(client->sysroot_dir) &&
 	    strstr(buf + strlen(client->sysroot_dir), client->sysroot_dir) != NULL)
 	{
 		char cleanpath[PKGCONF_ITEM_SIZE];
 		const char *sysroot_dir = find_sysroot(client, vars);
-		pkgconf_strlcpy(cleanpath, buf + strlen(sysroot_dir), sizeof cleanpath);
+		pkgconf_strlcpy(cleanpath, buf + strlen(client->sysroot_dir), sizeof cleanpath);
 		pkgconf_path_relocate(cleanpath, sizeof cleanpath);
 		return strdup(cleanpath);
@ -471,6 +378,4 @@ pkgconf_tuple_free(pkgconf_list_t *list)
 	PKGCONF_FOREACH_LIST_ENTRY_SAFE(list->head, next, node)
 		pkgconf_tuple_free_entry(node->data, list);
 	pkgconf_list_zero(list);
 }
--- a/libpkgconf/win-dirent.h
+++ b/libpkgconf/win-dirent.h
--- a/man/pc.5
+++ b/man/pc.5
@ -99,9 +99,6 @@ These flags are always used, regardless of whether static compilation is request
 .It Cflags.private
 Required compiler flags for static compilation.
 (optional; fragment list; pkgconf extension)
 .It Copyright
 A copyright attestation statement.
 (optional; literal; pkgconf extension)
 .It Libs
 Required linking flags for this package.
 Libraries this package depends on for linking against it, which are not
@ -113,13 +110,6 @@ statically.
 Libraries this package depends on for linking against it statically, which are
 not described as dependencies should be specified here.
 (optional; fragment list)
 .It License
 The asserted SPDX license tag that should be applied to the given package.
 (optional; literal; pkgconf extension)
 .It Maintainer
 The preferred contact for the maintainer.  This should be in the format of a
 name followed by an e-mail address or website.
 (optional; literal; pkgconf extension)
 .It Requires
 Required dependencies that must be met for the package to be usable.
 All dependencies must be satisfied or the pkg-config implementation must not use
@ -161,9 +151,6 @@ includedir=${prefix}/include
 Name: libfoo                                  # human-readable name
 Description: an example library called libfoo # human-readable description
 Copyright: Copyright (c) 2022 pkgconf project authors
 License: Apache-2.0
 Maintainer: the pkgconf project <http://www.pkgconf.org>
 Version: 1.0
 URL: http://www.pkgconf.org
 Requires: libbar > 2.0.0
--- a/man/pkgconf-personality.5
+++ b/man/pkgconf-personality.5
@ -36,7 +36,7 @@ Properties are set using RFC822-style stanzas which consist of a keyword, follow
 by a colon (:) and then the value the property should be set to.
 Variable substitution is always performed regardless of property type.
 .Pp
-There are three types of property:
+There are two types of property:
 .\"
 .Bl -tag -width indent
 .\"
@ -47,11 +47,6 @@ The property will be set to the text of the value.
 The property will be set to a list of fragments parsed from the text.
 The input text must be in a format that is suitable for passing to a POSIX
 shell without any shell expansions after variable substitution has been done.
 Elements are delimited with a colon.
 .\"
 .It Boolean
 The property will be set to true if the value is one of: true, yes or 1.
 Otherwise it will be set to false.
 .\"
 .El
 .Ss PROPERTY KEYWORDS
@ -76,12 +71,6 @@ include files.
 A list of directories that are included by default in the search path for
 libraries.
 (mandatory; fragment list)
 .It WantDefaultPure
 If true, pkgconf will default to preferring a pure dependency graph.
 (optional; boolean; default is false)
 .It WantDefaultStatic
 If true, pkgconf will default to operating in static linking mode.
 (optional; boolean; default is false)
 .\"
 .El
 .Sh EXAMPLES
@ -90,11 +79,12 @@ An example .personality file:
 # This is a comment
 Triplet: x86_64-pc-linux-gnu
 SysrootDir: /home/kaniini/sysroot/x86_64-pc-linux-gnu
-DefaultSearchPaths: /home/kaniini/sysroot/x86_64-pc-linux-gnu/lib/pkgconfig:/home/kaniini/sysroot/x86_64-pc-linux-gnu/share/pkgconfig
+DefaultSearchPaths: /home/kaniini/sysroot/x86_64-pc-linux-gnu/lib/pkgconfig \\
  /home/kaniini/sysroot/x86_64-pc-linux-gnu/share/pkgconfig
 SystemIncludePaths: /home/kaniini/sysroot/x86_64-pc-linux-gnu/include
 SystemLibraryPaths: /home/kaniini/sysroot/x86_64-pc-linux-gnu/lib
 .Ed
 .Sh SEE ALSO
 .Xr pkgconf 1 ,
-.Xr pc 5 ,
+.Xr pkg.m4 7 ,
-.Xr pkg.m4 7
+.Xr pc 5
--- a/man/pkgconf.1
+++ b/man/pkgconf.1
@ -51,10 +51,6 @@ Ignore
 rules in modules.
 .It Fl -env-only
 Learn about pkgconf's configuration strictly from environmental variables.
 .It Fl -validate Ar package ...
 Validate specific
 .Sq .pc
 files for correctness.
 .It Fl -maximum-traverse-depth Ns = Ns Ar DEPTH
 Impose a limit on the allowed depth in the dependency graph.
 For example, a depth of 2 will restrict the resolver from acting on child
@ -62,8 +58,6 @@ dependencies of modules added to the resolver's solution.
 .It Fl -static
 Compute a deeper dependency graph and use compiler/linker flags intended for
 static linking.
 .It Fl -shared
 Compute a simple dependency graph that is only suitable for shared linking.
 .It Fl -pure
 Treats the computed dependency graph as if it were pure.
 This is mainly intended for use with the
@ -110,7 +104,7 @@ the requested modules.
 .It Fl -uninstalled
 Exit with a non-zero result if the dependency resolver uses an
 .Sq uninstalled
-module as part of its solution.
+module as part of it's solution.
 .It Fl -no-uninstalled
 Forbids the dependency resolver from considering 'uninstalled' modules as part
 of a solution.
@ -215,12 +209,6 @@ If set, enables additional debug logging.
 The format of the debug log messages is implementation-specific.
 .It Va PKG_CONFIG_DONT_RELOCATE_PATHS
 If set, disables the path relocation feature.
 .It Va PKG_CONFIG_MSVC_SYNTAX
 If set, uses MSVC syntax for fragments.
 .It Va PKG_CONFIG_FDO_SYSROOT_RULES
 If set, follow the sysroot prefixing rules that freedesktop.org pkg-config uses.
 .It Va DESTDIR
 If set to PKG_CONFIG_SYSROOT_DIR, assume that PKG_CONFIG_FDO_SYSROOT_RULES is set.
 .El
 .Sh EXAMPLES
 Displaying the CFLAGS of a package:
--- a/meson.build
+++ b/meson.build
@ -1,41 +1,42 @@
 project('pkgconf', 'c',
-  version : '1.9.5',
+  version : '1.9.90',
  license : 'ISC',
-  meson_version : '>=0.49',
+  meson_version : '>=0.47')
-  default_options : ['c_std=c99'],
+
 )
 cc = meson.get_compiler('c')
 add_project_arguments(
  '-D_BSD_SOURCE',
  '-D_DEFAULT_SOURCE',
  cc.get_supported_arguments(
    '-Wimplicit-function-declaration',
    '-Wmisleading-indentation',
  ),
  language : 'c',
 )
 cdata = configuration_data()
 check_headers = [
  ['HAVE_DLFCN_H', 'dlfcn.h'],
  ['HAVE_INTTYPES_H', 'inttypes.h'],
  ['HAVE_MEMORY_H', 'memory.h'],
  ['HAVE_STDINT_H', 'stdint.h'],
  ['HAVE_STDLIB_H', 'stdlib.h'],
  ['HAVE_STRINGS_H', 'strings.h'],
  ['HAVE_STRING_H', 'string.h'],
  ['HAVE_SYS_STAT_H', 'sys/stat.h'],
  ['HAVE_SYS_TYPES_H', 'sys/types.h'],
  ['HAVE_UNISTD_H', 'unistd.h'],
 ]
 foreach h : check_headers
  if cc.has_header(h.get(1))
    cdata.set(h.get(0), 1)
  endif
 endforeach
 check_functions = [
-  ['strlcat', 'string.h'],
+  ['HAVE_CYGWIN_CONV_PATH', 'cygwin_conv_path', '#include<sys/cygwin.h>'],
-  ['strlcpy', 'string.h'],
+  ['HAVE_STRLCAT', 'strlcat', '#include<string.h>'],
-  ['strndup', 'string.h'],
+  ['HAVE_STRLCPY', 'strlcpy', '#include<string.h>'],
-  ['strdup', 'string.h'],
+  ['HAVE_STRNDUP', 'strndup', '#include<string.h>'],
  ['strncasecmp', 'strings.h'],
  ['strcasecmp', 'strings.h'],
  ['reallocarray', 'stdlib.h'],
 ]
 foreach f : check_functions
-  name = f[0].to_upper().underscorify()
+  if cc.has_function(f.get(1), prefix : f.get(2))
-  if cc.has_function(f[0], prefix : '#define _BSD_SOURCE\n#include <@0@>'.format(f[1])) and cc.has_header_symbol(f[1], f[0], prefix : '#define _BSD_SOURCE')
+    cdata.set(f.get(0), 1)
    cdata.set('HAVE_@0@'.format(name), 1)
    cdata.set('HAVE_DECL_@0@'.format(name), 1)
  else
    cdata.set('HAVE_DECL_@0@'.format(name), 0)
  endif
 endforeach
@ -56,20 +57,13 @@ cdata.set_quoted('PERSONALITY_PATH', ':'.join(personality_path))
 cdata.set_quoted('PACKAGE_NAME', meson.project_name())
 cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
 cdata.set_quoted('PACKAGE_BUGREPORT', 'https://todo.sr.ht/~kaniini/pkgconf')
-cdata.set('abs_top_srcdir', meson.current_source_dir())
+cdata.set('abs_top_srcdir', meson.source_root())
-cdata.set('abs_top_builddir', meson.current_build_dir())
+cdata.set('abs_top_builddir', meson.build_root())
 subdir('libpkgconf')
-libtype = get_option('default_library')
+libpkgconf = shared_library('pkgconf',
 if libtype == 'static'
  build_static = '-DPKGCONFIG_IS_STATIC'
 else
  build_static = '-DPKGCONFIG_IS_NOT_STATIC'
 endif
 libpkgconf = library('pkgconf',
  'libpkgconf/argvsplit.c',
  'libpkgconf/audit.c',
  'libpkgconf/bsdstubs.c',
@ -84,32 +78,10 @@ libpkgconf = library('pkgconf',
  'libpkgconf/pkg.c',
  'libpkgconf/queue.c',
  'libpkgconf/tuple.c',
-  c_args: ['-DLIBPKGCONF_EXPORT', build_static],
+  c_args: '-DLIBPKGCONF_EXPORT',
  install : true,
-  version : '4.0.0',
+  version : '3.0.0',
-  soversion : '4',
+  soversion : '3',
 )
 # For other projects using libpkgconfig as a subproject
 dep_libpkgconf = declare_dependency(
  link_with : libpkgconf,
  include_directories : include_directories('.'),
 )
 # If we have a new enough meson override the dependency so that only
 # `dependency('libpkgconf')` is required from the consumer
 if meson.version().version_compare('>= 0.54.0')
  meson.override_dependency('libpkgconf', dep_libpkgconf)
 endif
 pkg = import('pkgconfig')
 pkg.generate(libpkgconf,
  name : 'libpkgconf',
  description : 'a library for accessing and manipulating development framework configuration',
  url: 'http://github.com/pkgconf/pkgconf',
  filebase : 'libpkgconf',
  subdirs: ['pkgconf'],
  extra_cflags : build_static
 )
@ -118,20 +90,20 @@ pkgconf_exe = executable('pkgconf',
  'cli/getopt_long.c',
  'cli/renderer-msvc.c',
  link_with : libpkgconf,
  c_args: build_static,
  install : true)
-with_tests = get_option('tests')
+if get_option('tests')
-kyua_exe = find_program('kyua', required : with_tests, disabler : true)
+  kyua_exe = find_program('kyua')
-atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true)
+  atf_sh_exe = find_program('atf-sh')
-kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
+  test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile=' + join_paths(meson.build_root(), 'Kyuafile'), '--build-root=' + meson.build_root()])
-test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()])
+
  configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
  subdir('tests')
 endif
 install_man('man/pkgconf.1')
 install_man('man/pkg.m4.7')
 install_man('man/pc.5')
 install_man('man/pkgconf-personality.5')
 install_data('pkg.m4', install_dir: 'share/aclocal')
 install_data('AUTHORS', install_dir: 'share/doc/pkgconf')
 install_data('README.md', install_dir: 'share/doc/pkgconf')
--- a/meson_options.txt
+++ b/meson_options.txt
@ -1,5 +1,3 @@
-option(
+option('tests', type: 'boolean', value: true,
-  'tests',
+  description: 'Build tests which depends upon the kyua framework'
  type: 'feature',
  description: 'Build tests which depends upon the kyua framework',
 )
--- a/pkg.m4
+++ b/pkg.m4
@ -1,5 +1,5 @@
-# pkg.m4 - Macros to locate and use pkg-config.   -*- Autoconf -*-
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
+# serial 11 (pkg-config-0.29.1)
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@ -41,7 +41,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@ -86,7 +86,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
 dnl
 dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurrence in configure.ac, so if the first place
+dnl only at the first occurence in configure.ac, so if the first place
 dnl it's called might be skipped (such as if it is within an "if", you
 dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
@ -142,7 +142,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 pkg_failed=no
-AC_MSG_CHECKING([for $2])
+AC_MSG_CHECKING([for $1])
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
--- a/tests/basic.sh
+++ b/tests/basic.sh
@ -29,9 +29,6 @@ tests_init \
 	libs_circular_directpc \
 	libs_static \
 	libs_static_ordering \
 	license_isc \
 	license_noassertion \
 	modversion_noflatten \
 	pkg_config_path \
 	nolibs \
 	nocflags \
@ -75,7 +72,7 @@ libs_cflags_version_multiple_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo\n" \
+		-o inline:"-I/test/include/foo -fPIC -L/test/lib -lbar -lfoo \n" \
 		pkgconf --cflags --libs 'foo > 1.2 bar >= 1.3'
 }
@ -83,7 +80,7 @@ libs_cflags_version_multiple_coma_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo\n" \
+		-o inline:"-I/test/include/foo -fPIC -L/test/lib -lbar -lfoo \n" \
 		pkgconf --cflags --libs 'foo > 1.2,bar >= 1.3'
 }
@ -179,7 +176,7 @@ exists_version_bad3_body()
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
 		-s exit:1 \
-		pkgconf --exists 'tilde >= 1.0.0'
+		pkgconf --exists 'tilde <= 1.0.0'
 }
 exists_body()
@ -193,7 +190,7 @@ exists2_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		pkgconf --exists 'tilde <= 1.0.0'
+		pkgconf --exists 'tilde >= 1.0.0'
 }
 exists3_body()
@ -211,26 +208,26 @@ libs_intermediary_body()
 		pkgconf --libs intermediary-1 intermediary-2
 }
 libs_circular2_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
 		-o inline:"circular-1: breaking circular reference (circular-1 -> circular-2 -> circular-1)\n" \
 		pkgconf circular-2 --validate
 }
 libs_circular1_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"circular-3: breaking circular reference (circular-3 -> circular-1 -> circular-3)\n" \
+		-o inline:"-lcircular-1 -lcircular-2 -lcircular-3 \n" \
-		pkgconf circular-1 --validate
+		pkgconf --libs circular-1
 }
 libs_circular2_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
 		-o inline:"-lcircular-3 -lcircular-1 -lcircular-2 \n" \
 		pkgconf --libs circular-3
 }
 libs_circular_directpc_body()
 {
 	atf_check \
-		-o inline:"-lcircular-2 -lcircular-3 -lcircular-1\n" \
+		-o inline:"-lcircular-1 -lcircular-2 -lcircular-3 \n" \
 		pkgconf --libs ${selfdir}/lib1/circular-3.pc
 }
@ -310,24 +307,3 @@ single_depth_selectors_body()
 		-o inline:"foo\n" \
 		pkgconf --with-path=${selfdir}/lib3 --print-requires bar
 }
 license_isc_body()
 {
 	atf_check \
 		-o inline:"foo: ISC\n" \
 		pkgconf --with-path=${selfdir}/lib1 --license foo
 }
 license_noassertion_body()
 {
 	atf_check \
 		-o inline:"bar: NOASSERTION\nfoo: ISC\n" \
 		pkgconf --with-path=${selfdir}/lib1 --license bar
 }
 modversion_noflatten_body()
 {
 	atf_check \
 		-o inline:"1.3\n" \
 		pkgconf --with-path=${selfdir}/lib1 --modversion bar
 }
--- a/tests/lib1/billion-laughs.pc
+++ b/tests/lib1/billion-laughs.pc
@ -1,13 +0,0 @@
 v9=lol
 v8=${v9}${v9}${v9}${v9}${v9}${v9}${v9}${v9}${v9}${v9}
 v7=${v8}${v8}${v8}${v8}${v8}${v8}${v8}${v8}${v8}${v8}
 v6=${v7}${v7}${v7}${v7}${v7}${v7}${v7}${v7}${v7}${v7}
 v5=${v6}${v6}${v6}${v6}${v6}${v6}${v6}${v6}${v6}${v6}
 v4=${v5}${v5}${v5}${v5}${v5}${v5}${v5}${v5}${v5}${v5}
 v3=${v4}${v4}${v4}${v4}${v4}${v4}${v4}${v4}${v4}${v4}
 v2=${v3}${v3}${v3}${v3}${v3}${v3}${v3}${v3}${v3}${v3}
 v1=${v2}${v2}${v2}${v2}${v2}${v2}${v2}${v2}${v2}${v2}
 v0=${v1}${v1}${v1}${v1}${v1}${v1}${v1}${v1}${v1}${v1}
 Name: One Billion Laughs
 Version: ${v0}
 Description: Don't install this!
--- a/tests/lib1/foo.pc
+++ b/tests/lib1/foo.pc
@ -9,4 +9,3 @@ Version: 1.2.3
 Libs: -L${libdir} -lfoo
 Cflags: -fPIC -I${includedir}/foo
 Cflags.private: -DFOO_STATIC
 License: ISC
--- a/tests/lib1/fragment-comment.pc
+++ b/tests/lib1/fragment-comment.pc
@ -1,4 +0,0 @@
 Name: fragment-comment
 Description: Test case for issue #215
 Version: 1.0
 Cflags: kuku=\#ttt
--- a/tests/lib1/metapackage-1.pc
+++ b/tests/lib1/metapackage-1.pc
@ -1,6 +0,0 @@
 Name: metapackage-1
 Version: 0.1
 Description: metapackage for testing purposes
 Requires.private: metapackage-2
 Libs: -lmetapackage-1
 Cflags: -I/metapackage-1
--- a/tests/lib1/metapackage-2.pc
+++ b/tests/lib1/metapackage-2.pc
@ -1,5 +0,0 @@
 Name: metapackage-2
 Version: 0.1
 Description: metapackage for testing purposes
 Libs: -lmetapackage-2
 Cflags: -I/metapackage-2
--- a/tests/lib1/metapackage.pc
+++ b/tests/lib1/metapackage.pc
@ -1,4 +0,0 @@
 Name: metapackage
 Version: 0.1
 Description: metapackage for testing purposes
 Requires: metapackage-1, metapackage-2
--- a/tests/lib1/omg-sysroot-uninstalled.pc
+++ b/tests/lib1/omg-sysroot-uninstalled.pc
@ -1,10 +0,0 @@
 prefix=${pc_sysrootdir}/test
 exec_prefix=${prefix}
 libdir=${prefix}/lib
 includedir=${prefix}/include
 Name: omg-sysroot
 Description: A testing pkg-config file
 Version: 1.2.3
 Libs: -L${libdir} -lomg
 Cflags: -fPIC -I${includedir}/omg
--- a/tests/lib1/quotes.pc
+++ b/tests/lib1/quotes.pc
@ -7,4 +7,4 @@ Name: quotes
 Description: A testing pkg-config file
 Version: 1.2.3
 Libs: -L${libdir} -lfoo
-Cflags: -DQUOTED=\"bla\" -DA=\"escaped\ string\'\ \literal\" -DB="\1\$" -DC='bla'
+Cflags: -DQUOTED=\"bla\"
--- a/tests/lib1/spaces-in-paths.pc
+++ b/tests/lib1/spaces-in-paths.pc
@ -1,7 +0,0 @@
 prefix=/test\ with\ spaces
 includedir=${prefix}/include
 Name: spaces-in-paths
 Version: 1
 Description: test package for properly expanding spaces in variables
 Cflags: -I${includedir} -I${includedir}/subdir
--- a/tests/lib1/sysroot-dir-2.pc
+++ b/tests/lib1/sysroot-dir-2.pc
@ -1,7 +0,0 @@
 prefix=${pc_sysrootdir}/usr
 Name: sysroot-dir
 Description: Package for testing whether sysroot dirs are repeated or not
 Version: 1
 CFlags: -I${prefix}/include
 Libs: -L${prefix}/lib -lfoo
--- a/tests/lib1/sysroot-dir-3.pc
+++ b/tests/lib1/sysroot-dir-3.pc
@ -1,9 +0,0 @@
 prefix=/sysroot/usr
 includedir=${prefix}/include
 libdir=${prefix}/lib
 Name: sysroot-dir
 Description: Package for testing whether sysroot dirs are repeated or not
 Version: 1
 CFlags: -I${includedir}
 Libs: -L${libdir} -lfoo
--- a/tests/lib1/sysroot-dir-4.pc
+++ b/tests/lib1/sysroot-dir-4.pc
@ -1,9 +0,0 @@
 prefix=${pc_sysrootdir}/usr
 includedir=${prefix}/include
 libdir=${prefix}/lib
 Name: sysroot-dir
 Description: Package for testing whether sysroot dirs are repeated or not
 Version: 1
 CFlags: -I${includedir}
 Libs: -L${libdir} -lfoo
--- a/tests/lib1/sysroot-dir-5.pc
+++ b/tests/lib1/sysroot-dir-5.pc
@ -1,9 +0,0 @@
 prefix=/sysroot/usr
 includedir=${prefix}/include
 libdir=${prefix}/lib
 Name: sysroot-dir
 Description: Package for testing whether sysroot dirs are repeated or not
 Version: 1
 CFlags: -I${includedir}
 Libs: -L${libdir} -lfoo
--- a/tests/lib1/utf8.pc
+++ b/tests/lib1/utf8.pc
@ -1,10 +0,0 @@
 prefix=/tëst
 exec_prefix=${prefix}
 libdir=${prefix}/lib
 includedir=${prefix}/include
 Name: utf8
 Description: Library installed in a prefix with UTF-8
 Version: 0
 Libs: -L${libdir} -lutf8
 Cflags: -I${includedir}
--- a/tests/meson.build
+++ b/tests/meson.build
@ -18,5 +18,6 @@ tests = [
 # yuck
 foreach test : tests
-  test_file = configure_file(input: test + '.sh', output: test, copy: true)
+  configure_file(input: test + '.sh', output: test, copy: true)
  run_command('chmod', '755', join_paths(meson.build_root(), 'tests', test))
 endforeach
--- a/tests/parser.sh
+++ b/tests/parser.sh
@ -29,7 +29,6 @@ tests_init \
 	fragment_quoting_3 \
 	fragment_quoting_5 \
 	fragment_quoting_7 \
 	fragment_comment \
 	msvc_fragment_quoting \
 	msvc_fragment_render_cflags \
 	tuple_dequote \
@ -142,7 +141,7 @@ quoted_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-DQUOTED=\\\"bla\\\" -DA=\\\"escaped\\ string\\\'\\ literal\\\" -DB=\\\\\\1\$ -DC=bla\n" \
+		-o inline:"-DQUOTED=\\\"bla\\\" \n" \
 		pkgconf --cflags quotes
 }
@ -265,14 +264,6 @@ fragment_quoting_7a_body()
 	set +x
 }
 fragment_comment_body()
 {
 	atf_check \
 		-o inline:'kuku=\#ttt\n' \
 		pkgconf --with-path="${selfdir}/lib1" --cflags fragment-comment
 }
 msvc_fragment_quoting_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
--- a/tests/regress.sh
+++ b/tests/regress.sh
@ -8,7 +8,6 @@ tests_init \
 	depgraph_break_2 \
 	depgraph_break_3 \
 	define_variable \
 	define_variable_override \
 	variable \
 	keep_system_libs \
 	libs \
@ -24,17 +23,13 @@ tests_init \
 	idirafter_munge_sysroot \
 	idirafter_ordering \
 	pcpath \
 	sysroot_munge \
 	virtual_variable \
 	fragment_collision \
 	malformed_1 \
 	malformed_quoting \
 	explicit_sysroot \
-	empty_tuple \
+	empty_tuple
 	solver_requires_private_debounce \
 	billion_laughs \
 	maximum_package_depth_off_by_one
 #	sysroot_munge \
 case_sensitivity_body()
 {
@ -75,13 +70,6 @@ define_variable_body()
 		pkgconf --variable=typelibdir --define-variable='libdir=\${libdir}' typelibdir
 }
 define_variable_override_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check -o inline:"/test\n" \
 		pkgconf --variable=prefix --define-variable='prefix=/test' typelibdir
 }
 variable_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
@ -172,9 +160,9 @@ isystem_munge_order_body()
 isystem_munge_sysroot_body()
 {
-	export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}"
+	export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR='/test'
 	atf_check \
-		-o match:"-isystem ${selfdir}/opt/bad/include" \
+		-o match:"-isystem /test/opt/bad/include" \
 		pkgconf --cflags isystem
 }
@ -188,9 +176,9 @@ idirafter_munge_order_body()
 idirafter_munge_sysroot_body()
 {
-	export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}"
+	export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR='/test'
 	atf_check \
-		-o match:"-idirafter ${selfdir}/opt/bad/include" \
+		-o match:"-idirafter /test/opt/bad/include" \
 		pkgconf --cflags idirafter
 }
@ -212,11 +200,15 @@ pcpath_body()
 sysroot_munge_body()
 {
-	sed "s|/sysroot/|${selfdir}/|g" ${selfdir}/lib1/sysroot-dir.pc > ${selfdir}/lib1/sysroot-dir-selfdir.pc
+	export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="/sysroot"
 	export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}"
 	atf_check \
-		-o inline:"-L${selfdir}/lib -lfoo\n" \
+		-o inline:"-L/sysroot/lib -lfoo \n" \
-		pkgconf --libs sysroot-dir-selfdir
+		pkgconf --libs sysroot-dir
 	export PKG_CONFIG_SYSROOT_DIR="/sysroot2"
 	atf_check \
 		-o inline:"-L/sysroot2/sysroot/lib -lfoo \n" \
 		pkgconf --libs sysroot-dir
 }
 virtual_variable_body()
@ -252,8 +244,8 @@ malformed_quoting_body()
 explicit_sysroot_body()
 {
-	export PKG_CONFIG_SYSROOT_DIR=${selfdir}
+	export PKG_CONFIG_SYSROOT_DIR=/sysroot
-	atf_check -o inline:"${selfdir}/usr/share/test\n" \
+	atf_check -o inline:"/sysroot/usr/share/test\n" \
 		pkgconf --with-path="${selfdir}/lib1" --variable=pkgdatadir explicit-sysroot
 }
@ -262,21 +254,3 @@ empty_tuple_body()
 	atf_check -o inline:"\n" \
 		pkgconf --with-path="${selfdir}/lib1" --cflags empty-tuple
 }
 solver_requires_private_debounce_body()
 {
 	atf_check -o inline:"-I/metapackage-1 -I/metapackage-2 -lmetapackage-1 -lmetapackage-2\n" \
 		pkgconf --with-path="${selfdir}/lib1" --cflags --libs metapackage
 }
 billion_laughs_body()
 {
 	atf_check -o inline:"warning: truncating very long variable to 64KB\nwarning: truncating very long variable to 64KB\nwarning: truncating very long variable to 64KB\nwarning: truncating very long variable to 64KB\nwarning: truncating very long variable to 64KB\n" \
 		pkgconf --with-path="${selfdir}/lib1" --validate billion-laughs
 }
 maximum_package_depth_off_by_one_body()
 {
 	atf_check -o inline:"1.2.3\n" \
 		pkgconf --with-path="${selfdir}/lib1" --modversion foo bar baz
 }
--- a/tests/requires.sh
+++ b/tests/requires.sh
@ -69,7 +69,7 @@ private_duplication_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-lprivate -lbaz -lzee -lbar -lfoo -lfoo\n" \
+		-o inline:"-lprivate -lfoo -lbaz -lzee -lbar -lfoo \n" \
 		pkgconf --static --libs-only-l private-libs-duplication
 }
@ -87,7 +87,7 @@ missing_body()
 	atf_check \
 		-s exit:1 \
 		-e ignore \
-		-o ignore \
+		-o inline:"\n" \
 		pkgconf --cflags missing-require
 }
--- a/tests/sysroot.sh
+++ b/tests/sysroot.sh
@ -6,11 +6,6 @@ tests_init \
 	cflags \
 	variable \
 	do_not_eat_slash \
 	do_not_duplicate_sysroot_dir \
 	uninstalled \
 	uninstalled_pkgconf1 \
 	uninstalled_fdo \
 	uninstalled_fdo_pc_sysrootdir
 do_not_eat_slash_body()
 {
@ -41,70 +36,3 @@ variable_body()
 		-o inline:"${SYSROOT_DIR}/test/include\n" \
 		pkgconf --variable=includedir foo
 }
 do_not_duplicate_sysroot_dir_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	export PKG_CONFIG_SYSROOT_DIR="/sysroot"
 	atf_check \
 		-o inline:"-I/sysroot/usr/include\n" \
 		pkgconf --cflags sysroot-dir-2
 	atf_check \
 		-o inline:"-I/sysroot/usr/include\n" \
 		pkgconf --cflags sysroot-dir-3
 	atf_check \
 		-o inline:"-I/sysroot/usr/include\n" \
 		pkgconf --cflags sysroot-dir-5
 	export PKG_CONFIG_SYSROOT_DIR="${SYSROOT_DIR}"
 	atf_check \
 		-o inline:"-I${SYSROOT_DIR}/usr/include\n" \
 		pkgconf --cflags sysroot-dir-4
 }
 uninstalled_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	export PKG_CONFIG_SYSROOT_DIR="/sysroot"
 	atf_check \
 		-o inline:"-L/test/lib -lomg\n" \
 		pkgconf --libs omg
 }
 uninstalled_pkgconf1_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	export PKG_CONFIG_SYSROOT_DIR="/sysroot"
 	export PKG_CONFIG_PKGCONF1_SYSROOT_RULES="1"
 	atf_check \
 		-o inline:"-L/sysroot/test/lib -lomg\n" \
 		pkgconf --libs omg
 }
 uninstalled_fdo_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	export PKG_CONFIG_SYSROOT_DIR="/sysroot"
 	export PKG_CONFIG_FDO_SYSROOT_RULES="1"
 	atf_check \
 		-o inline:"-L/test/lib -lomg\n" \
 		pkgconf --libs omg
 }
 uninstalled_fdo_pc_sysrootdir_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	export PKG_CONFIG_SYSROOT_DIR="/sysroot"
 	export PKG_CONFIG_FDO_SYSROOT_RULES="1"
 	atf_check \
 		-o inline:"-L/sysroot/test/lib -lomg\n" \
 		pkgconf --libs omg-sysroot
 }
--- a/tests/test_env.sh.in
+++ b/tests/test_env.sh.in
@ -24,8 +24,9 @@ done
 selfdir="@abs_top_srcdir@/tests"
 LIBRARY_PATH_ENV="LIBRARY_PATH"
 PATH_SEP=":"
-SYSROOT_DIR="${selfdir}"
+SYSROOT_DIR="${selfdir}/test"
 case "$(uname -s)" in
 Msys|CYGWIN*) PATH_SEP=";";;
 Haiku) LIBRARY_PATH_ENV="BELIBRARIES";;
 esac