head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.8 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.6 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.4 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.2 pkgsrc-2011Q2-base:1.7 pkgsrc-2010Q2:1.5.0.24 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.22 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.20 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.18 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.16 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.14 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.12 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.10 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.8 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.6 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.4 pkgsrc-2008Q1:1.5.0.2 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.4.0.2 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3; locks; strict; comment @# @; 1.7 date 2010.09.28.04.52.41; author dsainty; state dead; branches; next 1.6; 1.6 date 2010.09.23.07.07.47; author adam; state Exp; branches; next 1.5; 1.5 date 2008.03.04.09.22.27; author wiz; state Exp; branches; next 1.4; 1.4 date 2007.11.30.22.12.07; author wiz; state Exp; branches; next 1.3; 1.3 date 2005.10.22.12.59.14; author wiz; state Exp; branches; next 1.2; 1.2 date 2005.10.16.21.51.29; author jmmv; state Exp; branches; next 1.1; 1.1 date 2005.10.01.12.52.16; author jmmv; state Exp; branches; next ; desc @@ 1.7 log @patch-ab is upstream now (PKG_CONFIG_LOG support). Remove the patch to avoid crashing with double free on glibc. Bump PKGREVISION for new "not crash" functionality. @ text @$NetBSD: patch-ab,v 1.6 2010/09/23 07:07:47 adam Exp $ Log all pkg-config calls to a file. Used by pkgtools/verifypc. --- main.c.orig 2010-05-10 17:58:57.000000000 +0000 +++ main.c @@@@ -462,12 +462,27 @@@@ main (int argc, char **argv) gboolean failed = FALSE; GSList *reqs; GSList *iter; + char *log_name; + FILE *log; reqs = parse_module_list (NULL, str->str, "(command line arguments)"); iter = reqs; + log_name = getenv ("PKG_CONFIG_LOG"); + if (log_name != NULL) + { + log = fopen (getenv ("PKG_CONFIG_LOG"), "a"); + if (log == NULL) + { + fprintf (stderr, "Cannot open log file: %s\n", log_name); + exit (1); + } + } + else + log = NULL; + while (iter != NULL) { Package *req; @@@@ -489,6 +504,18 @@@@ main (int argc, char **argv) fprintf (log, "\n"); } + if (log != NULL) + { + if (req == NULL) + fprintf (log, "%s NOT-FOUND", ver->name); + else + fprintf (log, "%s %s %s", ver->name, + comparison_to_str (ver->comparison), + (ver->version == NULL) ? "(null)" : ver->version); + + fprintf (log, "\n"); + } + if (req == NULL) { failed = TRUE; @@@@ -524,6 +551,11 @@@@ main (int argc, char **argv) fclose (log); } + if (log != NULL) + { + fclose (log); + } + if (failed) { return 1; } @ 1.6 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 @d1 1 a1 1 $NetBSD$ @ 1.5 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 5 $NetBSD: patch-ab,v 1.4 2007/11/30 22:12:07 wiz Exp $ The static variables are needed because they are used in a struct initializer. The IRIX/mipseb C compiler needs those addresses to be constant. d5 1 a5 1 --- main.c.orig 2008-01-16 22:06:48.000000000 +0000 d7 1 a7 49 @@@@ -173,27 +173,27 @@@@ pkg_uninstalled (Package *pkg) int main (int argc, char **argv) { - int want_my_version = 0; - int want_version = 0; - int want_libs = 0; - int want_cflags = 0; - int want_l_libs = 0; - int want_L_libs = 0; - int want_other_libs = 0; - int want_I_cflags = 0; - int want_other_cflags = 0; - int want_list = 0; - int want_static_lib_list = ENABLE_INDIRECT_DEPS; - int want_short_errors = 0; + static int want_my_version = 0; + static int want_version = 0; + static int want_libs = 0; + static int want_cflags = 0; + static int want_l_libs = 0; + static int want_L_libs = 0; + static int want_other_libs = 0; + static int want_I_cflags = 0; + static int want_other_cflags = 0; + static int want_list = 0; + static int want_static_lib_list = ENABLE_INDIRECT_DEPS; + static int want_short_errors = 0; int result; - int want_uninstalled = 0; - char *variable_name = NULL; - int want_exists = 0; - char *required_atleast_version = NULL; - char *required_exact_version = NULL; - char *required_max_version = NULL; - char *required_pkgconfig_version = NULL; - int want_silence_errors = 0; + static int want_uninstalled = 0; + static char *variable_name = NULL; + static int want_exists = 0; + static char *required_atleast_version = NULL; + static char *required_exact_version = NULL; + static char *required_max_version = NULL; + static char *required_pkgconfig_version = NULL; + static int want_silence_errors = 0; GString *str; GSList *packages = NULL; char *search_path; @@@@ -472,12 +472,27 @@@@ main (int argc, char **argv) d35 3 a37 3 @@@@ -488,6 +503,18 @@@@ main (int argc, char **argv) else req = get_package (ver->name); d54 2 a55 2 @@@@ -518,6 +545,11 @@@@ main (int argc, char **argv) iter = g_slist_next (iter); @ 1.4 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-ab,v 1.3 2005/10/22 12:59:14 wiz Exp $ d9 1 a9 1 --- main.c.orig 2007-06-18 21:35:05.000000000 +0000 d11 1 a11 1 @@@@ -172,27 +172,27 @@@@ pkg_uninstalled (Package *pkg) d59 1 a59 1 @@@@ -461,12 +461,27 @@@@ main (int argc, char **argv) d87 1 a87 1 @@@@ -477,6 +492,18 @@@@ main (int argc, char **argv) d106 1 a106 1 @@@@ -507,6 +534,11 @@@@ main (int argc, char **argv) @ 1.3 log @Update to 0.20: - Fix test suite to work on Solaris. Yay non-POSIX /bin/sh :-( - Fix segfault on --help with gcc4. Fix segfault on bigendian arches in some cases. - Win32 fixes - Add --short-errors, now used by pkg.m4 if available. This gives a better error message if some libraries can't be found. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2005/10/16 21:51:29 jmmv Exp $ d9 1 a9 1 --- main.c.orig 2005-10-22 14:48:50.000000000 +0200 d59 1 a59 1 @@@@ -462,12 +462,27 @@@@ main (int argc, char **argv) d87 1 a87 1 @@@@ -478,6 +493,18 @@@@ main (int argc, char **argv) d106 1 a106 1 @@@@ -508,6 +535,11 @@@@ main (int argc, char **argv) @ 1.2 log @Avoid passing a NULL pointer to fprintf, which causes a segfault under Solaris 9. My fault; I assumed all implementations could print '(null)' in that case. Bump PKGREVISION to 2. Fixes PR pkg/31838 by John Heasley. @ text @d1 5 a5 1 $NetBSD: patch-ab,v 1.1 2005/10/01 12:52:16 jmmv Exp $ d9 1 a9 1 --- main.c.orig 2005-10-16 23:42:25.000000000 +0200 d11 50 a60 2 @@@@ -458,12 +458,27 @@@@ main (int argc, char **argv) { d87 3 a89 3 @@@@ -471,6 +486,18 @@@@ main (int argc, char **argv) req = get_package (ver->name); d105 2 a106 3 verbose_error ("No package '%s' found\n", ver->name); @@@@ -497,6 +524,11 @@@@ main (int argc, char **argv) d109 1 a109 1 + d114 4 a117 3 } g_string_free (str, TRUE); @ 1.1 log @Add support to generate a log file that keeps track of all requests to pkg-config. Used by the upcoming pkgtools/verifypc package. Bump PKGREVISION to 1. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- main.c.orig 2005-05-21 11:14:47.000000000 +0200 d46 1 a46 1 + ver->version); @