Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2015/05/14 17:21:06 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2015/09/23 06:56:57 ryoon Exp $

-DISTNAME=	dbus-1.8.18
+DISTNAME=	dbus-1.10.0
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/

@@ -31,24 +32,22 @@ MESSAGE_SRC+=	MESSAGE
 .include "../../mk/bsd.prefs.mk"

 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR: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
+CONFIGURE_ARGS+=	--with-session-socket-dir=/tmp
 .endif

-CONFIGURE_ARGS.Linux=	abstract-sockets selinux
-CONFIGURE_ARGS.docs=	doxygen-docs xml-docs
+CONFIGURE_ARGS+=	--without-init-scripts
+CONFIGURE_ARGS+=	--disable-ansi
+CONFIGURE_ARGS+=	--disable-console-owner-file
+CONFIGURE_ARGS+=	--disable-doxygen-docs
+CONFIGURE_ARGS+=	--enable-checks
+CONFIGURE_ARGS+=	--enable-static

-CONFIGURE_ARGS.without+=	init-scripts
-CONFIGURE_ARGS.disable+=	ansi
-CONFIGURE_ARGS.disable+=	console-owner-file
-CONFIGURE_ARGS.disable+=	${CONFIGURE_ARGS.docs}
-CONFIGURE_ARGS.enable+=		checks static
 ###
 ### XXX the spawn test hangs, and some of these tests may be bogus
 ###
@@ -57,34 +56,25 @@ CONFIGURE_ARGS.enable+=		checks static
 #TEST_TARGET=			check
 #.endif

-CONFIGURE_ARGS.with+=	dbus-user=${DBUS_USER}
-CONFIGURE_ARGS.with+=	test-socket-dir=${WRKDIR:Q}
+CONFIGURE_ARGS+=	--with-dbus-user=${DBUS_USER}
+CONFIGURE_ARGS+=	--with-test-socket-dir=${WRKDIR:Q}

 PTHREAD_AUTO_VARS=	yes

 .if ${OPSYS} == "Linux"
 PLIST.linux=		yes
 .else
-CONFIGURE_ARGS.disable+=\
-			${CONFIGURE_ARGS.Linux}
+CONFIGURE_ARGS+=	--disable-abstract-sockets
+CONFIGURE_ARGS+=	--disable-selinux
 .endif

 PLIST_VARS+=    	linux launchd

-CONFIGURE_ARGS+=\
-	${CONFIGURE_ARGS_GROUPS:@.g.@			\
-		${CONFIGURE_ARGS.${.g.}:@.a.@		\
-			--${.g.}-${.a.}			\
-		@}					\
-	@:M*}
-
-MAKE_DIRS=		${PKG_SYSCONFDIR}/dbus-1/event.d
-MAKE_DIRS+=		${PKG_SYSCONFDIR}/dbus-1/system.d
-MAKE_DIRS+=		${PKG_SYSCONFDIR}/dbus-1/session.d
-
-EGDIR=			${PREFIX}/share/examples/dbus
-CONF_FILES=	${EGDIR}/session.conf ${PKG_SYSCONFDIR}/dbus-1/session.conf
-CONF_FILES+=	${EGDIR}/system.conf ${PKG_SYSCONFDIR}/dbus-1/system.conf
+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

 RCD_SCRIPTS=		dbus

@@ -111,6 +101,14 @@ BUILDLINK_TRANSFORM+=	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
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
--- a/sysutils/dbus/PLIST
+++ b/sysutils/dbus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2015/01/21 13:45:18 pho Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/08/30 15:08:00 wiz Exp $
 ${PLIST.launchd}Library/LaunchAgents/org.freedesktop.dbus-session.plist
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
@@ -6,6 +6,8 @@ bin/dbus-launch
 bin/dbus-monitor
 bin/dbus-run-session
 bin/dbus-send
+bin/dbus-test-tool
+bin/dbus-update-activation-environment
 bin/dbus-uuidgen
 include/dbus-1.0/dbus/dbus-address.h
 include/dbus-1.0/dbus/dbus-bus.h
@@ -28,10 +30,35 @@ lib/dbus-1.0/include/dbus/dbus-arch-deps.h
 lib/libdbus-1.la
 lib/pkgconfig/dbus-1.pc
 libexec/dbus-daemon-launch-helper
+man/man1/dbus-cleanup-sockets.1
+man/man1/dbus-daemon.1
+man/man1/dbus-launch.1
+man/man1/dbus-monitor.1
+man/man1/dbus-run-session.1
+man/man1/dbus-send.1
+man/man1/dbus-test-tool.1
+man/man1/dbus-update-activation-environment.1
+man/man1/dbus-uuidgen.1
+share/dbus-1/session.conf
+share/dbus-1/system.conf
+share/doc/dbus/dbus-cleanup-sockets.1.html
+share/doc/dbus/dbus-daemon.1.html
+share/doc/dbus/dbus-faq.html
+share/doc/dbus/dbus-launch.1.html
+share/doc/dbus/dbus-monitor.1.html
+share/doc/dbus/dbus-run-session.1.html
+share/doc/dbus/dbus-send.1.html
+share/doc/dbus/dbus-specification.html
+share/doc/dbus/dbus-test-plan.html
+share/doc/dbus/dbus-test-tool.1.html
+share/doc/dbus/dbus-tutorial.html
+share/doc/dbus/dbus-update-activation-environment.1.html
+share/doc/dbus/dbus-uuidgen.1.html
 share/doc/dbus/diagram.png
 share/doc/dbus/diagram.svg
+share/doc/dbus/examples/GetAllMatchRules.py
+share/doc/dbus/examples/example-session-disable-stats.conf
+share/doc/dbus/examples/example-system-enable-stats.conf
+share/doc/dbus/introspect.dtd
+share/doc/dbus/introspect.xsl
 share/doc/dbus/system-activation.txt
-share/examples/dbus/session.conf
-share/examples/dbus/system.conf
-@pkgdir share/dbus-1/system-services
-@pkgdir share/dbus-1/services
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.64 2015/05/14 17:21:06 wiz Exp $
+$NetBSD: distinfo,v 1.66 2015/08/30 15:08:00 wiz Exp $

-SHA1 (dbus-1.8.18.tar.gz) = a30be4a6efe3fe570d2a2cc4265f0ef9be9367aa
-RMD160 (dbus-1.8.18.tar.gz) = 96215bbd9d2ba322d8ddfe7b2fde74e37ed44671
-Size (dbus-1.8.18.tar.gz) = 1868625 bytes
-SHA1 (patch-aa) = 0c3d145979e3b2358261c9f7f34701d02eb6ecd4
-SHA1 (patch-ak) = 6d05ebde29acb3f6cb6f577dd2f2b734f590e8dd
-SHA1 (patch-al) = 57d08196e9daf49eb6bda2b30f019ce2cad77c6f
+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 (patch-ba) = f9126faf18cd19e897865748ebea1011fe516225
-SHA1 (patch-bus_dir-watch-kqueue.c) = 86a1f0f78b4d16d8ab29d351057885d8001dd39c
-SHA1 (patch-configure) = 08fb6cc6e9bc9f23825a6a0f2b8b241169d1cda7
-SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 043e7bf03686f51faf763f87f43e00308b29571e
 SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c
--- a/sysutils/dbus/files/smf/dbus.sh
+++ b/sysutils/dbus/files/smf/dbus.sh
@@ -13,11 +13,16 @@ fi
 if [ ! -f @VARBASE@/db/dbus/machine-id ]; then
 	@PREFIX@/bin/dbus-uuidgen --ensure
 fi
-
+pidfile="@VARBASE@/run/dbus/pid"
 case "$1" in
 'start')
-	if [ -f @VARBASE@/run/dbus/pid ]; then
-		rm -f @VARBASE@/run/dbus/pid
+    dir="@VARBASE@/run/dbus"
+    if ! [ -d $dir ]; then
+		@MKDIR@ $dir
+		@CHMOD@ 0755 $dir
+		@CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir
+	elif [ -f $pidfile ]; then
+		rm -f $pidfile
 	fi
 	@PREFIX@/bin/dbus-daemon --system
 	err=$?
--- a/sysutils/dbus/files/smf/manifest.xml
+++ b/sysutils/dbus/files/smf/manifest.xml
@@ -19,7 +19,7 @@
 		exec='@PREFIX@/@SMF_METHOD_FILE.dbus@ start'
 		timeout_seconds='30'>
 		<method_context>
-			<method_credential user='@DBUS_USER@' group='@DBUS_GROUP@' />
+			<method_credential user='root' group='@DBUS_GROUP@' />
 		</method_context>
 	</exec_method>
 	<exec_method
--- a/sysutils/dbus/options.mk
+++ b/sysutils/dbus/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/01/21 13:45:18 pho Exp $
+# $NetBSD: options.mk,v 1.9 2015/09/07 23:24:46 gdt Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbus
 PKG_SUPPORTED_OPTIONS+=	debug x11
@@ -22,31 +22,33 @@ PKG_SUPPORTED_OPTIONS+=	launchd
 .include "../../mk/bsd.options.mk"

 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS.enable+=	asserts verbose-mode
+CONFIGURE_ARGS+=	--enable-asserts
+CONFIGURE_ARGS+=	--enable-verbose-mode
 .else
-CONFIGURE_ARGS.disable+= asserts verbose-mode
+CONFIGURE_ARGS+=	--disable-asserts
+CONFIGURE_ARGS+=	--disable-verbose-mode
 .endif

 .if !empty(PKG_OPTIONS:Mkqueue)
-CONFIGURE_ARGS.enable+= 	kqueue
+CONFIGURE_ARGS+= 	--enable-kqueue
 .else
-CONFIGURE_ARGS.disable+=	kqueue
+CONFIGURE_ARGS+=	--disable-kqueue
 .endif

 .if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS.with+=	x
+CONFIGURE_ARGS+=	--with-x
 .  include "../../x11/libX11/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt=	build
 .  include "../../x11/libXt/buildlink3.mk"
 .else
-CONFIGURE_ARGS.without=	x
+CONFIGURE_ARGS=		--without-x
 .endif

 .if !empty(PKG_OPTIONS:Mlaunchd)
 MESSAGE_SRC+=			MESSAGE.launchd
 PLIST.launchd=			yes
-CONFIGURE_ARGS.enable+=		launchd
-CONFIGURE_ARGS.with+=		launchd-agent-dir=${PREFIX}/Library/LaunchAgents
+CONFIGURE_ARGS+=		--enable-launchd
+CONFIGURE_ARGS+=		--with-launchd-agent-dir=${PREFIX}/Library/LaunchAgents
 .else
-CONFIGURE_ARGS.disable+=	launchd
+CONFIGURE_ARGS+=		--disable-launchd
 .endif
--- a/sysutils/dbus/patches/patch-aa
+++ b/sysutils/dbus/patches/patch-aa
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2012/08/01 17:52:22 drochner Exp $
-
--- bus/Makefile.in.orig	2012-07-26 16:39:09.000000000 +0000
-+++ bus/Makefile.in
-@@ -500,7 +500,8 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-configdir = $(sysconfdir)/dbus-1
-+etcconfigdir = $(sysconfdir)/dbus-1
-+configdir = $(datadir)/examples/@PACKAGE@
- dbus_daemon_execdir = $(DBUS_DAEMONDIR)
- DBUS_BUS_LIBS = \
- 	$(XML_LIBS) \
-@@ -519,7 +520,7 @@ DBUS_LAUNCHER_LIBS = \
- AM_CPPFLAGS = \
- 	-I$(top_srcdir) \
- 	$(XML_CFLAGS) \
-	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
-+	-DDBUS_SYSTEM_CONFIG_FILE=\""$(etcconfigdir)/system.conf"\" \
- 	-DDBUS_COMPILATION \
- 	-DDBUS_STATIC_BUILD \
- 	$(NULL)
-@@ -1510,9 +1511,6 @@ clean-local:
- 	/bin/rm *.bb *.bbg *.da *.gcov || true
- 
- install-data-hook:
-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
-	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
-	$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
- 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
- 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
- # Install dbus.socket as default implementation of a D-Bus stack.
-@@ -1529,7 +1527,7 @@ install-data-hook:
- @DBUS_UNIX_TRUE@install-exec-hook:
- @DBUS_UNIX_TRUE@	if test `id -u` -eq 0; then \
- @DBUS_UNIX_TRUE@		chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
-@DBUS_UNIX_TRUE@		chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
-+@DBUS_UNIX_TRUE@		chmod 4550 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
- @DBUS_UNIX_TRUE@	else \
- @DBUS_UNIX_TRUE@		echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
- @DBUS_UNIX_TRUE@		echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
--- a/sysutils/dbus/patches/patch-ak
+++ b/sysutils/dbus/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.3 2014/04/03 09:09:06 wiz Exp $
+$NetBSD: patch-ak,v 1.4 2015/08/30 15:08:00 wiz Exp $

--- dbus/Makefile.in.orig	2014-01-20 14:10:30.000000000 +0000
+--- dbus/Makefile.in.orig	2015-08-25 15:52:09.000000000 +0000
 +++ dbus/Makefile.in
-@@ -673,7 +673,7 @@ configdir = $(sysconfdir)/dbus-1
- # results in an otherwise unnecessary dependency on librt. Disable it.
- AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(SYSTEMD_CFLAGS) \
+@@ -589,7 +589,7 @@ dbusdatadir = $(datadir)/dbus-1
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
+ 	$(DBUS_STATIC_BUILD_CPPFLAGS) $(SYSTEMD_CFLAGS) \
 	$(VALGRIND_CFLAGS) -DDBUS_COMPILATION \
 -	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
 +	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
- 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
- 	-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" \
- 	$(NULL) -DSD_DAEMON_DISABLE_MQ
+ 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \
+ 	-DDBUS_SESSION_CONFIG_FILE=\""$(dbusdatadir)/session.conf"\" \
+ 	$(NULL) $(am__append_2)
--- a/sysutils/dbus/patches/patch-al
+++ b/sysutils/dbus/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2013/09/12 13:25:47 wiz Exp $
+$NetBSD: patch-al,v 1.4 2015/07/26 22:51:23 wiz Exp $

--- tools/Makefile.in.orig	2013-09-05 15:37:16.000000000 +0000
+--- tools/Makefile.in.orig	2015-07-21 16:32:32.000000000 +0000
 +++ tools/Makefile.in
-@@ -412,7 +412,7 @@ AM_CPPFLAGS = \
+@@ -428,7 +428,7 @@ AM_CPPFLAGS = \
 	$(DBUS_STATIC_BUILD_CPPFLAGS) \
 	$(DBUS_X_CFLAGS) \
 	-DDBUS_COMPILATION \
@@ -11,8 +11,8 @@ $NetBSD: patch-al,v 1.3 2013/09/12 13:25:47 wiz Exp $
 	$(NULL)
 
 
-@@ -818,9 +818,9 @@ uninstall-am: uninstall-binPROGRAMS
- 	uninstall-am uninstall-binPROGRAMS
+@@ -847,9 +847,9 @@ uninstall-am: uninstall-binPROGRAMS
+ .PRECIOUS: Makefile
 
 
 -# create the /var/lib/dbus directory for dbus-uuidgen
--- a/sysutils/dbus/patches/patch-ba
+++ b/sysutils/dbus/patches/patch-ba
@@ -1,31 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2014/04/03 09:09:06 wiz Exp $
-
--- tools/dbus-monitor.c.orig	2013-10-09 10:22:07.000000000 +0000
-+++ tools/dbus-monitor.c
-@@ -110,7 +110,7 @@ monitor_filter_func (DBusConnection     
- #include <inttypes.h>
- #define PROFILE_TIMED_FORMAT "%s\t%" PRId64 "\t%d"
- #else
-#define PROFILE_TIMED_FORMAT "%s\t%lu\t%lu"
-+#define PROFILE_TIMED_FORMAT "%s\t%llu\t%lu"
- #endif
- #define TRAP_NULL_STRING(str) ((str) ? (str) : "<none>")
- 
-@@ -130,7 +130,7 @@ static void
- profile_print_with_attrs (const char *type, DBusMessage *message,
-   struct timeval *t, ProfileAttributeFlags attrs)
- {
-  printf (PROFILE_TIMED_FORMAT, type, t->tv_sec, t->tv_usec);
-+  printf (PROFILE_TIMED_FORMAT, type, (unsigned long long)(t->tv_sec), (unsigned long)(t->tv_usec));
- 
-   if (attrs & PROFILE_ATTRIBUTE_FLAG_SERIAL)
-     printf ("\t%u", dbus_message_get_serial (message));
-@@ -200,7 +200,7 @@ print_message_profile (DBusMessage *mess
- 	  PROFILE_ATTRIBUTE_FLAG_MEMBER);
- 	break;
-       default:
-	printf (PROFILE_TIMED_FORMAT "\n", "tun", t.tv_sec, t.tv_usec);
-+	printf (PROFILE_TIMED_FORMAT "\n", "tun", (unsigned long long)(t.tv_sec), (unsigned long)(t.tv_usec));
- 	break;
-     }
- }
--- a/sysutils/dbus/patches/patch-bus_dir-watch-kqueue.c
+++ b/sysutils/dbus/patches/patch-bus_dir-watch-kqueue.c
@@ -1,46 +0,0 @@
-$NetBSD: patch-bus_dir-watch-kqueue.c,v 1.2 2014/06/14 21:52:56 wiz Exp $
-
-* For platforms missing O_CLOEXEC
-https://bugs.freedesktop.org/show_bug.cgi?id=77032
-
--- bus/dir-watch-kqueue.c.orig	2014-01-25 12:39:24.000000000 +0000
-+++ bus/dir-watch-kqueue.c
-@@ -202,6 +202,9 @@ bus_set_watched_dirs (BusContext *contex
-   DBusList *link;
-   int i, j, fd;
-   struct kevent ev;
-+#ifdef O_CLOEXEC
-+  dbus_bool_t cloexec_done = 0;
-+#endif
- 
-   if (!_init_kqueue (context))
-     goto out;
-@@ -259,7 +262,15 @@ bus_set_watched_dirs (BusContext *contex
-           /* FIXME - less lame error handling for failing to add a watch;
-            * we may need to sleep.
-            */
-+#ifdef O_CLOEXEC
-           fd = open (new_dirs[i], O_RDONLY | O_CLOEXEC);
-+          cloexec_done = (fd >= 0);
-+
-+          if (fd < 0 && errno == EINVAL)
-+#endif
-+            {
-+              fd = open (new_dirs[i], O_RDONLY);
-+            }
-           if (fd < 0)
-             {
-               if (errno != ENOENT)
-@@ -274,6 +285,12 @@ bus_set_watched_dirs (BusContext *contex
-                   continue;
-                 }
-             }
-+#ifdef O_CLOEXEC
-+          if (!cloexec_done)
-+#endif
-+            {
-+              _dbus_fd_set_close_on_exec (fd);
-+            }
- 
-           EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
-                   NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
--- a/sysutils/dbus/patches/patch-configure
+++ b/sysutils/dbus/patches/patch-configure
@@ -1,81 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2014/06/14 21:57:34 wiz Exp $
-
-backtrace() may be in libexecinfo
-From
-https://bugs.freedesktop.org/attachment.cgi?id=100403
-which is part of
-https://bugs.freedesktop.org/show_bug.cgi?id=69702
-
--- configure.orig	2014-06-05 13:56:49.000000000 +0000
-+++ configure
-@@ -18860,16 +18860,63 @@ if test "x$ac_cv_header_execinfo_h" = xy
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_EXECINFO_H 1
- _ACEOF
- for ac_func in backtrace
-do :
-  ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace"
-if test "x$ac_cv_func_backtrace" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BACKTRACE 1
-_ACEOF
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5
-+$as_echo_n "checking for library containing backtrace... " >&6; }
-+if ${ac_cv_search_backtrace+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char backtrace ();
-+int
-+main ()
-+{
-+return backtrace ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' execinfo; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_backtrace=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if ${ac_cv_search_backtrace+:} false; then :
-+  break
- fi
- done
-+if ${ac_cv_search_backtrace+:} false; then :
-+
-+else
-+  ac_cv_search_backtrace=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5
-+$as_echo "$ac_cv_search_backtrace" >&6; }
-+ac_res=$ac_cv_search_backtrace
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+$as_echo "#define HAVE_BACKTRACE 1" >>confdefs.h
-+
-+fi
- 
- fi
- 
--- a/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c
+++ b/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c
@@ -1,19 +0,0 @@
-$NetBSD: patch-dbus_dbus-sysdeps-unix.c,v 1.2 2014/06/14 21:48:34 wiz Exp $
-
-On Linux, poll accepts any negative value as infinity.
-On at least FreeBSD and NetBSD, only -1 is acceptable.
-https://bugs.freedesktop.org/show_bug.cgi?id=78480
-
--- dbus/dbus-sysdeps-unix.c.orig	2014-01-17 16:59:48.000000000 +0000
-+++ dbus/dbus-sysdeps-unix.c
-@@ -2555,6 +2555,10 @@ _dbus_poll (DBusPollFD *fds,
-       _DBUS_STRUCT_OFFSET (DBusPollFD, revents) ==
-       _DBUS_STRUCT_OFFSET (struct pollfd, revents))
-     {
-+      if (timeout_milliseconds < -1)
-+      {
-+        timeout_milliseconds = -1;
-+      }
-       return poll ((struct pollfd*) fds,
-                    n_fds,
-                    timeout_milliseconds);