Import of pkgsrc-2016Q3

sysutils/dbus/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.88 2015/09/23 06:56:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.101 2016/08/22 13:35:36 wiz Exp $
 
-DISTNAME=	dbus-1.10.0
-PKGREVISION=	1
+DISTNAME=	dbus-1.10.10
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -13,13 +12,15 @@ LICENSE=	gnu-gpl-v2
 CONFLICTS+=	dbus-glib<0.71
 CONFLICTS+=	py27-dbus<0.71
 
+BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
 
 PKGCONFIG_OVERRIDE=	dbus-1.pc.in
 
-BUILD_DEFS+=		VARBASE
+BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE
 
 OWN_DIRS_PERMS+=	${VARBASE}/db/dbus ${DBUS_USER} ${DBUS_GROUP} 0755
 SPECIAL_PERMS+=		libexec/dbus-daemon-launch-helper ${REAL_ROOT_USER} ${DBUS_GROUP} 4511
@@ -33,13 +34,9 @@ MESSAGE_SRC+=	MESSAGE
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 
-CONFIGURE_ARGS_GROUPS=	enable disable with without
-
-.if ${OPSYS} == "Darwin"
 # Prevent the configure script from picking up a per-user tmp
 # directory. See the commit message on revision 1.35
 CONFIGURE_ARGS+=	--with-session-socket-dir=/tmp
-.endif
 
 CONFIGURE_ARGS+=	--without-init-scripts
 CONFIGURE_ARGS+=	--disable-ansi
@@ -70,9 +67,9 @@ CONFIGURE_ARGS+=	--disable-selinux
 
 PLIST_VARS+=    	linux launchd
 
-DBUS_CONF_DIR+=		${PKG_SYSCONFBASE}/dbus-1
-OWN_DIRS+=		${DBUS_CONF_DIR}/services 
-OWN_DIRS+=		${DBUS_CONF_DIR}/system-services 
+DBUS_CONF_DIR=		${PKG_SYSCONFBASE}/dbus-1
+OWN_DIRS+=		${DBUS_CONF_DIR}/services
+OWN_DIRS+=		${DBUS_CONF_DIR}/system-services
 OWN_DIRS+=		${DBUS_CONF_DIR}/session.d
 OWN_DIRS+=		${DBUS_CONF_DIR}/system.d
 
@@ -95,19 +92,15 @@ BUILDLINK_TRANSFORM+=	rm:-Wl,--gc-sections
 BUILDLINK_TRANSFORM+=	rm:-fPIE
 BUILDLINK_TRANSFORM+=	rm:-pie
 
-.if ${OPSYS} == "OpenBSD"
-BUILDLINK_TRANSFORM+=	rm:-lrt
-.endif
+BUILDLINK_TRANSFORM.OpenBSD+=	rm:-lrt
 
 .include "options.mk"
 
-BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/introspect.* \
 		${DESTDIR}${PREFIX}/share/doc/dbus/
-	${RM} ${DESTDIR}${PREFIX}/etc/dbus-1/s*.conf
-	${RMDIR} ${DESTDIR}${PREFIX}/etc/dbus-1
+	${RM} -f ${DESTDIR}${PREFIX}/etc/dbus-1/s*.conf
+	${RMDIR} ${DESTDIR}${PREFIX}/etc/dbus-1 || ${TRUE}
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

sysutils/dbus/distinfo

@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.66 2015/08/30 15:08:00 wiz Exp $
+$NetBSD: distinfo,v 1.75 2016/08/22 13:35:36 wiz Exp $
 
-SHA1 (dbus-1.10.0.tar.gz) = eec3c798633f623e960eb1d9f93b47648f389443
-RMD160 (dbus-1.10.0.tar.gz) = 2a70f98a1af157bea71daac5402b85f9b1770cde
-Size (dbus-1.10.0.tar.gz) = 2018754 bytes
-SHA1 (patch-ak) = 9f84b015ae706ebfe8230fe315a92c6960a84a60
-SHA1 (patch-al) = 08d49257c3eea7b6ae0a3fe2682dba977ba06951
-SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
+SHA1 (dbus-1.10.10.tar.gz) = f1236d1e7ab7ff26c704fa0069c7b50d3c8f0a4b
+RMD160 (dbus-1.10.10.tar.gz) = 178eada54957780857792bc37233af4c953b8843
+SHA512 (dbus-1.10.10.tar.gz) = 8875c43d1f100461c3482a247f1a9d3ffd4377ae81e97676e0111d57f0393d53beeebb965c8a06054bf3af1ae4c72e1e456fdbc42c7ababc4e153e5ce7c23489
+Size (dbus-1.10.10.tar.gz) = 1984077 bytes
+SHA1 (patch-ak) = ebb0c291297577a9cff246e7bc71412bf6157254
+SHA1 (patch-al) = c70be84ae79698cc4d83087427646bfb0500f194
+SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4
 SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c
+SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec

sysutils/dbus/files/dbus.sh

@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbus.sh,v 1.9 2008/10/11 19:58:24 markd Exp $
+# $NetBSD: dbus.sh,v 1.10 2016/05/22 23:02:24 youri Exp $
 #
 # PROVIDE: dbus
 # REQUIRE: DAEMON
@@ -11,7 +11,7 @@
 name="dbus"
 rcvar=$name
 command="@PREFIX@/bin/dbus-daemon"
-command_args="--system"
+command_args="--system --fork"
 pidfile="@VARBASE@/run/dbus/pid"
 start_precmd=dbus_prestart
 

sysutils/dbus/files/smf/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type='manifest' name='@SMF_NAME@'>
+<service_bundle type='manifest' name='export'>
   <service
 	name='@SMF_PREFIX@/@SMF_NAME@'
 	type='service'
@@ -32,7 +32,6 @@
 		<propval name='ignore_error' type='astring'
 		    value='core,signal' />
 	</property_group>
-	<stability value='Unstable' />
 	<template>
 		<common_name>
 			<loctext xml:lang='C'>
@@ -40,7 +39,7 @@
 			</loctext>
 		</common_name>
 		<documentation>
-			<manpage title='dbus-daemon' section='1' />
+			<manpage title='dbus-daemon' section='1' manpath='@PREFIX@/@PKGMANDIR@'/>
 		</documentation>
 	</template>
   </service>

sysutils/dbus/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2015/09/07 23:24:46 gdt Exp $
+# $NetBSD: options.mk,v 1.10 2016/02/26 10:24:12 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbus
 PKG_SUPPORTED_OPTIONS+=	debug x11
@@ -13,11 +13,9 @@ PKG_SUPPORTED_OPTIONS+=	kqueue
 PKG_SUGGESTED_OPTIONS+=	kqueue
 .endif
 
-.if ${OPSYS} == "Darwin"
 # We may want to make it SUGGESTED once we have a framework for
 # launchd support. See PR/49591.
-PKG_SUPPORTED_OPTIONS+=	launchd
-.endif
+PKG_SUPPORTED_OPTIONS.Darwin+=	launchd
 
 .include "../../mk/bsd.options.mk"
 

sysutils/dbus/patches/patch-ak

@@ -1,4 +1,6 @@
-$NetBSD: patch-ak,v 1.4 2015/08/30 15:08:00 wiz Exp $
+$NetBSD: patch-ak,v 1.5 2015/12/06 11:35:55 wiz Exp $
+
+Adapt path for pkgsrc.
 
 --- dbus/Makefile.in.orig	2015-08-25 15:52:09.000000000 +0000
 +++ dbus/Makefile.in

sysutils/dbus/patches/patch-al

@@ -1,4 +1,6 @@
-$NetBSD: patch-al,v 1.4 2015/07/26 22:51:23 wiz Exp $
+$NetBSD: patch-al,v 1.5 2015/12/06 11:35:55 wiz Exp $
+
+Adapt path for pkgsrc.
 
 --- tools/Makefile.in.orig	2015-07-21 16:32:32.000000000 +0000
 +++ tools/Makefile.in

sysutils/dbus/patches/patch-am

@@ -1,4 +1,19 @@
-$NetBSD: patch-am,v 1.1 2008/11/15 03:59:10 chuck Exp $
+$NetBSD: patch-am,v 1.2 2015/12/06 11:35:55 wiz Exp $
+
+on darwin configure script picks up private per-user tmp directory
+in /var/folders/xx/...+++... via the TMPDIR environment and cheerfully
+installs it in /usr/pkg/etc/dbus-1/session.conf meaning that only the
+user who installed the package will be able to write to that directory...
+except that dbus rejects directories with "+"'s in the filename so it
+won't work anyway.   use configure --with-session-socket-dir=/tmp
+to work around this.   found a description of this issue here:
+http://wiki.gnucash.org/wiki/MacOSX/Quartz in the
+"Running from the commandline" section.
+
+dbus also cannot cope with $DISPLAY containing "/" chars (like in
+darwin ... /tmp/launch-kcvznx/:0 ) so get rid of the ":" as described
+here:
+ https://trac.macports.org/attachment/ticket/16833/patch-dbus-launch-x11.c.diff
 
 --- tools/dbus-launch-x11.c.orig	2008-11-14 22:45:04.000000000 -0500
 +++ tools/dbus-launch-x11.c	2008-11-14 22:45:44.000000000 -0500

sysutils/dbus/patches/patch-tools_dbus-print-message.c

@@ -0,0 +1,16 @@
+$NetBSD: patch-tools_dbus-print-message.c,v 1.2 2015/12/06 11:35:55 wiz Exp $
+
+Fix build on NetBSD 5.x and 6.x.
+
+--- tools/dbus-print-message.c.orig	2015-10-07 20:10:37.000000000 +0000
++++ tools/dbus-print-message.c
+@@ -30,6 +30,9 @@
+ #include <sys/un.h>
+ #include <unistd.h>
+ #include <netinet/in.h>
++#ifdef __NetBSD__
++#include <netinet/in_systm.h>
++#endif
+ #include <netinet/ip.h>
+ #include <arpa/inet.h>
+ #endif