diff options
| author | dholland <dholland@pkgsrc.org> | 2010-04-24 19:52:23 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2010-04-24 19:52:23 +0000 |
| commit | 05a45199a48a871a73777a2a66dde65d3d7ada0d (patch) | |
| tree | 4152e46ae98eb869a8e37c28ab851c8814a91368 /x11 | |
| parent | 1290c13b1b9c92bdbf9046671d6fa5e37fdaa4aa (diff) | |
| download | pkgsrc-05a45199a48a871a73777a2a66dde65d3d7ada0d.tar.gz | |
The time_t changes made the gum holding the logic together fall off.
Scrape it up and stick it back on again. Fixes build on -current.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xview-lib/distinfo | 4 | ||||
| -rw-r--r-- | x11/xview-lib/patches/patch-dp | 20 |
2 files changed, 20 insertions, 4 deletions
diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo index 2dbc60a9699..08afc9edbeb 100644 --- a/x11/xview-lib/distinfo +++ b/x11/xview-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2009/12/10 20:35:56 abs Exp $ +$NetBSD: distinfo,v 1.15 2010/04/24 19:52:23 dholland Exp $ SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb @@ -96,7 +96,7 @@ SHA1 (patch-dl) = a899b511f6632392652d4eda620ecb3a7318bf7b SHA1 (patch-dm) = f9cab5bd87ad213635fc75153b961d77d6d534fd SHA1 (patch-dn) = 17b30da6857759b4193e626dbfdd99bbd58eb8e5 SHA1 (patch-do) = e85f7868de4046b596f70233c052362165b816a3 -SHA1 (patch-dp) = 225bd60cd4df79d04886e23a5cc8aa63812455d6 +SHA1 (patch-dp) = 18de16f7167b4fcfcd8cd812237b4ecdde1cde8c SHA1 (patch-dq) = c12fdd5e06bd4bc04e79bf031c7e5d1086052bb3 SHA1 (patch-dr) = 1b8db234d329c62200080d760655c7a2e18f38a1 SHA1 (patch-ds) = 38b749b6abc13cb6a9d924f47b768155217cd140 diff --git a/x11/xview-lib/patches/patch-dp b/x11/xview-lib/patches/patch-dp index c01cef047a7..dc7f6d0654a 100644 --- a/x11/xview-lib/patches/patch-dp +++ b/x11/xview-lib/patches/patch-dp @@ -1,4 +1,4 @@ -$NetBSD: patch-dp,v 1.3 2009/12/10 20:35:58 abs Exp $ +$NetBSD: patch-dp,v 1.4 2010/04/24 19:52:23 dholland Exp $ --- lib/libxview/notify/sys_select.c.orig 1993-06-29 05:18:11.000000000 +0000 +++ lib/libxview/notify/sys_select.c @@ -14,7 +14,7 @@ $NetBSD: patch-dp,v 1.3 2009/12/10 20:35:58 abs Exp $ #else SVR4 #include <values.h> #include <sys/time.h> -@@ -28,8 +32,6 @@ static char sccsid[] = "@(#)sys_sele +@@ -28,12 +32,22 @@ static char sccsid[] = "@(#)sys_sele #include <errno.h> /* For debugging */ #include <stdio.h> /* For debugging */ @@ -23,3 +23,19 @@ $NetBSD: patch-dp,v 1.3 2009/12/10 20:35:58 abs Exp $ #ifndef NULL #define NULL 0 #endif + ++/* netbsd-6's time_t changes caused versioning/renaming of select */ ++/* XXX xview should not be using syscall() */ ++#ifdef __NetBSD__ ++#ifndef SYS_select ++#ifdef SYS___select50 ++#define SYS_select SYS___select50 ++#else ++#error "help!" ++#endif ++#endif ++#endif ++ + pkg_private int + #ifndef SVR4 + notify_select(nfds, readfds, writefds, exceptfds, tv) |