CVS commit: pkgsrc/misc/tmux

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Jul 17 13:21:46 UTC 2020

Modified Files:
        pkgsrc/misc/tmux: distinfo
Added Files:
        pkgsrc/misc/tmux/patches: patch-compat_daemon-darwin.c
            patch-osdep-darwin.c

Log Message:
Un-break tmux build on MacOS X 10.4.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/misc/tmux/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/tmux/patches/patch-compat_daemon-darwin.c
cvs rdiff -u -r0 -r1.3 pkgsrc/misc/tmux/patches/patch-osdep-darwin.c

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

Modified files:

Index: pkgsrc/misc/tmux/distinfo
diff -u pkgsrc/misc/tmux/distinfo:1.46 pkgsrc/misc/tmux/distinfo:1.47
--- pkgsrc/misc/tmux/distinfo:1.46      Sat Jun 13 21:42:43 2020
+++ pkgsrc/misc/tmux/distinfo   Fri Jul 17 13:21:46 2020
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.46 2020/06/13 21:42:43 leot Exp $
+$NetBSD: distinfo,v 1.47 2020/07/17 13:21:46 hauke Exp $
 
 SHA1 (tmux-3.1b.tar.gz) = 52ab7bbc8f5c48955b170f2473f9515cc31653b5
 RMD160 (tmux-3.1b.tar.gz) = 10bd0c871da3fd9c450408c96bbc7231257e40e4
 SHA512 (tmux-3.1b.tar.gz) = fd5269f5f58ad20c35ece24af74035e622e16511baa331717bded5edcbfd46c1847fd86c02431a7d889ce7d5bec89c8177a680ca60e9ca821f13065d26ca7fa1
 Size (tmux-3.1b.tar.gz) = 561152 bytes
+SHA1 (patch-compat_daemon-darwin.c) = e8feeb4b100e73ab197eb2fd776fa648a1da28e4
+SHA1 (patch-osdep-darwin.c) = 4bcb0705e3ffa87df614e0946121b0ae66ad3f53

Added files:

Index: pkgsrc/misc/tmux/patches/patch-compat_daemon-darwin.c
diff -u /dev/null pkgsrc/misc/tmux/patches/patch-compat_daemon-darwin.c:1.1
--- /dev/null   Fri Jul 17 13:21:46 2020
+++ pkgsrc/misc/tmux/patches/patch-compat_daemon-darwin.c       Fri Jul 17 13:21:46 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-compat_daemon-darwin.c,v 1.1 2020/07/17 13:21:46 hauke Exp $
+
+No such fanciness in early (ppc) MacOS X
+
+--- compat/daemon-darwin.c.orig        2020-04-14 13:10:35.000000000 +0000
++++ compat/daemon-darwin.c
+@@ -49,7 +49,9 @@
+ 
+ #include <mach/mach.h>
+ 
++#if !defined (__POWERPC__)
+ #include <Availability.h>
++#endif /*__POWERPC__*/
+ #include <unistd.h>
+ 
+ void daemon_darwin(void);

Index: pkgsrc/misc/tmux/patches/patch-osdep-darwin.c
diff -u /dev/null pkgsrc/misc/tmux/patches/patch-osdep-darwin.c:1.3
--- /dev/null   Fri Jul 17 13:21:46 2020
+++ pkgsrc/misc/tmux/patches/patch-osdep-darwin.c       Fri Jul 17 13:21:46 2020
@@ -0,0 +1,46 @@
+$NetBSD: patch-osdep-darwin.c,v 1.3 2020/07/17 13:21:46 hauke Exp $
+
+No such fanciness in early (ppc) MacOS X
+
+--- osdep-darwin.c.orig        2020-05-04 08:06:23.000000000 +0000
++++ osdep-darwin.c
+@@ -19,9 +19,11 @@
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ 
++#if !defined (__POWERPC__)
+ #include <Availability.h>
+-#include <event.h>
+ #include <libproc.h>
++#endif /*__POWERPC__*/
++#include <event.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -37,7 +39,9 @@ struct event_base    *osdep_event_init(void
+ char *
+ osdep_get_name(int fd, __unused char *tty)
+ {
+-#ifdef __MAC_10_7
++#if defined (__POWERPC__)
++        return (NULL);
++#elif defined (__MAC_10_7)
+       struct proc_bsdshortinfo        bsdinfo;
+       pid_t                           pgrp;
+       int                             ret;
+@@ -71,6 +75,7 @@ osdep_get_name(int fd, __unused char *tt
+ char *
+ osdep_get_cwd(int fd)
+ {
++#if !defined (__POWERPC__)
+       static char                     wd[PATH_MAX];
+       struct proc_vnodepathinfo       pathinfo;
+       pid_t                           pgrp;
+@@ -85,6 +90,7 @@ osdep_get_cwd(int fd)
+               strlcpy(wd, pathinfo.pvi_cdir.vip_path, sizeof wd);
+               return (wd);
+       }
++#endif /*__POWERPC__*/
+       return (NULL);
+ }
+