[pkgsrc/trunk]: pkgsrc/devel/dconf Fix OS X build (by skipping tests, not bei...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef224fcf139a
branches:  trunk
changeset: 388466:ef224fcf139a
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Dec 07 20:02:58 2018 +0000

description:
Fix OS X build (by skipping tests, not being offered as TEST_TARGET yet
anyway) and install (by respecting DESTDIR and replacing one more
relative rpath in a binary).

diffstat:

 devel/dconf/Makefile                  |  12 +++++++++---
 devel/dconf/distinfo                  |   3 ++-
 devel/dconf/patches/patch-meson.build |  15 +++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r e77c0254a828 -r ef224fcf139a devel/dconf/Makefile
--- a/devel/dconf/Makefile      Fri Dec 07 17:34:57 2018 +0000
+++ b/devel/dconf/Makefile      Fri Dec 07 20:02:58 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/12/02 07:11:55 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2018/12/07 20:02:58 schmonz Exp $
 
 DISTNAME=      dconf-0.30.1
 CATEGORIES=    devel gnome
@@ -47,13 +47,19 @@
            -change \
            "@rpath/libdconf.1.dylib" \
            "${PREFIX}/lib/libdconf.1.dylib" \
-           ${PREFIX}/lib/libdconf.1.dylib
+           ${DESTDIR}${PREFIX}/lib/libdconf.1.dylib
        install_name_tool \
            -id ${PREFIX}/lib/gio/modules/libdconfsettings.dylib \
            -change \
            "@rpath/libdconfsettings.dylib" \
            "${PREFIX}/gio/modules/libdconfsettings.dylib" \
-           ${PREFIX}/lib/gio/modules/libdconfsettings.dylib
+           ${DESTDIR}${PREFIX}/lib/gio/modules/libdconfsettings.dylib
+       install_name_tool \
+           -id ${PREFIX}/lib/libdconf.dylib \
+           -change \
+           "@rpath/libdconf.1.dylib" \
+           "${PREFIX}/lib/libdconf.1.dylib" \
+           ${DESTDIR}${PREFIX}/bin/dconf
 .endif
 
 BUILDLINK_DEPMETHOD.vala=      build
diff -r e77c0254a828 -r ef224fcf139a devel/dconf/distinfo
--- a/devel/dconf/distinfo      Fri Dec 07 17:34:57 2018 +0000
+++ b/devel/dconf/distinfo      Fri Dec 07 20:02:58 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2018/12/02 07:11:55 wiz Exp $
+$NetBSD: distinfo,v 1.15 2018/12/07 20:02:58 schmonz Exp $
 
 SHA1 (dconf-0.30.1.tar.xz) = 181cdedc20a5ecd2d6e6aab4538ff199b5eaa1f9
 RMD160 (dconf-0.30.1.tar.xz) = c1b65608f36fd8f29a3e5204b95fc5afddd0affc
 SHA512 (dconf-0.30.1.tar.xz) = f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03
 Size (dconf-0.30.1.tar.xz) = 104376 bytes
+SHA1 (patch-meson.build) = 2015b184e88ed797b52152d00e96e45988cf01bf
diff -r e77c0254a828 -r ef224fcf139a devel/dconf/patches/patch-meson.build
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/dconf/patches/patch-meson.build     Fri Dec 07 20:02:58 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-meson.build,v 1.1 2018/12/07 20:02:58 schmonz Exp $
+
+Comment out tests (build broken on OS X, not being offered as
+TEST_TARGET yet anyway).
+
+--- meson.build.orig   2018-10-22 21:53:04.000000000 +0000
++++ meson.build
+@@ -82,6 +82,6 @@ subdir('gsettings')
+ subdir('client')
+ subdir('bin')
+ subdir('docs')
+-subdir('tests')
++# subdir('tests')
+ 
+ meson.add_install_script('meson_post_install.py', gio_module_dir)