head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.40 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.38 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.36 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.34 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.32 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.30 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.28 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.26 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.24 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.22 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.20 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.18 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.16 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.14 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.12 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.10 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.8 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.6 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.4 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.2 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.5.0.2 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.3.0.6 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.4 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.2 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2; locks; strict; comment @# @; 1.7 date 2005.07.21.16.34.50; author wiz; state dead; branches; next 1.6; 1.6 date 2005.07.13.21.38.26; author rillig; state Exp; branches; next 1.5; 1.5 date 2005.04.21.08.22.32; author xtraeme; state Exp; branches; next 1.4; 1.4 date 2005.03.28.19.48.14; author wiz; state dead; branches; next 1.3; 1.3 date 2004.08.07.12.14.09; author wiz; state Exp; branches; next 1.2; 1.2 date 2004.04.28.14.11.15; author tv; state dead; branches; next 1.1; 1.1 date 2004.04.27.19.08.34; author tv; state Exp; branches; next ; desc @@ 1.7 log @Remove pkgconfig -- replaced by pkg-config. @ text @$NetBSD: patch-aa,v 1.6 2005/07/13 21:38:26 rillig 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. --- main.c.orig Tue Apr 12 13:08:13 2005 +++ main.c Wed Jul 13 04:26:50 2005 @@@@ -172,26 +172,26 @@@@ 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; + 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; 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; @@@@ -278,13 +278,17 @@@@ main (int argc, char **argv) debug_spew ("PKG_CONFIG_DEBUG_SPEW variable enabling debug spew\n"); } - search_path = getenv ("PKG_CONFIG_PATH"); + search_path = getenv("PKG_CONFIG_LIBDIR"); + + if (search_path) + add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S); + else { + search_path = getenv("PKG_CONFIG_PATH"); if (search_path) - { add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S); - } add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S); + } #ifdef G_OS_WIN32 { @ 1.6 log @Extended patch-aa (main.c) to make the variable addresses used in a struct initializer constant. Bumped PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2005/04/21 08:22:32 xtraeme Exp $ @ 1.5 log @As reported by Matthias Drochner, pkg-config tries to use always PKG_CONFIG_PC_PATH even when PKG_CONFIG_PATH is defined, this is not good for pkgsrc, apply suggested code by Johnny C. Lam to use PKG_CONFIG_LIBDIR again. Now our pkg-config does the following: * If PKG_CONFIG_LIBDIR is set, use it. * Otherwise PKG_CONFIG_PATH and default directories are used. Bump PKGREVISION and sync the bl3 file again. @ text @d1 1 a1 1 $NetBSD$ d3 53 a55 3 --- main.c.orig 2005-04-21 10:11:45.000000000 +0200 +++ main.c 2005-04-21 10:12:43.000000000 +0200 @@@@ -278,13 +278,17 @@@@ @ 1.4 log @Update to 0.16.0: - Use a search path, rather than a single default directory. - Fix a bunch of bugs in glib by backporting - More man page fixes - Lots of small fixes and cleanups over the place. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2004/08/07 12:14:09 wiz Exp $ d3 5 a7 9 --- parse.c.orig 2002-09-26 19:25:41.000000000 +0200 +++ parse.c @@@@ -953,6 +953,7 @@@@ parse_package_file (const char *path) verbose_error ("Package file '%s' appears to be empty\n", path); + fclose(f); return pkg; } d9 17 @ 1.3 log @Update to 0.15.0nb1: Close file descriptor leak; make --list-all work if you have more pc files than the file descriptor limit allows. Submitted to freedesktop bugzilla as http://freedesktop.org/bugzilla/show_bug.cgi?id=1006 @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Revert patch for Interix, as we're no longer using poll(2) there at all. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2004/04/27 19:08:34 tv Exp $ d3 10 a12 13 --- glib-1.2.8/gmain.c.orig Tue Apr 27 14:56:29 2004 +++ glib-1.2.8/gmain.c @@@@ -49,6 +49,10 @@@@ # undef events /* AIX 4.1.5 & 4.3.2 define this for SVR3,4 compatibility */ # undef revents /* AIX 4.1.5 & 4.3.2 define this for SVR3,4 compatibility */ #endif /* GLIB_HAVE_SYS_POLL_H */ +#ifdef __INTERIX +/* SUS standard location is NOT */ +#include +#endif #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ @ 1.1 log @Make work on Interix. @ text @d1 1 a1 1 $NetBSD$ @