pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/pkg-config Update to 0.23:
details: https://anonhg.NetBSD.org/pkgsrc/rev/a8b0432864d0
branches: trunk
changeset: 539340:a8b0432864d0
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Mar 04 09:22:27 2008 +0000
description:
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.
diffstat:
devel/pkg-config/Makefile | 4 ++--
devel/pkg-config/distinfo | 23 ++++++++++-------------
devel/pkg-config/patches/patch-aa | 24 ------------------------
devel/pkg-config/patches/patch-ab | 12 ++++++------
devel/pkg-config/patches/patch-ac | 6 +++---
devel/pkg-config/patches/patch-ad | 4 ++--
devel/pkg-config/patches/patch-ae | 26 --------------------------
devel/pkg-config/patches/patch-af | 29 -----------------------------
devel/pkg-config/patches/patch-ah | 4 ++--
devel/pkg-config/patches/patch-ca | 36 ++++++++++++++++++------------------
devel/pkg-config/patches/patch-cb | 24 ++++++++++++------------
11 files changed, 55 insertions(+), 137 deletions(-)
diffs (truncated from 456 to 300 lines):
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/Makefile
--- a/devel/pkg-config/Makefile Tue Mar 04 07:52:46 2008 +0000
+++ b/devel/pkg-config/Makefile Tue Mar 04 09:22:27 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/11/30 22:12:07 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 09:22:27 wiz Exp $
#
-DISTNAME= pkg-config-0.22
+DISTNAME= pkg-config-0.23
CATEGORIES= devel
MASTER_SITES= http://pkgconfig.freedesktop.org/releases/
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/distinfo
--- a/devel/pkg-config/distinfo Tue Mar 04 07:52:46 2008 +0000
+++ b/devel/pkg-config/distinfo Tue Mar 04 09:22:27 2008 +0000
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.13 2008/01/31 21:46:43 joerg Exp $
+$NetBSD: distinfo,v 1.14 2008/03/04 09:22:27 wiz Exp $
-SHA1 (pkg-config-0.22.tar.gz) = 3ec40bda9864d7aa3c912c6ae87a750fd8b6e420
-RMD160 (pkg-config-0.22.tar.gz) = f82754f9892469d2865cc5d2fd3c2ca4513dab5b
-Size (pkg-config-0.22.tar.gz) = 1006425 bytes
-SHA1 (patch-aa) = 86e1d0b7e86fe125482533f4f5d41e6b230031b5
-SHA1 (patch-ab) = 2298c2798be04669796bf990d9dbddbfc8ee1897
-SHA1 (patch-ac) = 53d90ba40f8aafe0eae9c898e122a95ce951d2e3
-SHA1 (patch-ad) = ad7805b2aa69e3c872fa35eb08a938fa3f8d323b
-SHA1 (patch-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
-SHA1 (patch-af) = 1186777da42151583594fd137e135ef6a77ee09f
-SHA1 (patch-ah) = 9b5e537f2c0606efa45078d02de53700f3d3439a
-SHA1 (patch-ca) = eacefe584576fe3f78f4b0b52cfcd9199307a8d4
-SHA1 (patch-cb) = d8c7f26fbf9e485658a9c567eff9c4b336a4f300
+SHA1 (pkg-config-0.23.tar.gz) = b59dddd6b5320bd74c0f74b3339618a327096b2a
+RMD160 (pkg-config-0.23.tar.gz) = 0aa5565430d609319917ac2c8ffeaa5e4a509489
+Size (pkg-config-0.23.tar.gz) = 1032839 bytes
+SHA1 (patch-ab) = 341bf28ed435314856e1c7cecab3d6d5f232aea7
+SHA1 (patch-ac) = 65954b5f1d6608e2546602b1a4bc7c75db683238
+SHA1 (patch-ad) = 4628f5ce73b3dcaa2df92e3be2fd7955ab38ffa4
+SHA1 (patch-ah) = 3cee7ec1a5592e2a550f74a3eb8da2a9e3ab1773
+SHA1 (patch-ca) = 22690d923ddf0e1ce2ca9eddb56ada385f6cefe4
+SHA1 (patch-cb) = 23412858615649c8d8305ce4e6571f06e17073fd
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/patches/patch-aa
--- a/devel/pkg-config/patches/patch-aa Tue Mar 04 07:52:46 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/10/04 18:48:04 rillig Exp $
-
-ISO C90 does not accept qualified initializers. Needed at least for IRIX
-5.
-
---- pkg.c.orig 2006-09-19 01:21:12.000000000 +0200
-+++ pkg.c 2006-09-19 01:21:50.000000000 +0200
-@@ -58,11 +58,11 @@
- gboolean ignore_private_libs = TRUE;
-
- static Package pkg_config_package = {
-- .key = PACKAGE,
-- .name = PACKAGE,
-- .version = VERSION, /* .version */
-- .description = "returns metainformation about installed libraries",
-- .url = "http://pkg-config.freedesktop.org",
-+ PACKAGE,
-+ PACKAGE,
-+ VERSION, /* .version */
-+ "returns metainformation about installed libraries",
-+ "http://pkg-config.freedesktop.org",
- 0 /* keep the rest as null */
- };
-
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/patches/patch-ab
--- a/devel/pkg-config/patches/patch-ab Tue Mar 04 07:52:46 2008 +0000
+++ b/devel/pkg-config/patches/patch-ab Tue Mar 04 09:22:27 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2007/11/30 22:12:07 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2008/03/04 09:22:27 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
@@ -6,9 +6,9 @@
Log all pkg-config calls to a file. Used by pkgtools/verifypc.
---- main.c.orig 2007-06-18 21:35:05.000000000 +0000
+--- main.c.orig 2008-01-16 22:06:48.000000000 +0000
+++ main.c
-@@ -172,27 +172,27 @@ pkg_uninstalled (Package *pkg)
+@@ -173,27 +173,27 @@ pkg_uninstalled (Package *pkg)
int
main (int argc, char **argv)
{
@@ -56,7 +56,7 @@
GString *str;
GSList *packages = NULL;
char *search_path;
-@@ -461,12 +461,27 @@ main (int argc, char **argv)
+@@ -472,12 +472,27 @@ main (int argc, char **argv)
gboolean failed = FALSE;
GSList *reqs;
GSList *iter;
@@ -84,7 +84,7 @@
while (iter != NULL)
{
Package *req;
-@@ -477,6 +492,18 @@ main (int argc, char **argv)
+@@ -488,6 +503,18 @@ main (int argc, char **argv)
else
req = get_package (ver->name);
@@ -103,7 +103,7 @@
if (req == NULL)
{
failed = TRUE;
-@@ -507,6 +534,11 @@ main (int argc, char **argv)
+@@ -518,6 +545,11 @@ main (int argc, char **argv)
iter = g_slist_next (iter);
}
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/patches/patch-ac
--- a/devel/pkg-config/patches/patch-ac Tue Mar 04 07:52:46 2008 +0000
+++ b/devel/pkg-config/patches/patch-ac Tue Mar 04 09:22:27 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2007/11/30 22:12:07 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2008/03/04 09:22:27 wiz Exp $
Arbitrary strings should not be passed to "eval".
---- configure.orig 2007-06-18 21:36:04.000000000 +0000
+--- configure.orig 2008-01-16 22:52:31.000000000 +0000
+++ configure
-@@ -19890,7 +19890,7 @@ echo use_indirect_deps=$use_indirect_dep
+@@ -20150,7 +20150,7 @@ echo use_indirect_deps=$use_indirect_dep
echo $ECHO_N "checking whether to list both direct and indirect dependencies... $ECHO_C" >&6; }
case $use_indirect_deps in
auto)
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/patches/patch-ad
--- a/devel/pkg-config/patches/patch-ad Tue Mar 04 07:52:46 2008 +0000
+++ b/devel/pkg-config/patches/patch-ad Tue Mar 04 09:22:27 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2007/11/30 22:12:07 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2008/03/04 09:22:27 wiz Exp $
see patch-ac.
---- configure.in.orig 2007-06-18 21:35:05.000000000 +0000
+--- configure.in.orig 2008-01-16 22:48:07.000000000 +0000
+++ configure.in
@@ -41,7 +41,7 @@ echo use_indirect_deps=$use_indirect_dep
AC_MSG_CHECKING([whether to list both direct and indirect dependencies])
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/patches/patch-ae
--- a/devel/pkg-config/patches/patch-ae Tue Mar 04 07:52:46 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/10/04 18:48:04 rillig Exp $
-
-According to a private mail from Tollef Fog Heen, the pkg-config
-maintainer, the test suite has been wrong, but the code ok. This patch
-fixes the tests.
-
---- check/check-requires-private.orig 2006-08-16 19:05:30.000000000 +0200
-+++ check/check-requires-private 2006-10-04 20:42:05.000000000 +0200
-@@ -9,14 +9,14 @@ fi
-
- . ${srcdir}/common
-
--# expect cflags from requires-test and public-dep
-+# expect cflags from requires-test, private-dep and public-dep
- ARGS="--cflags requires-test"
--RESULT="-I/requires-test/include -I/public-dep/include"
-+RESULT="-I/requires-test/include -I/private-dep/include -I/public-dep/include"
- run_test
-
- # still expect those cflags for static linking case
- ARGS="--static --cflags requires-test"
--RESULT="-I/requires-test/include -I/public-dep/include"
-+RESULT="-I/requires-test/include -I/private-dep/include -I/public-dep/include"
- run_test
-
- # expect libs for just requires-test and public-dep
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/patches/patch-af
--- a/devel/pkg-config/patches/patch-af Tue Mar 04 07:52:46 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/06/01 19:03:46 wiz Exp $
-
---- pkg.m4.orig 2006-08-16 17:05:30.000000000 +0000
-+++ pkg.m4
-@@ -66,16 +66,14 @@ fi])
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$PKG_CONFIG"; then
-- if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- else
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- fi
--else
-- pkg_failed=untried
-+[if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ else
-+ pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
-
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/patches/patch-ah
--- a/devel/pkg-config/patches/patch-ah Tue Mar 04 07:52:46 2008 +0000
+++ b/devel/pkg-config/patches/patch-ah Tue Mar 04 09:22:27 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.2 2007/11/30 22:12:08 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2008/03/04 09:22:27 wiz Exp $
Don't call gnome-config, it has been dead for ages and the warnings
just confuse users.
---- parse.c.orig 2007-06-18 21:35:05.000000000 +0000
+--- parse.c.orig 2008-01-16 20:42:49.000000000 +0000
+++ parse.c
@@ -1418,102 +1418,8 @@ get_compat_package (const char *name)
}
diff -r c4a42ebe6757 -r a8b0432864d0 devel/pkg-config/patches/patch-ca
--- a/devel/pkg-config/patches/patch-ca Tue Mar 04 07:52:46 2008 +0000
+++ b/devel/pkg-config/patches/patch-ca Tue Mar 04 09:22:27 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
+$NetBSD: patch-ca,v 1.3 2008/03/04 09:22:27 wiz Exp $
---- glib-1.2.8/configure.orig 2007-06-18 23:36:00.000000000 +0200
-+++ glib-1.2.8/configure
-@@ -20267,119 +20267,6 @@ if test "x$GCC" = "xyes"; then
+--- glib-1.2.10/configure.orig 2008-01-16 22:52:28.000000000 +0000
++++ glib-1.2.10/configure
+@@ -20561,119 +20561,6 @@ if test "x$GCC" = "xyes"; then
fi
fi
@@ -122,7 +122,7 @@
{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5
echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
-@@ -23474,14 +23361,7 @@ if test "${glib_cv_has__inline+set}" = s
+@@ -23768,14 +23655,7 @@ if test "${glib_cv_has__inline+set}" = s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -138,7 +138,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -23492,41 +23372,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23786,41 +23666,33 @@ cat >>conftest.$ac_ext <<_ACEOF
int main () { return foo (); }
_ACEOF
@@ -193,7 +193,7 @@
fi
-@@ -23544,14 +23416,7 @@ if test "${glib_cv_has__inline__+set}" =
+@@ -23838,14 +23710,7 @@ if test "${glib_cv_has__inline__+set}" =
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -209,7 +209,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -23562,41 +23427,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23856,41 +23721,33 @@ cat >>conftest.$ac_ext <<_ACEOF
int main () { return foo (); }
_ACEOF
@@ -264,7 +264,7 @@
fi
-@@ -23614,14 +23471,7 @@ if test "${glib_cv_hasinline+set}" = set
+@@ -23908,14 +23765,7 @@ if test "${glib_cv_hasinline+set}" = set
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -280,7 +280,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -23632,41 +23482,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23926,41 +23776,33 @@ cat >>conftest.$ac_ext <<_ACEOF
int main () { return foo (); }
_ACEOF
@@ -336,7 +336,7 @@
fi
Home |
Main Index |
Thread Index |
Old Index