Update to 0.4.6

Changelog:
==============
Version 0.4.6
==============

 NOTE: ConsoleKit is no longer actively maintained and this will most
 likely be the final release. You are advised to switch to logind:
 http://www.freedesktop.org/software/systemd/man/systemd-logind.service.html

 * Don't truncate --frequent output to 8 chars in ck-history (Ray Strode)
 * Import udev-acl tool from udev (Michael Biebl)
 * Add support for GNU/Hurd (Pino Toscano)
 * Build system fixes (Samuli Suominen)

4 files changed, 25 insertions, 26 deletions

diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index f89ec5052cf..6d3ddeabbd4 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2015/06/12 10:51:12 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2015/09/24 23:50:44 ryoon Exp $
 
-CONSOLEKIT_VER=		0.4.5
+CONSOLEKIT_VER=		0.4.6
 DISTNAME=		ConsoleKit-${CONSOLEKIT_VER}
 PKGNAME=		consolekit-${CONSOLEKIT_VER}
-PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.freedesktop.org/software/ConsoleKit/dist/
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freedesktop.org/wiki/Software/ConsoleKit
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
index 2e137c915dc..0d2a03522c3 100644
--- a/sysutils/consolekit/distinfo
+++ b/sysutils/consolekit/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2014/08/17 15:59:07 wiz Exp $
+$NetBSD: distinfo,v 1.11 2015/09/24 23:50:44 ryoon Exp $
 
-SHA1 (ConsoleKit-0.4.5.tar.bz2) = 6f090c1ce0d459dd6904854532554323755bdeca
-RMD160 (ConsoleKit-0.4.5.tar.bz2) = 2eba158e321778a4c17bf765d0106d214b93fe53
-Size (ConsoleKit-0.4.5.tar.bz2) = 425423 bytes
-SHA1 (patch-aa) = baafe5aa4c99279d85edb0e4bc76491e80314950
-SHA1 (patch-ab) = 24036207cc59ccd97f8ed9a53cc588ff94b8c2fe
+SHA1 (ConsoleKit-0.4.6.tar.xz) = bde79a4aa1bf3dc69a8e03731c7eb06e2dbda2d3
+RMD160 (ConsoleKit-0.4.6.tar.xz) = 7140db9e26accde56d672330e7045fafbafe6990
+Size (ConsoleKit-0.4.6.tar.xz) = 366572 bytes
+SHA1 (patch-aa) = 1c637d4ba3dfbb17d141f6b29140cf1d3d42ed7e
+SHA1 (patch-ab) = c32c8f88a0dd87c9b6d4473bf6526c07fb593404
 SHA1 (patch-ac) = 3ef09f16ee039da7cea0c020c2aeccfe5d88c57c
 SHA1 (patch-ad) = c0cf170a85e04e2dadfd490f303a40e8d62cc626
 SHA1 (patch-ae) = dcb689861f8ee425b94a8acf1cb344a782b4328b
diff --git a/sysutils/consolekit/patches/patch-aa b/sysutils/consolekit/patches/patch-aa
index bbaa6133ad8..a2ba70fc634 100644
--- a/sysutils/consolekit/patches/patch-aa
+++ b/sysutils/consolekit/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2014/08/17 15:59:07 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2015/09/24 23:50:44 ryoon Exp $
 
 Add backends for NetBSD, Dragonfly, and OpenBSD.
 
---- configure.ac.orig	2011-02-17 00:37:16.000000000 +0000
+--- configure.ac.orig	2013-07-19 04:24:09.000000000 +0000
 +++ configure.ac
-@@ -190,6 +201,21 @@ case "$host" in
-         *-*-solaris*)
-         CK_BACKEND="solaris"
+@@ -158,6 +158,21 @@ case "$host" in
+         *-*-gnu*)
+         CK_BACKEND="gnu"
          ;;
 +        *-*-netbsd*)
 +        CK_BACKEND="netbsd"
@@ -26,13 +26,13 @@ Add backends for NetBSD, Dragonfly, and OpenBSD.
  	*)
  	AC_MSG_ERROR([No sysdeps back-end implemented for host $host])
  	;;
-@@ -199,7 +225,9 @@ AC_SUBST(KVM_LIBS)
+@@ -167,7 +182,9 @@ AC_SUBST(KVM_LIBS)
  
  AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux])
  AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD])
 +AM_CONDITIONAL(CK_COMPILE_NETBSD, test x$CK_BACKEND = xnetbsd, [Compiling for NetBSD])
  AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris])
 +AM_CONDITIONAL(CK_COMPILE_OPENBSD, test x$CK_BACKEND = xopenbsd, [Compiling for OpenBSD])
+ AM_CONDITIONAL(CK_COMPILE_GNU, test x$CK_BACKEND = xgnu, [Compiling for GNU])
  AC_SUBST(CK_BACKEND)
  
- dnl ---------------------------------------------------------------------------
diff --git a/sysutils/consolekit/patches/patch-ab b/sysutils/consolekit/patches/patch-ab
index aaba25dd497..a43f9be1ffd 100644
--- a/sysutils/consolekit/patches/patch-ab
+++ b/sysutils/consolekit/patches/patch-ab
@@ -1,22 +1,22 @@
-$NetBSD: patch-ab,v 1.3 2014/08/17 15:59:07 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2015/09/24 23:50:44 ryoon Exp $
 
 Add backends for NetBSD and OpenBSD.
 
---- src/Makefile.am.orig	2008-07-25 18:38:56.000000000 +0000
+--- src/Makefile.am.orig	2013-07-19 04:15:28.000000000 +0000
 +++ src/Makefile.am
-@@ -56,11 +56,25 @@ libck_la_SOURCES +=		\
+@@ -63,11 +63,25 @@ libck_la_SOURCES +=		\
  	$(NULL)
- libck_la_LIBADD = $(KVM_LIBS)
+ libck_la_LIBADD = -lps
  endif
 +if CK_COMPILE_NETBSD
-+libck_la_SOURCES +=		\
-+	ck-sysdeps-netbsd.c	\
++libck_la_SOURCES +=            \
++	ck-sysdeps-netbsd.c     \
 +	$(NULL)
 +libck_la_LIBADD = -lkvm
 +endif
 +if CK_COMPILE_OPENBSD
-+libck_la_SOURCES +=		\
-+	ck-sysdeps-openbsd.c	\
++libck_la_SOURCES +=            \
++	ck-sysdeps-openbsd.c    \
 +	$(NULL)
 +libck_la_LIBADD = $(KVM_LIBS)
 +endif
@@ -27,6 +27,6 @@ Add backends for NetBSD and OpenBSD.
  	ck-sysdeps-freebsd.c		\
 +	ck-sysdeps-netbsd.c		\
 +	ck-sysdeps-openbsd.c		\
+ 	ck-sysdeps-gnu.c		\
  	$(NULL)
  
- sbin_PROGRAMS = 		\