Fix build.

Before, at-spi2-core installed accessibility.conf in $(sysconfdir)/at-spi2,
so we used the CONF_FILES mechanism to place it in
share/examples/at-spi2-core/at-spi2, so the administrator can make local
adjustments.

Now, at-spi2-core works with sensible defaults without an
accessibility.conf file, and places it in $(datadir)/defaults/at-spi2,
essentially to be used as an example.

Choose to revert to the old behaviour.

3 files changed, 45 insertions, 4 deletions

diff --git a/devel/at-spi2-core/PLIST b/devel/at-spi2-core/PLIST
index a62540252ff..5325e206bb2 100644
--- a/devel/at-spi2-core/PLIST
+++ b/devel/at-spi2-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/06/10 23:12:07 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.11 2016/04/10 22:38:02 prlw1 Exp $
 include/at-spi-2.0/atspi/atspi-accessible.h
 include/at-spi-2.0/atspi/atspi-action.h
 include/at-spi-2.0/atspi/atspi-application.h
@@ -34,10 +34,11 @@ include/at-spi-2.0/atspi/atspi.h
 lib/girepository-1.0/Atspi-2.0.typelib
 lib/libatspi.la
 lib/pkgconfig/atspi-2.pc
+lib/systemd/user/at-spi-dbus-bus.service
 libexec/at-spi-bus-launcher
 libexec/at-spi2-registryd
-share/dbus-1/services/org.a11y.Bus.service
 share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
+share/dbus-1/services/org.a11y.Bus.service
 share/examples/at-spi2-core/at-spi2/accessibility.conf
 share/examples/at-spi2-core/xdg/autostart/at-spi-dbus-bus.desktop
 share/gir-1.0/Atspi-2.0.gir
@@ -54,7 +55,6 @@ share/gtk-doc/html/libatspi/api-index-full.html
 share/gtk-doc/html/libatspi/ch01.html
 share/gtk-doc/html/libatspi/home.png
 share/gtk-doc/html/libatspi/index.html
-share/gtk-doc/html/libatspi/index.sgml
 share/gtk-doc/html/libatspi/left-insensitive.png
 share/gtk-doc/html/libatspi/left.png
 share/gtk-doc/html/libatspi/libatspi-AtspiApplication.html
@@ -126,6 +126,7 @@ share/locale/mr/LC_MESSAGES/at-spi2-core.mo
 share/locale/ms/LC_MESSAGES/at-spi2-core.mo
 share/locale/nb/LC_MESSAGES/at-spi2-core.mo
 share/locale/nl/LC_MESSAGES/at-spi2-core.mo
+share/locale/oc/LC_MESSAGES/at-spi2-core.mo
 share/locale/or/LC_MESSAGES/at-spi2-core.mo
 share/locale/pa/LC_MESSAGES/at-spi2-core.mo
 share/locale/pl/LC_MESSAGES/at-spi2-core.mo
diff --git a/devel/at-spi2-core/distinfo b/devel/at-spi2-core/distinfo
index ad7c031565f..3be347a51b7 100644
--- a/devel/at-spi2-core/distinfo
+++ b/devel/at-spi2-core/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2016/04/10 18:59:27 prlw1 Exp $
+$NetBSD: distinfo,v 1.18 2016/04/10 22:38:02 prlw1 Exp $
 
 SHA1 (at-spi2-core-2.20.0.tar.xz) = b5360afbec2ff000c86db1ee6bf152160536e30d
 RMD160 (at-spi2-core-2.20.0.tar.xz) = 87a29c3e07b9449042e6a1ab86f24560b57bafd8
 SHA512 (at-spi2-core-2.20.0.tar.xz) = 316d721f18904115663c9a64ae4138f4f49e3d2b4fed1fbb317b2f1131b10ff018acd4f62f58985c41563f819f788d5fc5e615c698b1ecfc68edd3817d6b2538
 Size (at-spi2-core-2.20.0.tar.xz) = 452664 bytes
+SHA1 (patch-bus_Makefile.in) = 3c70c0493f081125f80c758c47724d96a4d45222
diff --git a/devel/at-spi2-core/patches/patch-bus_Makefile.in b/devel/at-spi2-core/patches/patch-bus_Makefile.in
new file mode 100644
index 00000000000..1955efbb82a
--- /dev/null
+++ b/devel/at-spi2-core/patches/patch-bus_Makefile.in
@@ -0,0 +1,39 @@
+$NetBSD: patch-bus_Makefile.in,v 1.1 2016/04/10 22:38:02 prlw1 Exp $
+
+Revert commit 2ef00769:
+
+    Support a stateless configuration by default
+    
+    Using a stateless configuration, we ship sensible defaults in
+    our vendor-config file to live in the /usr/share/ filesystem,
+    which is considered to be provided by the vendor, and to all
+    intents and purposes, read-only.
+    
+    With this change we can fall-back to the vendor system
+    configuration to always do the right thing, in the absence of
+    a local system administrator configuration file in the /etc/
+    tree.
+    
+    Notably, this saves users from the potential risks and pitfalls
+    of so called "three way merges" on upgrades, and offers the
+    immediate benefit that one can perform a factory reset of the
+    software, simply by removing the relevant file in /etc/.
+    
+    This change also resolves a memory leak in the launch code,
+    where a string allocation was entirely unnecessary.
+
+The above change essentially uses $(datadir)/defaults/at-spi2 the
+way we use the examples directory, so stick to using the pkgsrc
+CONF_FILES mechanism.
+
+--- bus/Makefile.in.orig	2016-04-10 22:03:15.171286587 +0000
++++ bus/Makefile.in
+@@ -403,7 +403,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ CLEANFILES = at-spi-dbus-bus.desktop
+-busconfigdir = $(datadir)/defaults/at-spi2
++busconfigdir = $(sysconfdir)/at-spi2
+ busconfig_DATA = accessibility.conf
+ at_spi_bus_launcher_SOURCES = at-spi-bus-launcher.c
+ at_spi_bus_launcher_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \