Sat Jun 9 02:38:43 2018 UTC ()
Fix linking on Darwin now that dconf uses meson.


(youri)
diff -r1.43 -r1.44 pkgsrc/devel/dconf/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/devel/dconf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/dconf/Makefile 2018/04/18 08:26:42 1.43
+++ pkgsrc/devel/dconf/Makefile 2018/06/09 02:38:43 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.43 2018/04/18 08:26:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2018/06/09 02:38:43 youri Exp $
2 2
3DISTNAME= dconf-0.28.0 3DISTNAME= dconf-0.28.0
4CATEGORIES= devel gnome 4CATEGORIES= devel gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dconf/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dconf/${PKGVERSION_NOREV:R}/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://wiki.gnome.org/Projects/dconf 9HOMEPAGE= https://wiki.gnome.org/Projects/dconf
10COMMENT= Backend for gsettings 10COMMENT= Backend for gsettings
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 13TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
@@ -29,28 +29,37 @@ SUBST_FILES.sysdir+= bin/dconf-update.va @@ -29,28 +29,37 @@ SUBST_FILES.sysdir+= bin/dconf-update.va
29SUBST_SED.sysdir= -e s,/etc,${PKG_SYSCONFDIR},g 29SUBST_SED.sysdir= -e s,/etc,${PKG_SYSCONFDIR},g
30 30
31# gtk-doc wants to run dconf-scan, but that does not find its library libdconf.so.1 31# gtk-doc wants to run dconf-scan, but that does not find its library libdconf.so.1
32# https://bugzilla.gnome.org/show_bug.cgi?id=795348 32# https://bugzilla.gnome.org/show_bug.cgi?id=795348
33#MESON_ARGS+= -D enable-gtk-doc=true 33#MESON_ARGS+= -D enable-gtk-doc=true
34# man option does not work without gtk-doc option 34# man option does not work without gtk-doc option
35#MESON_ARGS+= -D enable-man=true 35#MESON_ARGS+= -D enable-man=true
36 36
37PKGCONFIG_OVERRIDE= output/meson-private/dconf.pc 37PKGCONFIG_OVERRIDE= output/meson-private/dconf.pc
38PKGCONFIG_OVERRIDE_STAGE= post-build 38PKGCONFIG_OVERRIDE_STAGE= post-build
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42SUBST_CLASSES.Darwin+= libname 42post-install:
43SUBST_STAGE.libname= pre-configure 43.if ${OPSYS} == "Darwin"
44SUBST_FILES.libname= client/Makefile.in 44 install_name_tool \
45SUBST_FILES.libname+= gsettings/Makefile.in 45 -id ${PREFIX}/lib/libdconf.dylib \
46SUBST_SED.libname= -e "s|-Wl,-soname=|-install_name ${PREFIX}/lib/|g" 46 -change \
47SUBST_SED.libname+= -e "/^libdconfsettings_so_LDFLAGS/s,$$, -install_name ${PREFIX}/lib/gio/modules/libdconfsettings.so,g" 47 "@rpath/libdconf.1.dylib" \
 48 "${PREFIX}/lib/libdconf.1.dylib" \
 49 ${PREFIX}/lib/libdconf.1.dylib
 50 install_name_tool \
 51 -id ${PREFIX}/lib/gio/modules/libdconfsettings.dylib \
 52 -change \
 53 "@rpath/libdconfsettings.dylib" \
 54 "${PREFIX}/gio/modules/libdconfsettings.dylib" \
 55 ${PREFIX}/lib/gio/modules/libdconfsettings.dylib
 56.endif
48 57
49BUILDLINK_DEPMETHOD.vala= build 58BUILDLINK_DEPMETHOD.vala= build
50.include "../../lang/vala/buildlink3.mk" 59.include "../../lang/vala/buildlink3.mk"
51BUILDLINK_API_DEPENDS.glib2+= glib2>=2.44.0 60BUILDLINK_API_DEPENDS.glib2+= glib2>=2.44.0
52#.include "../../textproc/gtk-doc/buildlink3.mk" 61#.include "../../textproc/gtk-doc/buildlink3.mk"
53.include "../../devel/glib2/modules.mk" 62.include "../../devel/glib2/modules.mk"
54.include "../../devel/py-meson/build.mk" 63.include "../../devel/py-meson/build.mk"
55.include "../../lang/python/application.mk" 64.include "../../lang/python/application.mk"
56.include "../../mk/bsd.pkg.mk" 65.include "../../mk/bsd.pkg.mk"