[Midnightbsd-cvs] mports [23410] trunk/devel/dconf: update dconf

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun May 6 21:24:34 EDT 2018 

Revision: 23410
          http://svnweb.midnightbsd.org/mports/?rev=23410
Author:   laffer1
Date:     2018-05-06 21:24:33 -0400 (Sun, 06 May 2018)
Log Message:
-----------
update dconf

Modified Paths:
--------------
    trunk/devel/dconf/Makefile
    trunk/devel/dconf/distinfo
    trunk/devel/dconf/files/patch-docs_Makefile.in
    trunk/devel/dconf/pkg-descr
    trunk/devel/dconf/pkg-plist

Removed Paths:
-------------
    trunk/devel/dconf/files/patch-editor_Makefile.in

Modified: trunk/devel/dconf/Makefile
===================================================================
--- trunk/devel/dconf/Makefile	2018-05-06 23:29:58 UTC (rev 23409)
+++ trunk/devel/dconf/Makefile	2018-05-07 01:24:33 UTC (rev 23410)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
-PORTNAME?=	dconf
-PORTVERSION=	0.22.0
-PORTREVISION?=	1
+PORTNAME=	dconf
+PORTVERSION=	0.26.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DISTNAME=	dconf-${PORTVERSION}
@@ -11,52 +10,36 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Configuration database system for GNOME
 
-LICENSE=	lgpl
+LICENSE=	lgpl2.1
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vala>=0.18.1:${PORTSDIR}/lang/vala \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS=	vala>=0.18.1:lang/vala \
+		docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
-USE_GNOME=	glib20 intltool
+PORTSCOUT=	limitw:1,even
+
+USES=		gettext gmake gnome localbase pathfix pkgconfig tar:xz
+USE_GNOME=	glib20 libxslt:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
-DCONF_SLAVE?=	no
-
-.if ${DCONF_SLAVE} == editor
-USE_GNOME+=	gtk30
-INSTALLS_ICONS=	yes
-GLIB_SCHEMAS=	ca.desrt.dconf-editor.gschema.xml
-LIB_DEPENDS+=	libdconf.so:${PORTSDIR}/devel/dconf
-.else
-CONFIGURE_ARGS+=--disable-editor
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
+		-e 's|"/etc"|"${PREFIX}/etc"|g' \
 		${WRKSRC}/engine/dconf-engine.c \
 		${WRKSRC}/engine/dconf-engine-profile.c \
 		${WRKSRC}/engine/dconf-engine-source-system.c \
 		${WRKSRC}/bin/dconf-update.c \
 		${WRKSRC}/tests/engine.c
-	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
-		${WRKSRC}/editor/dconf-model.c
-	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
-		${WRKSRC}/editor/dconf-model.vala
 	@${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
 		${WRKSRC}/bin/Makefile.in \
-		${WRKSRC}/client/Makefile.in \
-		${WRKSRC}/editor/Makefile.in
+		${WRKSRC}/client/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/docs/Makefile.in
 
-.if ${DCONF_SLAVE} == no
 post-install:
-	@${MKDIR} ${PREFIX}/etc/dconf/db
-	@${MKDIR} ${PREFIX}/etc/dconf/profile
-.endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/db
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/profile
 
 .include <bsd.port.mk>

Modified: trunk/devel/dconf/distinfo
===================================================================
--- trunk/devel/dconf/distinfo	2018-05-06 23:29:58 UTC (rev 23409)
+++ trunk/devel/dconf/distinfo	2018-05-07 01:24:33 UTC (rev 23410)
@@ -1,2 +1,3 @@
-SHA256 (gnome3/dconf-0.22.0.tar.xz) = 0a277cb0c3f09e77d9413c5a9b3577fc2b5d6e941b59b44940392e024a224b8e
-SIZE (gnome3/dconf-0.22.0.tar.xz) = 393260
+TIMESTAMP = 1507232441
+SHA256 (gnome3/dconf-0.26.1.tar.xz) = d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535
+SIZE (gnome3/dconf-0.26.1.tar.xz) = 218516

Modified: trunk/devel/dconf/files/patch-docs_Makefile.in
===================================================================
--- trunk/devel/dconf/files/patch-docs_Makefile.in	2018-05-06 23:29:58 UTC (rev 23409)
+++ trunk/devel/dconf/files/patch-docs_Makefile.in	2018-05-07 01:24:33 UTC (rev 23410)
@@ -1,6 +1,6 @@
---- docs/Makefile.in.bak	2014-09-05 12:17:30.648164095 +0200
-+++ docs/Makefile.in	2014-09-05 12:17:30.689163669 +0200
-@@ -938,13 +938,13 @@
+--- docs/Makefile.in.orig	2017-10-03 13:54:54 UTC
++++ docs/Makefile.in
+@@ -920,13 +920,13 @@ dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-loc
  .PHONY : dist-hook-local docs
  
  %.1: %.xml

Deleted: trunk/devel/dconf/files/patch-editor_Makefile.in
===================================================================
--- trunk/devel/dconf/files/patch-editor_Makefile.in	2018-05-06 23:29:58 UTC (rev 23409)
+++ trunk/devel/dconf/files/patch-editor_Makefile.in	2018-05-07 01:24:33 UTC (rev 23410)
@@ -1,20 +0,0 @@
---- editor/Makefile.orig.in	2013-03-26 19:20:12.623348896 +0000
-+++ editor/Makefile.in	2013-03-26 19:21:40.077341977 +0000
-@@ -72,7 +72,7 @@
- 	dconf_editor-dconf-view.$(OBJEXT)
- dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
- am__DEPENDENCIES_1 =
--dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
-+dconf_editor_DEPENDENCIES = -ldconf \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
-@@ -297,7 +297,7 @@
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client
- dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
- dconf_editor_LDADD = \
--	../client/libdconf.so.1		\
-+	 -ldconf			\
- 	$(gtk_LIBS)			\
- 	$(gee_LIBS)			\
- 	$(gmodule_LIBS)			\

Modified: trunk/devel/dconf/pkg-descr
===================================================================
--- trunk/devel/dconf/pkg-descr	2018-05-06 23:29:58 UTC (rev 23409)
+++ trunk/devel/dconf/pkg-descr	2018-05-07 01:24:33 UTC (rev 23410)
@@ -15,4 +15,4 @@
     * Proper locking so that configuration data doesn't get corrupted
       when accessed by multiple applications at the same time.
 
-WWW: http://live.gnome.org/dconf
+WWW: https://wiki.gnome.org/Projects/dconf

Modified: trunk/devel/dconf/pkg-plist
===================================================================
--- trunk/devel/dconf/pkg-plist	2018-05-06 23:29:58 UTC (rev 23409)
+++ trunk/devel/dconf/pkg-plist	2018-05-07 01:24:33 UTC (rev 23410)
@@ -1,8 +1,7 @@
 bin/dconf
 include/dconf/client/dconf-client.h
 include/dconf/common/dconf-changeset.h
-include/dconf/common/dconf-error.h
-include/dconf-dbus-1/dconf-dbus-1.h
+include/dconf/common/dconf-enums.h
 include/dconf/common/dconf-paths.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
@@ -9,101 +8,38 @@
 lib/libdconf.so
 lib/libdconf.so.1
 lib/libdconf.so.1.0.0
-lib/libdconf-dbus-1.so
-lib/libdconf-dbus-1.so.0
-lib/libdconf-dbus-1.so.0.0.0
 libdata/pkgconfig/dconf.pc
-libdata/pkgconfig/dconf-dbus-1.pc
 libexec/dconf-service
-man/man1/dconf-editor.1.gz
 man/man1/dconf-service.1.gz
 man/man1/dconf.1.gz
 man/man7/dconf.7.gz
 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-editor.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/programs.html
-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.devhelp2
 share/gtk-doc/html/dconf/home.png
 share/gtk-doc/html/dconf/index.html
-share/gtk-doc/html/dconf/index.sgml
 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/locale/an/LC_MESSAGES/dconf.mo
-share/locale/ar/LC_MESSAGES/dconf.mo
-share/locale/as/LC_MESSAGES/dconf.mo
-share/locale/be/LC_MESSAGES/dconf.mo
-share/locale/bg/LC_MESSAGES/dconf.mo
-share/locale/bn_IN/LC_MESSAGES/dconf.mo
-share/locale/ca/LC_MESSAGES/dconf.mo
-share/locale/ca at valencia/LC_MESSAGES/dconf.mo
-share/locale/cs/LC_MESSAGES/dconf.mo
-share/locale/da/LC_MESSAGES/dconf.mo
-share/locale/de/LC_MESSAGES/dconf.mo
-share/locale/el/LC_MESSAGES/dconf.mo
-share/locale/en_GB/LC_MESSAGES/dconf.mo
-share/locale/eo/LC_MESSAGES/dconf.mo
-share/locale/es/LC_MESSAGES/dconf.mo
-share/locale/et/LC_MESSAGES/dconf.mo
-share/locale/eu/LC_MESSAGES/dconf.mo
-share/locale/fa/LC_MESSAGES/dconf.mo
-share/locale/fi/LC_MESSAGES/dconf.mo
-share/locale/fr/LC_MESSAGES/dconf.mo
-share/locale/fur/LC_MESSAGES/dconf.mo
-share/locale/gl/LC_MESSAGES/dconf.mo
-share/locale/he/LC_MESSAGES/dconf.mo
-share/locale/hi/LC_MESSAGES/dconf.mo
-share/locale/hu/LC_MESSAGES/dconf.mo
-share/locale/id/LC_MESSAGES/dconf.mo
-share/locale/it/LC_MESSAGES/dconf.mo
-share/locale/ja/LC_MESSAGES/dconf.mo
-share/locale/ko/LC_MESSAGES/dconf.mo
-share/locale/lt/LC_MESSAGES/dconf.mo
-share/locale/lv/LC_MESSAGES/dconf.mo
-share/locale/ml/LC_MESSAGES/dconf.mo
-share/locale/mr/LC_MESSAGES/dconf.mo
-share/locale/nb/LC_MESSAGES/dconf.mo
-share/locale/nl/LC_MESSAGES/dconf.mo
-share/locale/pa/LC_MESSAGES/dconf.mo
-share/locale/pl/LC_MESSAGES/dconf.mo
-share/locale/pt/LC_MESSAGES/dconf.mo
-share/locale/pt_BR/LC_MESSAGES/dconf.mo
-share/locale/ru/LC_MESSAGES/dconf.mo
-share/locale/sk/LC_MESSAGES/dconf.mo
-share/locale/sl/LC_MESSAGES/dconf.mo
-share/locale/sr/LC_MESSAGES/dconf.mo
-share/locale/sr at latin/LC_MESSAGES/dconf.mo
-share/locale/sv/LC_MESSAGES/dconf.mo
-share/locale/ta/LC_MESSAGES/dconf.mo
-share/locale/te/LC_MESSAGES/dconf.mo
-share/locale/tg/LC_MESSAGES/dconf.mo
-share/locale/th/LC_MESSAGES/dconf.mo
-share/locale/tr/LC_MESSAGES/dconf.mo
-share/locale/ug/LC_MESSAGES/dconf.mo
-share/locale/uk/LC_MESSAGES/dconf.mo
-share/locale/vi/LC_MESSAGES/dconf.mo
-share/locale/zh_CN/LC_MESSAGES/dconf.mo
-share/locale/zh_HK/LC_MESSAGES/dconf.mo
-share/locale/zh_TW/LC_MESSAGES/dconf.mo
 share/vala/vapi/dconf.deps
 share/vala/vapi/dconf.vapi
- at dir etc/dconf/db
- at dir etc/dconf/profile
- at exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
- at unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+ at dir %%ETCDIR%%/db
+ at dir %%ETCDIR%%/profile
+ at postexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+ at postunexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true

More information about the Midnightbsd-cvs mailing list