[pkgsrc/trunk]: pkgsrc/x11/vte No utmp.h on modern FreeBSD, use utmpx.h instead.

[asau <asau%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea401691d55d
branches:  trunk
changeset: 627864:ea401691d55d
user:      asau <asau%pkgsrc.org@localhost>
date:      Mon Dec 16 19:51:14 2013 +0000

description:
No utmp.h on modern FreeBSD, use utmpx.h instead.

diffstat:

 x11/vte/distinfo         |   4 ++--
 x11/vte/patches/patch-ai |  20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 703173bbf568 -r ea401691d55d x11/vte/distinfo
--- a/x11/vte/distinfo  Mon Dec 16 19:35:16 2013 +0000
+++ b/x11/vte/distinfo  Mon Dec 16 19:51:14 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2011/07/08 17:23:05 drochner Exp $
+$NetBSD: distinfo,v 1.51 2013/12/16 19:51:14 asau Exp $
 
 SHA1 (vte-0.28.1.tar.bz2) = 9867f84c6be65ff485d8a1a3c41a359709b6f84c
 RMD160 (vte-0.28.1.tar.bz2) = e0748777f5a57266762b3dd88f7a10b143e412d9
@@ -8,4 +8,4 @@
 SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d
 SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
 SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
-SHA1 (patch-ai) = 986dd7c2a5778c9c35100901cfaa25acd0cbdc32
+SHA1 (patch-ai) = 4c365d1d05faa2d9bd0f8f21d500a72605f092d9
diff -r 703173bbf568 -r ea401691d55d x11/vte/patches/patch-ai
--- a/x11/vte/patches/patch-ai  Mon Dec 16 19:35:16 2013 +0000
+++ b/x11/vte/patches/patch-ai  Mon Dec 16 19:51:14 2013 +0000
@@ -1,8 +1,20 @@
-$NetBSD: patch-ai,v 1.3 2010/11/16 13:53:06 drochner Exp $
+$NetBSD: patch-ai,v 1.4 2013/12/16 19:51:14 asau Exp $
 
 --- gnome-pty-helper/gnome-pty-helper.c.orig   2010-07-15 17:08:44.000000000 +0000
-+++ gnome-pty-helper/gnome-pty-helper.c
-@@ -122,6 +122,7 @@ pass_fd (int client_fd, int fd)
++++ gnome-pty-helper/gnome-pty-helper.c        2013-12-16 19:42:58.699504493 +0000
+@@ -51,7 +51,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
++#if defined(__FreeBSD__)
++#include <utmpx.h>
++#else
+ #include <utmp.h>
++#endif
+ #include <grp.h>
+ #include "gnome-pty.h"
+ #include "gnome-login-support.h"
+@@ -122,6 +126,7 @@
        msg.msg_iovlen     = 1;
        msg.msg_name       = NULL;
        msg.msg_namelen    = 0;
@@ -10,7 +22,7 @@
        msg.msg_control    = (caddr_t) cmsgbuf;
        msg.msg_controllen = sizeof(cmsgbuf);
  
-@@ -131,6 +132,7 @@ pass_fd (int client_fd, int fd)
+@@ -131,6 +136,7 @@
        cmptr->cmsg_len   = CMSG_LEN(sizeof(int));
          fdptr = (int *) CMSG_DATA(cmptr);
          memcpy (fdptr, &fd, sizeof(int));