CVS commit: pkgsrc/devel/dconf

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 17 12:28:42 UTC 2018

Modified Files:
        pkgsrc/devel/dconf: Makefile PLIST distinfo

Log Message:
dconf: update to 0.28.0.

Changes in dconf 0.28.0
=======================

 - Update README

Changes in dconf 0.27.1
=======================

 - Port to meson build system (#784910)


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/dconf/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/dconf/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/dconf/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/dconf/Makefile
diff -u pkgsrc/devel/dconf/Makefile:1.40 pkgsrc/devel/dconf/Makefile:1.41
--- pkgsrc/devel/dconf/Makefile:1.40    Tue Apr 17 04:25:31 2018
+++ pkgsrc/devel/dconf/Makefile Tue Apr 17 12:28:41 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2018/04/17 04:25:31 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2018/04/17 12:28:41 wiz Exp $
 
-DISTNAME=      dconf-0.26.1
-PKGREVISION=   2
+DISTNAME=      dconf-0.28.0
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/dconf/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,22 +10,31 @@ HOMEPAGE=   https://wiki.gnome.org/Project
 COMMENT=       Backend for gsettings
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=        docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
 USE_LANGUAGES= c99
-USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config gmake
 
+REPLACE_PYTHON+=       *.py
+
 SUBST_CLASSES+=                sysdir
 SUBST_MESSAGE.sysdir=  Fixes hard-coded dconf database directory name
 SUBST_STAGE.sysdir=    post-configure
 SUBST_FILES.sysdir+=   engine/dconf-engine-source-system.c
 SUBST_FILES.sysdir+=   engine/dconf-engine-profile.c
 SUBST_FILES.sysdir+=   tests/engine.c
-SUBST_FILES.sysdir+=   bin/dconf-update.c
 SUBST_FILES.sysdir+=   bin/dconf-update.vala
 SUBST_SED.sysdir=      -e s,/etc,${PKG_SYSCONFDIR},g
 
-PKGCONFIG_OVERRIDE+=   client/dconf.pc.in
+# gtk-doc wants to run dconf-scan, but that does not find its library libdconf.so.1
+#MESON_ARGS+=          -D enable-gtk-doc=true
+# man option does not work without gtk-doc option
+#MESON_ARGS+=          -D enable-man=true
+
+PKGCONFIG_OVERRIDE=            output/meson-private/dconf.pc
+PKGCONFIG_OVERRIDE_STAGE=      post-build
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -37,13 +45,11 @@ SUBST_FILES.libname+=       gsettings/Makefile
 SUBST_SED.libname=     -e "s|-Wl,-soname=|-install_name ${PREFIX}/lib/|g"
 SUBST_SED.libname+=    -e "/^libdconfsettings_so_LDFLAGS/s,$$, -install_name ${PREFIX}/lib/gio/modules/libdconfsettings.so,g"
 
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+=        docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
 BUILDLINK_DEPMETHOD.vala=      build
-BUILDLINK_API_DEPENDS.vala+=   vala>=0.18.0
 .include "../../lang/vala/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.44.0
+#.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../devel/glib2/modules.mk"
+.include "../../lang/python/application.mk"
+.include "../../devel/py-meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/dconf/PLIST
diff -u pkgsrc/devel/dconf/PLIST:1.9 pkgsrc/devel/dconf/PLIST:1.10
--- pkgsrc/devel/dconf/PLIST:1.9        Wed Oct 11 09:20:00 2017
+++ pkgsrc/devel/dconf/PLIST    Tue Apr 17 12:28:41 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/10/11 09:20:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/04/17 12:28:41 wiz Exp $
 bin/dconf
 include/dconf/client/dconf-client.h
 include/dconf/common/dconf-changeset.h
@@ -11,32 +11,7 @@ lib/libdconf.so.1
 lib/libdconf.so.1.0.0
 lib/pkgconfig/dconf.pc
 libexec/dconf-service
-man/man1/dconf-service.1
-man/man1/dconf.1
-man/man7/dconf.7
 share/bash-completion/completions/dconf
 share/dbus-1/services/ca.desrt.dconf.service
-share/gtk-doc/html/dconf/DConfClient.html
-share/gtk-doc/html/dconf/annotation-glossary.html
-share/gtk-doc/html/dconf/api-index-full.html
-share/gtk-doc/html/dconf/ch01.html
-share/gtk-doc/html/dconf/dconf-DConfChangeset.html
-share/gtk-doc/html/dconf/dconf-DConfError.html
-share/gtk-doc/html/dconf/dconf-dconf-Paths.html
-share/gtk-doc/html/dconf/dconf-overview.html
-share/gtk-doc/html/dconf/dconf-service.html
-share/gtk-doc/html/dconf/dconf-tool.html
-share/gtk-doc/html/dconf/dconf.devhelp2
-share/gtk-doc/html/dconf/home.png
-share/gtk-doc/html/dconf/index.html
-share/gtk-doc/html/dconf/left-insensitive.png
-share/gtk-doc/html/dconf/left.png
-share/gtk-doc/html/dconf/object-tree.html
-share/gtk-doc/html/dconf/programs.html
-share/gtk-doc/html/dconf/right-insensitive.png
-share/gtk-doc/html/dconf/right.png
-share/gtk-doc/html/dconf/style.css
-share/gtk-doc/html/dconf/up-insensitive.png
-share/gtk-doc/html/dconf/up.png
 share/vala/vapi/dconf.deps
 share/vala/vapi/dconf.vapi

Index: pkgsrc/devel/dconf/distinfo
diff -u pkgsrc/devel/dconf/distinfo:1.12 pkgsrc/devel/dconf/distinfo:1.13
--- pkgsrc/devel/dconf/distinfo:1.12    Wed Oct 11 09:20:00 2017
+++ pkgsrc/devel/dconf/distinfo Tue Apr 17 12:28:41 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2017/10/11 09:20:00 wiz Exp $
+$NetBSD: distinfo,v 1.13 2018/04/17 12:28:41 wiz Exp $
 
-SHA1 (dconf-0.26.1.tar.xz) = e8c8b7e86079088661f346a2032d4a53e892a7ea
-RMD160 (dconf-0.26.1.tar.xz) = 4f756c2d1eeb32c6c7d068a08e8ff0f5340e1553
-SHA512 (dconf-0.26.1.tar.xz) = 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
-Size (dconf-0.26.1.tar.xz) = 218516 bytes
+SHA1 (dconf-0.28.0.tar.xz) = e6b10da51df002a1661ce938941770c549cd5b87
+RMD160 (dconf-0.28.0.tar.xz) = 5098b0afadd8613c0e3550d78e4fd5037d876046
+SHA512 (dconf-0.28.0.tar.xz) = bce43c997bd09ef575ffc4ec7a4216543a65996ecb4c7df910b561865a6ed0e0401596a0ba9e72036e26cd526f98e0de99f9c6787b1127594bc13e484983ba74
+Size (dconf-0.28.0.tar.xz) = 99340 bytes