Sat Oct 17 09:50:48 2015 UTC ()
fix build on OS X


(tnn)
diff -r1.28 -r1.29 pkgsrc/devel/pkg-config/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/pkg-config/patches/patch-glib_configure
cvs diff -r1.28 -r1.29 pkgsrc/devel/pkg-config/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/pkg-config/distinfo 2015/10/15 09:47:56 1.28
+++ pkgsrc/devel/pkg-config/distinfo 2015/10/17 09:50:48 1.29
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.28 2015/10/15 09:47:56 wiz Exp $ 1$NetBSD: distinfo,v 1.29 2015/10/17 09:50:48 tnn Exp $
2 2
3SHA1 (pkg-config-0.29.tar.gz) = f4b19d203b3896a4293af4b62c7f908063c88a5a 3SHA1 (pkg-config-0.29.tar.gz) = f4b19d203b3896a4293af4b62c7f908063c88a5a
4RMD160 (pkg-config-0.29.tar.gz) = 79036ecce25b2fc74ddf03b93e082d3b70f1e73a 4RMD160 (pkg-config-0.29.tar.gz) = 79036ecce25b2fc74ddf03b93e082d3b70f1e73a
5SHA512 (pkg-config-0.29.tar.gz) = c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c6b38983d48dffb958725e7723f909abbc057c7b34a85c27290eec6943808312a75909306076064aa63 5SHA512 (pkg-config-0.29.tar.gz) = c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c6b38983d48dffb958725e7723f909abbc057c7b34a85c27290eec6943808312a75909306076064aa63
6Size (pkg-config-0.29.tar.gz) = 1973875 bytes 6Size (pkg-config-0.29.tar.gz) = 1973875 bytes
7SHA1 (patch-configure) = 6847644b9df3e3e2334f7c45bcbb2d3b7734d165 7SHA1 (patch-configure) = 6847644b9df3e3e2334f7c45bcbb2d3b7734d165
8SHA1 (patch-glib_configure) = 5411687502079f143a66a045ce20961e85e98789 8SHA1 (patch-glib_configure) = 5080a19186a948ba305278cef91ec76a920429e4
9SHA1 (patch-glib_glib_gtimer.c) = ee877a6c148b148a86f9087960863cfa8305bbf7 9SHA1 (patch-glib_glib_gtimer.c) = ee877a6c148b148a86f9087960863cfa8305bbf7
cvs diff -r1.3 -r1.4 pkgsrc/devel/pkg-config/patches/patch-glib_configure (expand / switch to unified diff)

--- pkgsrc/devel/pkg-config/patches/patch-glib_configure 2015/10/15 09:47:56 1.3
+++ pkgsrc/devel/pkg-config/patches/patch-glib_configure 2015/10/17 09:50:48 1.4
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-glib_configure,v 1.3 2015/10/15 09:47:56 wiz Exp $ 1$NetBSD: patch-glib_configure,v 1.4 2015/10/17 09:50:48 tnn Exp $
2 2
3Fix unportable test construct. 3Fix unportable test construct.
 4Disable Carbon support in the bundled glib. It does not link correctly
 5with the Frameworks and pkg-config should not need any of those features.
4 6
5--- glib/configure.orig 2015-09-27 14:07:16.000000000 +0000 7--- glib/configure.orig 2015-09-27 14:07:16.000000000 +0000
6+++ glib/configure 8+++ glib/configure
7@@ -5885,7 +5885,7 @@ else 9@@ -5298,6 +5298,7 @@ $as_echo_n "checking for Mac OS X Carbon
 10 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 11 /* end confdefs.h. */
 12
 13+#error don't build this
 14 #include <Carbon/Carbon.h>
 15 #include <CoreServices/CoreServices.h>
 16
 17@@ -5885,7 +5886,7 @@ else
8 ENABLE_ALWAYS_BUILD_TESTS_FALSE= 18 ENABLE_ALWAYS_BUILD_TESTS_FALSE=
9 fi 19 fi
10  20
11- if test "$ENABLE_INSTALLED_TESTS" == "1"; then 21- if test "$ENABLE_INSTALLED_TESTS" == "1"; then
12+ if test "$ENABLE_INSTALLED_TESTS" = "1"; then 22+ if test "$ENABLE_INSTALLED_TESTS" = "1"; then
13 installed_test_metadir=${datadir}/installed-tests/glib 23 installed_test_metadir=${datadir}/installed-tests/glib
14  24
15 installed_testdir=${libexecdir}/installed-tests/glib 25 installed_testdir=${libexecdir}/installed-tests/glib