GConf{,-ui}: update to 3.2.3

3.2.3
=====

Fixes:

    * 662991 - fix assert caused by Ross' incompetence (thanks Vincent Untz)

3.2.2
=====

Fixes:

    * 661372 - Avoid crash when there is no reply to messages in gconf_engine_notify_remove
    * Clean-up ORBit vs DBus logic (Jasper St. Pierre)

3.2.1
=====

Fixes:

    * 659835 - Configuration server couldn't be contacted: D-BUS error: Method
      "Set" with signature "s(ii)" on interface "org.gnome.GConf.Database"
      doesn't exist (Vincent Untz)
    * Build fix for -Werror=format-securiyt (Rico Tzschichholz)

Translations:
    * fi (Tommi Vainikainen), ja (OKANO Takayoshi),
      vi (Nguyễn Thái Ngọc Duy)

3.2.0
=====

Translations:

    * da (Flemming Christensen), hu (Gabor Kelemen),
      eu (Inaki Larranaga Murgoitio), de (Mario Blättermann),
      as (Nilamdyuti Goswami)

3.1.92
======

Fixes:

    * 655954 - allow setting gconf values to the schema defaults (Joey Zheng)

Translations:

    * pt_BR (Antonio Fernandes C. Neto), pa (A S Alam), en_GB (Bruce Cowan),
      ko (Changwoo Ryu), pt (Duarte Loreto), ta (I Felix),
      ja (Jiro Matsuzawa), it (Luca Ferretti), or (Manoj Kumar Giri),
      pl (Piotr Drąg), gu (Sweta Kothari), ast (Xandru Armesto),
      zh_CN (Yinghua Wang), sr sr@latin (Мирослав Николић)

3.1.90
======

Fixes:

  * 656262 - Support for conversion files from user specified and XDG data
    directories (Ryan Lortie)


Translations:

  * ug (Abduxukur Abdurixit), ja (Takayoshi Okano),
    zh_HK zh_TW (Chao-Hsiung Liao), te (Krishnababu K)

3.1.6
=====

Fixes:

    * Fixes on the distcheck fixes
    * 655656 - Use "o" for the D-BUS object path rather than "s" (this changes
      the internal D-BUS API but for now we have a compatability bit that
      should avoid too much pain.)

Misc:

    * DOAP file!

3.1.5
=====

Fixes:

    * gsettings-convert - conver to unsigned int correctly (Kalev Lember)
    * Distcheck fixes
    * 656248 - Handle messages that don't have interface set (Joey Zheng)
    * 654801 - Export pkg-config file and C include details in GIR file
      (Evan Nemerson)

Misc:

    * Autogenerated ChangeLog
    * Update .gitignore

Translations:

    * ru (Yuri Kozlov), fr (Claude Paroz), bg (Alexander Shopov),
      eo (Kristjan SCHMIDT), id (Andika Triwidada),
      th (Theppitak Karoonboonyanan)

3.1.4
=====

* gsettings-data-convert: Call g_type_init()
* ensure_database: don't free the reply til we've finished with its args
* build: Filter out generated corba code when building .gir

And translation updates.


3.1.3
=====
  Features
  - Add optional and disabled by default port to DBus
  Fixes
  - Use the cache when looking for keys we can't have locally
  Translation updates

2.32.5
======

[accidently released with incorrect version, renamed to 3.1.3]

5 files changed, 14 insertions, 33 deletions

diff --git a/devel/GConf-ui/Makefile b/devel/GConf-ui/Makefile
index 217855bab9f..f6978b3bb40 100644
--- a/devel/GConf-ui/Makefile
+++ b/devel/GConf-ui/Makefile
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2017/10/15 23:19:11 prlw1 Exp $
-#
-
-MAKE_JOBS_SAFE=	no
+# $NetBSD: Makefile,v 1.38 2017/11/28 14:33:52 wiz Exp $
 
 .include "../../devel/GConf/Makefile.common"
 
-PKGNAME=	${DISTNAME:S/GConf/GConf-ui/}
-PKGREVISION=	18
+PKGNAME=	GConf-ui-${GCONF_VERSION}
 
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=${GCONF_VERSION}
 
@@ -24,6 +20,5 @@ do-install:
 		${DESTDIR}${PREFIX}/libexec
 
 .include "../../devel/GConf/buildlink3.mk"
-#.include "../../security/policykit/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 66031f53582..782b3991869 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.93 2017/10/15 23:19:10 prlw1 Exp $
+# $NetBSD: Makefile,v 1.94 2017/11/28 14:33:52 wiz Exp $
 
 .include "../../devel/GConf/Makefile.common"
 
-PKGREVISION=		11
-
 CONFIGURE_ARGS+=	--disable-gtk
-CONFIGURE_ARGS+=	ac_cv_header_ldap_h=no
 CONFIGURE_ARGS+=	--disable-defaults-service
-
-CONFLICTS+=	GConf2-[0-9]*
+CONFIGURE_ARGS+=	--with-openldap=no
 
 OWN_DIRS=	${PKG_SYSCONFDIR}/2
 OWN_DIRS+=	${PKG_SYSCONFDIR}/gconf.xml.defaults
@@ -18,14 +14,8 @@ OWN_DIRS+=	${PKG_SYSCONFDIR}/gconf.xml.system
 EGDIR=		${PREFIX}/share/examples/GConf
 CONF_FILES=	${EGDIR}/path ${PKG_SYSCONFDIR}/2/path
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2.32.4
 REPLACE_PYTHON=	gsettings/gsettings-schema-convert
-
-# XXX: We need to use XML_CATALOGS here to register the installed DTD.
-#      But we have to wait until a public identifier is choosen for it.
-
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gconf/schemas
+INSTALLATION_DIRS=	share/gconf/schemas
 
 BUILDLINK_ABI_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../lang/python/application.mk"
diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common
index b3ad6286b1f..685affa01b1 100644
--- a/devel/GConf/Makefile.common
+++ b/devel/GConf/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.21 2017/07/30 22:47:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2017/11/28 14:33:52 wiz Exp $
 #
 # used by devel/GConf/Makefile
 # used by devel/GConf-ui/Makefile
 
-GCONF_VERSION=		2.32.4
+GCONF_VERSION=		3.2.3
 
 DISTNAME=		GConf-${GCONF_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.32/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/3.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -15,8 +15,6 @@ HOMEPAGE=		https://www.gnome.org/projects/gconf/
 COMMENT=		Configuration database system used by GNOME
 LICENSE=		gnu-lgpl-v2
 
-# not ready yet.  .schemas are installed in the depot.
-
 DISTINFO_FILE=		${.CURDIR}/../GConf/distinfo
 FILESDIR=		${.CURDIR}/../GConf/files
 PATCHDIR=		${.CURDIR}/../GConf/patches
@@ -32,7 +30,6 @@ PKG_SYSCONFSUBDIR=	gconf
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-sysconfsubdir=
-CONFIGURE_ARGS+=	--enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.28
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 9504c144ef5..6c61417bf83 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2011/05/13 17:07:27 drochner Exp $
+@comment $NetBSD: PLIST,v 1.33 2017/11/28 14:33:52 wiz Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 bin/gsettings-data-convert
@@ -38,7 +38,6 @@ share/gtk-doc/html/gconf/gconf-gconf-schema.html
 share/gtk-doc/html/gconf/gconf-gconf-sources.html
 share/gtk-doc/html/gconf/gconf-gconf-value.html
 share/gtk-doc/html/gconf/gconf-gconf.html
-share/gtk-doc/html/gconf/gconf.devhelp
 share/gtk-doc/html/gconf/gconf.devhelp2
 share/gtk-doc/html/gconf/home.png
 share/gtk-doc/html/gconf/index.html
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 81e630be133..de9ceee4acd 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2015/11/03 03:27:11 agc Exp $
+$NetBSD: distinfo,v 1.33 2017/11/28 14:33:52 wiz Exp $
 
-SHA1 (GConf-2.32.4.tar.bz2) = 8c53a2b3220cfc058a08638a89fe35e44cfef581
-RMD160 (GConf-2.32.4.tar.bz2) = 8f7aa9fb72deb935546b503b4f8547099be459e3
-SHA512 (GConf-2.32.4.tar.bz2) = f7c60d0e0981a288649d5ab2306d0e1526f993ce7ca9bcccfe3670c1d84c20da477ee48d7cdebcabb366e45a59dda183acb65eccbd2615f5fded74514a0b35b1
-Size (GConf-2.32.4.tar.bz2) = 1531539 bytes
+SHA1 (GConf-3.2.3.tar.bz2) = 3d49d7a82343acf91e87433530bcd3bf7a44b4d6
+RMD160 (GConf-3.2.3.tar.bz2) = 7fcef8e8482d8f9e0fdf99a14c353153ec41d633
+SHA512 (GConf-3.2.3.tar.bz2) = 8d3be4bc042d341fc331b8fcd5a4f1ad83b950690ea73d2af3eb5c0741492317f9d503e648356958b190f7edd699d0f9ea00f84a7d458a9e6a56202b8fefdf07
+Size (GConf-3.2.3.tar.bz2) = 1782011 bytes
 SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
 SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a
 SHA1 (patch-ae) = ec5b872713e3a5aec222ad46e6f24e27fff51a86