diff options
| author | rh <rh> | 2000-11-27 10:59:19 +0000 |
|---|---|---|
| committer | rh <rh> | 2000-11-27 10:59:19 +0000 |
| commit | 5233e0c9e2625bbb7ad3ed205866f8ddff82acf6 (patch) | |
| tree | dd246cf76ed5b1ba606fa85afd614fd4ecf12649 /x11 | |
| parent | d77feff45125c550dfbf9dcc1e6e7cdcf0d2f6c3 (diff) | |
| download | pkgsrc-5233e0c9e2625bbb7ad3ed205866f8ddff82acf6.tar.gz | |
Fix CMSG* macros for systems that do not define CMSG_LEN and CMSG space to
make gnome-libs compile again under NetBSD-1.4.x.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-libs/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/gnome-libs/patches/patch-aq | 18 |
2 files changed, 14 insertions, 8 deletions
diff --git a/x11/gnome-libs/files/patch-sum b/x11/gnome-libs/files/patch-sum index 7df5b0f1597..5a399c7157e 100644 --- a/x11/gnome-libs/files/patch-sum +++ b/x11/gnome-libs/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.19 2000/11/12 13:53:20 tron Exp $ +$NetBSD: patch-sum,v 1.20 2000/11/27 10:59:19 rh Exp $ MD5 (patch-aa) = 304237d9a4a0fbfadd79537c0f67926e MD5 (patch-ac) = 503fba99ca4f3eb7273a438068694436 @@ -11,5 +11,5 @@ MD5 (patch-al) = 88791beef747b37ab7ac78a8705637c1 MD5 (patch-an) = f04a6f1ed6b81360a964c60152d8b0e4 MD5 (patch-ao) = 443ab84138c1d1c8c997a684101baff5 MD5 (patch-ap) = c37e3352b6848fb0a325298bc8b3be10 -MD5 (patch-aq) = 415545b5019078778745266108d93ba1 +MD5 (patch-aq) = 196572dfd2e7e88f0bb88dc75262ef92 MD5 (patch-ar) = f2dafd674ab4f0e9baf9d5af16d4a501 diff --git a/x11/gnome-libs/patches/patch-aq b/x11/gnome-libs/patches/patch-aq index f5c459e64fb..3354f21a145 100644 --- a/x11/gnome-libs/patches/patch-aq +++ b/x11/gnome-libs/patches/patch-aq @@ -1,15 +1,21 @@ -$NetBSD: patch-aq,v 1.1 2000/11/11 02:07:57 mycroft Exp $ +$NetBSD: patch-aq,v 1.2 2000/11/27 10:59:20 rh Exp $ ---- zvt/gnome-pty-helper.c.orig Sat Mar 18 07:57:13 2000 -+++ zvt/gnome-pty-helper.c Sat Nov 11 01:59:16 2000 -@@ -115,14 +115,14 @@ +--- zvt/gnome-pty-helper.c.orig Sat Mar 18 08:57:13 2000 ++++ zvt/gnome-pty-helper.c +@@ -115,14 +115,20 @@ #endif #endif /* CMSG_DATA */ -#define CONTROLLEN (sizeof (struct cmsghdr) + sizeof (int)) -+#define FD_LEN (sizeof(int) * 1) ++#ifndef CMSG_SPACE ++#include <machine/param.h> ++#define CMSG_SPACE(l) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l)) ++#define CMSG_LEN(l) (ALIGN(sizeof(struct cmsghdr)) + (l)) ++#endif -static struct cmsghdr *cmptr; ++#define FD_LEN (sizeof(int) * 1) ++ +static void *cmptr; static int @@ -20,7 +26,7 @@ $NetBSD: patch-aq,v 1.1 2000/11/11 02:07:57 mycroft Exp $ if (cmptr) return 0; -@@ -135,22 +135,26 @@ +@@ -135,22 +141,26 @@ { struct iovec iov[1]; struct msghdr msg; |