Changes 2.6.2:

* Don't output a warning when a p2p connection isn't available.
* Don't distribute dbind-config.h

3 files changed, 21 insertions, 23 deletions

diff --git a/devel/at-spi2-core/Makefile b/devel/at-spi2-core/Makefile
index 15d74c5ed90..7269eac2d83 100644
--- a/devel/at-spi2-core/Makefile
+++ b/devel/at-spi2-core/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2012/10/31 11:16:38 asau Exp $
-#
+# $NetBSD: Makefile,v 1.10 2012/11/13 21:43:16 adam Exp $
 
-DISTNAME=	at-spi2-core-2.6.1
+DISTNAME=	at-spi2-core-2.6.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/at-spi2-core/2.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/at-spi2-core/${PKGVERSION_NOREV:R}//}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	prlw1@cam.ac.uk
@@ -11,30 +10,29 @@ HOMEPAGE=	http://www.linuxfoundation.org/collaborate/workgroups/accessibility/at
 COMMENT=	Assistive Technology Service Provider Interface Core
 LICENSE=	gnu-lgpl-v2
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake intltool msgfmt pkg-config
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-
-PKGCONFIG_OVERRIDE+=	atspi-2.pc.in
-
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 
+PKGCONFIG_OVERRIDE+=	atspi-2.pc.in
+
 BUILD_DEFS+=	VARBASE PKG_SYSCONFBASE
 
-EGDIR=		${PREFIX}/share/examples/at-spi2-core
-PKG_SYSCONFSUBDIR= at-spi2
-busconfigdir=	${PKG_SYSCONFDIR}
+EGDIR=			${PREFIX}/share/examples/at-spi2-core
+PKG_SYSCONFSUBDIR=	at-spi2
+busconfigdir=		${PKG_SYSCONFDIR}
 eg_busconfigdir=	${EGDIR}/at-spi2
-default_sessiondir= ${PKG_SYSCONFBASE}/xdg/autostart
-eg_default_sessiondir= ${EGDIR}/xdg/autostart
+default_sessiondir=	${PKG_SYSCONFBASE}/xdg/autostart
+eg_default_sessiondir=	${EGDIR}/xdg/autostart
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 
 CONF_FILES=	${eg_busconfigdir}/accessibility.conf \
-			${busconfigdir}/accessibility.conf \
-		${eg_default_sessiondir}/at-spi-dbus-bus.desktop \
+			${busconfigdir}/accessibility.conf
+CONF_FILES+=	${eg_default_sessiondir}/at-spi-dbus-bus.desktop \
 			${default_sessiondir}/at-spi-dbus-bus.desktop
 
 .include "../../devel/glib2/buildlink3.mk"
@@ -42,5 +40,4 @@ CONF_FILES=	${eg_busconfigdir}/accessibility.conf \
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/at-spi2-core/PLIST b/devel/at-spi2-core/PLIST
index add4db4993d..8b1cfb1a38a 100644
--- a/devel/at-spi2-core/PLIST
+++ b/devel/at-spi2-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/06/12 17:16:13 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/11/13 21:43:16 adam 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
@@ -122,6 +122,7 @@ share/locale/pt/LC_MESSAGES/at-spi2-core.mo
 share/locale/pt_BR/LC_MESSAGES/at-spi2-core.mo
 share/locale/ro/LC_MESSAGES/at-spi2-core.mo
 share/locale/ru/LC_MESSAGES/at-spi2-core.mo
+share/locale/sk/LC_MESSAGES/at-spi2-core.mo
 share/locale/sl/LC_MESSAGES/at-spi2-core.mo
 share/locale/sq/LC_MESSAGES/at-spi2-core.mo
 share/locale/sr/LC_MESSAGES/at-spi2-core.mo
diff --git a/devel/at-spi2-core/distinfo b/devel/at-spi2-core/distinfo
index 50bbf703d2d..abbeb006600 100644
--- a/devel/at-spi2-core/distinfo
+++ b/devel/at-spi2-core/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2012/10/18 10:12:26 prlw1 Exp $
+$NetBSD: distinfo,v 1.8 2012/11/13 21:43:16 adam Exp $
 
-SHA1 (at-spi2-core-2.6.1.tar.xz) = 3abd83405b19522521a16d7cf196f3482c43e1a0
-RMD160 (at-spi2-core-2.6.1.tar.xz) = 1042f08ee9137ed88e7a22d137a7074ee60a616d
-Size (at-spi2-core-2.6.1.tar.xz) = 443684 bytes
+SHA1 (at-spi2-core-2.6.2.tar.xz) = 5caeb04314edc0befbf680fdc8b0640ca9e85e03
+RMD160 (at-spi2-core-2.6.2.tar.xz) = de00564ed9d5d135515a9eb79a184a8ecddd0501
+Size (at-spi2-core-2.6.2.tar.xz) = 443900 bytes