CVS commit: pkgsrc/sysutils/dbus

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 24 08:06:28 UTC 2017

Modified Files:
        pkgsrc/sysutils/dbus: distinfo
        pkgsrc/sysutils/dbus/patches: patch-dbus_dbus-sysdeps-unix.c

Log Message:
Fix patch, ensure it is limited to SunOS only.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/sysutils/dbus/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/dbus/distinfo
diff -u pkgsrc/sysutils/dbus/distinfo:1.80 pkgsrc/sysutils/dbus/distinfo:1.81
--- pkgsrc/sysutils/dbus/distinfo:1.80  Tue May 23 15:12:57 2017
+++ pkgsrc/sysutils/dbus/distinfo       Wed May 24 08:06:28 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2017/05/23 15:12:57 jperkin Exp $
+$NetBSD: distinfo,v 1.81 2017/05/24 08:06:28 jperkin Exp $
 
 SHA1 (dbus-1.10.18.tar.gz) = f3407dc00075c7a81cce502316aaf536f02ebfea
 RMD160 (dbus-1.10.18.tar.gz) = 9fc2aa4c93543983d8b12d1863b4696891afd866
@@ -8,6 +8,6 @@ SHA1 (patch-ak) = ebb0c291297577a9cff246
 SHA1 (patch-al) = c70be84ae79698cc4d83087427646bfb0500f194
 SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4
 SHA1 (patch-configure) = 9dee6306aa07b60449a0f9f0f1ea3dccbc70dcb4
-SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 39767dd35befe916509ab9eff790aee706caa089
+SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 3dfc60eba7ab9d5a29d2a842ce0baa1b109df716
 SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c
 SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec

Index: pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c
diff -u pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c:1.4 pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c:1.5
--- pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c:1.4     Tue May 23 15:12:57 2017
+++ pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c Wed May 24 08:06:28 2017
@@ -1,17 +1,19 @@
-$NetBSD: patch-dbus_dbus-sysdeps-unix.c,v 1.4 2017/05/23 15:12:57 jperkin Exp $
+$NetBSD: patch-dbus_dbus-sysdeps-unix.c,v 1.5 2017/05/24 08:06:28 jperkin Exp $
 
 Support _XOPEN_SOURCE requirements on SunOS with different compiler defaults.
 
 --- dbus/dbus-sysdeps-unix.c.orig      2017-02-16 13:46:23.000000000 +0000
 +++ dbus/dbus-sysdeps-unix.c
-@@ -24,6 +24,12 @@
+@@ -24,6 +24,14 @@
  
  #include <config.h>
  
-+#if defined(__sun) && __STDC_VERSION__ - 0 < 199901L
++#ifdef __sun
++#  if __STDC_VERSION__ - 0 < 199901L
 +#define       _XOPEN_SOURCE   500
-+#else
++#  else
 +#define       _XOPEN_SOURCE   600
++#  endif
 +#endif
 +
  #include "dbus-internals.h"