sync ports with The Matrix

sysutils/consolekit/Makefile

@@ -4,7 +4,7 @@ GH_TAGNAME=		1.2.6
 GH_ACCOUNT=		ConsoleKit2
 GH_PROJECT=		ConsoleKit2
 PKGNAME=		${DISTNAME:L}
-REVISION=		0
+REVISION=		2
 
 CATEGORIES=		sysutils	
 
@@ -33,14 +33,18 @@ RUN_DEPENDS +=		x11/dbus,-suid
 CONFIGURE_STYLE=	autoreconf
 CONFIGURE_ARGS=		--disable-pam-module \
 			--disable-libudev \
-			--with-pam-module-dir=${LOCALBASE}/lib/security
+			--with-pam-module-dir=${LOCALBASE}/lib/security \
+
+# needed for 'make check'
+CONFIGURE_ARGS +=	--enable-docbook-docs
 
 DEBUG_PACKAGES=		${BUILD_PACKAGES}
 
 FAKE_FLAGS=		DBUS_SYS_DIR=${TRUEPREFIX}/share/examples/consolekit/dbus-1 \
 			sysconfdir=${TRUEPREFIX}/share/examples/consolekit
 
-BUILD_DEPENDS +=	devel/gettext,-tools
+BUILD_DEPENDS +=	devel/gettext,-tools \
+			textproc/gtk-doc
 AUTORECONF=		./autogen.sh
 AUTOCONF_VERSION=	2.71
 AUTOMAKE_VERSION=	1.16

sysutils/consolekit/patches/patch-autogen_sh

@@ -1,16 +0,0 @@
-configure will pick up gtk-doc even though we pass --disable-gtk-doc and if
-junked by dpb(1) we will error out with:
-aclocal-1.15: error: aclocal: file 'm4/gtk-doc.m4' does not exist
-
-Index: autogen.sh
---- autogen.sh.orig
-+++ autogen.sh
-@@ -10,7 +10,7 @@ test -z "$srcdir" && srcdir=.
-     exit 1
- }
- 
--GTKDOCIZE=$(which gtkdocize 2>/dev/null)
-+#GTKDOCIZE=$(which gtkdocize 2>/dev/null)
- if test -z $GTKDOCIZE; then
-         echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
-         rm -f gtk-doc.make

sysutils/consolekit/pkg/PLIST

@@ -43,6 +43,9 @@ share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
 share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
 share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
 share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
+share/doc/ConsoleKit2/
+share/doc/ConsoleKit2/spec/
+share/doc/ConsoleKit2/spec/ConsoleKit.html
 share/doc/pkg-readmes/${PKGSTEM}
 share/examples/consolekit/
 share/examples/consolekit/ConsoleKit/