CVS commit: pkgsrc/sysutils/xfce4-genmon-plugin

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 17 09:57:42 UTC 2018

Modified Files:
        pkgsrc/sysutils/xfce4-genmon-plugin: distinfo
        pkgsrc/sysutils/xfce4-genmon-plugin/patches:
            patch-panel-plugin_cmdspawn.c

Log Message:
xfce4-genmon-plugin: Set _XOPEN_SOURCE correctly on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xfce4-genmon-plugin/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.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/xfce4-genmon-plugin/distinfo
diff -u pkgsrc/sysutils/xfce4-genmon-plugin/distinfo:1.5 pkgsrc/sysutils/xfce4-genmon-plugin/distinfo:1.6
--- pkgsrc/sysutils/xfce4-genmon-plugin/distinfo:1.5    Tue May 15 21:55:38 2018
+++ pkgsrc/sysutils/xfce4-genmon-plugin/distinfo        Thu May 17 09:57:42 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2018/05/15 21:55:38 youri Exp $
+$NetBSD: distinfo,v 1.6 2018/05/17 09:57:42 jperkin Exp $
 
 SHA1 (xfce4-genmon-plugin-4.0.1.tar.bz2) = e7a41a6fb47d2ef4a803e19bf0917f99eeb21257
 RMD160 (xfce4-genmon-plugin-4.0.1.tar.bz2) = 065cfca1f5f842d815e9b618644de35f4d2821df
 SHA512 (xfce4-genmon-plugin-4.0.1.tar.bz2) = 14590ba4a3b31773e38139d274c93060b2dfdf3cd476dc2235f95f987529b93b74d2422507cc4bf1152f376ec9c6a01bd1da903d422757b95b19c01aa412b35e
 Size (xfce4-genmon-plugin-4.0.1.tar.bz2) = 327605 bytes
-SHA1 (patch-panel-plugin_cmdspawn.c) = 87109d4b6ac0e7ca804a3ee67033111208137231
+SHA1 (patch-panel-plugin_cmdspawn.c) = dfd800039cab9595eae5ae21a3a0d36d1e270a50

Index: pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c
diff -u pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c:1.2 pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c:1.3
--- pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c:1.2       Tue Jun 20 21:51:31 2017
+++ pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c   Thu May 17 09:57:42 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-panel-plugin_cmdspawn.c,v 1.2 2017/06/20 21:51:31 youri Exp $
+$NetBSD: patch-panel-plugin_cmdspawn.c,v 1.3 2018/05/17 09:57:42 jperkin Exp $
 
 Fix SunOS build.
 
---- panel-plugin/cmdspawn.c.orig       2012-05-10 02:09:21.000000000 +0000
+--- panel-plugin/cmdspawn.c.orig       2017-10-29 00:52:07.000000000 +0000
 +++ panel-plugin/cmdspawn.c
 @@ -12,7 +12,7 @@
   *  version 2.1 of the License, or (at your option) any later version.
@@ -13,7 +13,23 @@ Fix SunOS build.
   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   *  Lesser General Public License for more details.
  
-@@ -59,12 +59,12 @@ char *genmon_Spawn (char **argv, int wai
+@@ -24,6 +24,7 @@
+ /* Posix-compliance to make sure that only the calling thread is
+    duplicated, not the whole process (e.g Solaris) */
+ 
++#if !defined(__sun) || (!defined(_XOPEN_SOURCE) && (__STDC_VERSION__-0 < 199901L))
+ #ifndef _POSIX_C_SOURCE
+ #define _POSIX_C_SOURCE 199506L
+ #endif
+@@ -31,6 +32,7 @@
+ #ifndef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE 500
+ #endif
++#endif
+ 
+ #include "cmdspawn.h"
+ 
+@@ -59,12 +61,12 @@ char *genmon_Spawn (char **argv, int wai
   /* Spawn a command and capture its output from stdout or stderr */
   /* Return allocated string on success, otherwise NULL */
  {
@@ -29,7 +45,7 @@ Fix SunOS build.
      int             status;
      int             i, j, k;
      char           *str = NULL;
-@@ -73,19 +73,19 @@ char *genmon_Spawn (char **argv, int wai
+@@ -73,19 +75,19 @@ char *genmon_Spawn (char **argv, int wai
          fprintf (stderr, "Spawn() error: No parameters passed!\n");
          return (NULL);
      }
@@ -52,7 +68,7 @@ Fix SunOS build.
                  j = i + 1; // stdout/stderr file descriptor
                  close (j);
                  k = dup2 (aaiPipe[i][WR], j);
-@@ -100,7 +100,7 @@ char *genmon_Spawn (char **argv, int wai
+@@ -100,7 +102,7 @@ char *genmon_Spawn (char **argv, int wai
          exit (-1);
      }
  
@@ -61,7 +77,7 @@ Fix SunOS build.
          close (aaiPipe[i][WR]); /* close write end of pipes in parent */
  
      /* Wait for child completion */
-@@ -113,16 +113,16 @@ char *genmon_Spawn (char **argv, int wai
+@@ -113,16 +115,16 @@ char *genmon_Spawn (char **argv, int wai
          }
  
          /* Read stdout/stderr pipes' read-ends */
@@ -82,7 +98,7 @@ Fix SunOS build.
              goto End;
  
          j = 0;
-@@ -143,7 +143,7 @@ char *genmon_Spawn (char **argv, int wai
+@@ -143,7 +145,7 @@ char *genmon_Spawn (char **argv, int wai
  
      End:
      /* Close read end of pipes */