[pkgsrc/trunk]: pkgsrc/devel/pkg-config Added a patch so that pkg-config buil...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/efa12d24c6f4
branches:  trunk
changeset: 519501:efa12d24c6f4
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Oct 04 18:48:04 2006 +0000

description:
Added a patch so that pkg-config builds with PKGSRC_RUN_TEST. Fixed a
bug in the configure script and added a comment to patch-aa.

diffstat:

 devel/pkg-config/distinfo         |   7 +++++--
 devel/pkg-config/patches/patch-aa |   5 ++++-
 devel/pkg-config/patches/patch-ac |  15 +++++++++++++++
 devel/pkg-config/patches/patch-ad |  15 +++++++++++++++
 devel/pkg-config/patches/patch-ae |  26 ++++++++++++++++++++++++++
 5 files changed, 65 insertions(+), 3 deletions(-)

diffs (96 lines):

diff -r 37f75dbe17a9 -r efa12d24c6f4 devel/pkg-config/distinfo
--- a/devel/pkg-config/distinfo Wed Oct 04 17:46:01 2006 +0000
+++ b/devel/pkg-config/distinfo Wed Oct 04 18:48:04 2006 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.6 2006/10/01 08:55:32 schwarz Exp $
+$NetBSD: distinfo,v 1.7 2006/10/04 18:48:04 rillig Exp $
 
 SHA1 (pkg-config-0.21.tar.gz) = b2508ba8404cad46ec42f6f58cbca43ae59d715f
 RMD160 (pkg-config-0.21.tar.gz) = 6d48e449a3cedb576c0f54b08825be6ab684d955
 Size (pkg-config-0.21.tar.gz) = 998420 bytes
-SHA1 (patch-aa) = c70e2133db34a6afe1b201a699300becad16c7e7
+SHA1 (patch-aa) = 86e1d0b7e86fe125482533f4f5d41e6b230031b5
 SHA1 (patch-ab) = b4c43bd021cca8b5fc78c268d52e3e96daf6c280
+SHA1 (patch-ac) = a8a4cfa7b6e9052b0c111088c6d8ede810d61752
+SHA1 (patch-ad) = 9000209dc393925bb1750ffacdbb15f0edbf4729
+SHA1 (patch-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
diff -r 37f75dbe17a9 -r efa12d24c6f4 devel/pkg-config/patches/patch-aa
--- a/devel/pkg-config/patches/patch-aa Wed Oct 04 17:46:01 2006 +0000
+++ b/devel/pkg-config/patches/patch-aa Wed Oct 04 18:48:04 2006 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2006/10/01 08:55:32 schwarz Exp $
+$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
diff -r 37f75dbe17a9 -r efa12d24c6f4 devel/pkg-config/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pkg-config/patches/patch-ac Wed Oct 04 18:48:04 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2006/10/04 18:48:04 rillig Exp $
+
+Arbitrary strings should not be passed to "eval".
+
+--- configure.orig     2006-08-16 21:10:18.000000000 +0200
++++ configure  2006-10-04 20:39:13.000000000 +0200
+@@ -19397,7 +19397,7 @@ echo "$as_me:$LINENO: checking whether t
+ echo $ECHO_N "checking whether to list both direct and indirect dependencies... $ECHO_C" >&6
+ case $use_indirect_deps in
+   auto)
+-    deplibs_check_method=`(./libtool --config; echo eval echo \$deplibs_check_method) | sh`
++    deplibs_check_method=`(./libtool --config; echo 'echo "$deplibs_check_method"') | sh`
+     if test "X$deplibs_check_method" = Xnone; then
+     echo "foo: $deplibs_check_method" >&5
+       use_indirect_deps=yes
diff -r 37f75dbe17a9 -r efa12d24c6f4 devel/pkg-config/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pkg-config/patches/patch-ad Wed Oct 04 18:48:04 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2006/10/04 18:48:04 rillig Exp $
+
+see patch-ac.
+
+--- configure.in.orig  2006-08-16 21:09:30.000000000 +0200
++++ configure.in       2006-10-04 20:39:27.000000000 +0200
+@@ -42,7 +42,7 @@ echo use_indirect_deps=$use_indirect_dep
+ AC_MSG_CHECKING([whether to list both direct and indirect dependencies])
+ case $use_indirect_deps in
+   auto)
+-    deplibs_check_method=`(./libtool --config; echo eval echo \$deplibs_check_method) | sh`
++    deplibs_check_method=`(./libtool --config; echo 'echo "$deplibs_check_method"') | sh`
+     if test "X$deplibs_check_method" = Xnone; then
+     echo "foo: $deplibs_check_method" >&AS_MESSAGE_LOG_FD
+       use_indirect_deps=yes
diff -r 37f75dbe17a9 -r efa12d24c6f4 devel/pkg-config/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pkg-config/patches/patch-ae Wed Oct 04 18:48:04 2006 +0000
@@ -0,0 +1,26 @@
+$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