head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.4 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.2 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q2:1.5.0.14 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.12 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.10 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.8 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.6 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.4 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.2 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.4.0.2 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.3.0.24 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.22 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.20 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.18 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.16 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.14 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.12 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.10 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.8 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.6 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.4 pkgsrc-2008Q1:1.3.0.2 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.2.0.2 pkgsrc-2007Q4-base:1.2; locks; strict; comment @# @; 1.6 date 2012.08.12.16.28.06; author wiz; state dead; branches; next 1.5; 1.5 date 2010.12.10.07.45.56; author hauke; state Exp; branches; next 1.4; 1.4 date 2010.09.23.07.07.47; author adam; state Exp; branches; next 1.3; 1.3 date 2008.03.04.09.22.27; author wiz; state Exp; branches; next 1.2; 1.2 date 2007.11.30.22.12.08; author wiz; state Exp; branches; next 1.1; 1.1 date 2007.10.21.14.01.16; author joerg; state Exp; branches; next ; desc @@ 1.6 log @Update to 0.27: pkg-config 0.27 === - Drop usage of popt for equivalent API in glib2. - Add back an internal snapshot of glib2 to break circular dependency. This can be used by passing --with-internal-glib to configure. On Windows it may still be required to use an installed glib. - Fix --exists to check for Requires and Requires.private. This ensures that all necessary packages are installed prior to using --cflags, --libs, etc. - Various fixes for MinGW which should allow it to be used unpatched on that system. - New autoconf macros PKG_INSTALLDIR and PKG_NOARCH_INSTALLDIR to help determine the .pc file install directory. - Fix handling of --exact/atleast/max-version vs. =/>=/<=. - Fix errors in man page source. - Ensure testing only searches in the check directory. - Bump glib requirement to 2.16 to avoid deprecated g_win32_get_package_installation_subdirectory(). - Autotools refresh and update. The required versions now are autoconf-2.62, automake-1.11 and libtool-2.2. - Use g_alloca from glib instead of figuring out alloca ourselves. - Remove search for setresuid & setreuid only needed for internal popt. - Bugs fixed: 833, 2458, 5214, 5326, 5703, 6074, 8653, 9135, 9143, 9584, 10652, 11464, 14396, 17053, 23922, 28776, 29011, 29801, 31699, 31700, 32622, 34382, 37266, 39646, 41081, 43149, 44843, 45599, 45742, 48743 pkg-config 0.26 === - Build system fixes - More tests - pkg.m4 fixups which makes autoconf 2.66 happier. - Drop support for legacy -config scripts. Those should already be gone and cause problems in cross-compilation environments. - Drop embedded glib - Fix up pkg.m4 to handle the case of --exists working and --cflags or --libs failing. - Various documentation updates - Allow $() through without escaping it. - Add --with-system-include-path instead of hard-coding /usr/include. @ text @$NetBSD: patch-ah,v 1.5 2010/12/10 07:45:56 hauke Exp $ --- parse.c.orig 2010-05-27 20:21:36.000000000 +0000 +++ parse.c @@@@ -880,8 +880,10 @@@@ parse_cflags (Package *pkg, const char * pkg->other_cflags = g_slist_prepend (pkg->other_cflags, g_strdup (arg)); if (strcmp("-idirafter", arg) == 0) { + char *n; + tmp = trim_string(argv[++i]); - char *n = strdup_escape_shell(tmp); + n = strdup_escape_shell(tmp); pkg->other_cflags = g_slist_prepend(pkg->other_cflags, n); g_free(tmp); } @@@@ -1460,102 +1462,8 @@@@ get_compat_package (const char *name) } else { - /* Check for the module in gnome-config */ - char *output; - char *p; - char *command; - - debug_spew ("Calling gnome-config\n"); - - /* Annoyingly, --modversion doesn't return a failure - * code if the lib is unknown, so we have to use --libs - * for that. - */ - - command = g_strdup_printf ("gnome-config --libs %s", - name); - - if (!try_command (command)) - { - g_free (command); - g_free (pkg); - return NULL; - } - else - g_free (command); - - command = g_strdup_printf ("gnome-config --modversion %s", - name); - - output = backticks (command); - g_free (command); - if (output == NULL) - { - g_free (pkg); - return NULL; - } - - /* Unknown modules give "Unknown library `foo'" from gnome-config - * (but on stderr so this is useless, nevermind) - */ - if (strstr (output, "Unknown") || *output == '\0') - { - g_free (output); - g_free (pkg); - return NULL; - } - - /* gnome-config --modversion gnomeui outputs e.g. "gnome-libs-1.2.4" - * or libglade-0.12 - */ - p = output; - - while (*p && isspace ((guchar)*p)) - ++p; - - if (*p == '\0') - { - /* empty output */ - g_free (output); - g_free (pkg); - return NULL; - } - - /* only heuristic; find a number or . */ - while (*p && ! (isdigit ((guchar)*p) || *p == '.')) - ++p; - - pkg->version = g_strdup (p); - - g_free (output); - - /* Strip newline */ - p = pkg->version; - while (*p) - { - if (*p == '\n') - *p = '\0'; - - ++p; - } - - pkg->name = g_strdup (name); - pkg->key = g_strdup (name); - pkg->description = g_strdup ("No description"); - - command = g_strdup_printf ("gnome-config --libs %s", name); - output = backticks (command); - g_free (command); - parse_libs (pkg, output, "gnome-config"); - g_free (output); - - command = g_strdup_printf ("gnome-config --cflags %s", name); - output = backticks (command); - g_free (command); - parse_cflags (pkg, output, "gnome-config"); - g_free (output); - - return pkg; + g_free (pkg); + return NULL; } #endif } @ 1.5 log @Squash a C++ism: Variable declarations only at the beginning of a block. Found while building on NetBSD 1.5. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Changes 0.25: * 0.24 included a too strict whitespace/shell metacharacter filter leading to some legal characters like = and : being escaped in the output. This has been fixed. * when building with newer and external libpopt, it would be confused over being asked to split an empty string, leading to errors with packages that included empty fields in their .pc files. * Make the COPYING file explicitly GPLv2. The COPYING file in 0.24 was inadvertently GPLv3 rather than the correct GPLv2. * Minor changes to documentation Changes 0.24: * Fix up bug in PKG_CONFIG_SYSROOT handling which mangled non-I and non-L arguments * Put /usr/lib/pkgconfig and /usr/share/pkgconfig into the default search path when no prefix is passed to configure. * Portability fixes for Windows and NetBSD * Various man page updates * Add logging support to log how pkg-config is being called. * Skip Requires.private unless we need them for Cflags * Add a variable, pc_path to the compiled-in pkg-config package that you can query for the compiled-in PKG_CONFIG_PC_PATH. * Various updates to pkg.m4. * Update rpmvercmp with bugfixes from upstream. * Add introductory guide to pkg-config, thanks to Dan Nicholson for the patch. * Add listing of variables in a package * Make it possible to use external popt. * Add --print-provides and --print-requires(-private) options * Add support for paths containing whitespace and shell metacharacters @ text @a2 3 Don't call gnome-config, it has been dead for ages and the warnings just confuse users. d5 13 a17 1 @@@@ -1460,102 +1460,8 @@@@ get_compat_package (const char *name) @ 1.3 log @Update to 0.23: - Add support for setting sysroot through PKG_CONFIG_SYSROOT_DIR in the environment. - Update included glib to 1.2.10. - Other minor fixes, including a segfault. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.2 2007/11/30 22:12:08 wiz Exp $ d6 1 a6 1 --- parse.c.orig 2008-01-16 20:42:49.000000000 +0000 d8 1 a8 1 @@@@ -1418,102 +1418,8 @@@@ get_compat_package (const char *name) @ 1.2 log @Update to 0.22: pkg-config 0.22 === - Make Requires.private a whole lot more useful by traversing the whole tree, not just the top-level, for Cflags. - Add support for using the system glib. - Update URL to pkg-config website - Fix some win32 problems. - Other minor fixes. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 2007/10/21 14:01:16 joerg Exp $ d6 1 a6 1 --- parse.c.orig 2007-06-18 21:35:05.000000000 +0000 @ 1.1 log @Remove calls to gnomeconfig when no matching .pc file was found. Bump revision. @ text @d1 1 a1 1 $NetBSD$ d6 1 a6 1 --- parse.c.orig 2006-08-16 20:45:45.000000000 +0200 d8 1 a8 1 @@@@ -1396,102 +1396,8 @@@@ get_compat_package (const char *name) @