diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:19:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:19:46 +0000 |
| commit | 8515688e4fc1e61508e192542688b3ff53ea4ca8 (patch) | |
| tree | d2d4ad86fb660f5fc1d74e8ef4b3232c9aad1046 /x11/aterm | |
| parent | 3612c287b035cd52b87361b84833d892629cf955 (diff) | |
| download | pkgsrc-buildlink2.tar.gz | |
Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2
packages that have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11/aterm')
| -rw-r--r-- | x11/aterm/Makefile | 4 | ||||
| -rw-r--r-- | x11/aterm/distinfo | 3 | ||||
| -rw-r--r-- | x11/aterm/patches/patch-ae | 25 |
3 files changed, 29 insertions, 3 deletions
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 3e33ee7a544..9078bd0bbc8 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7.2.1 2002/06/30 06:24:38 jlam Exp $ +# $NetBSD: Makefile,v 1.7.2.2 2002/08/25 21:22:47 jlam Exp $ # DISTNAME= aterm-0.4.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aterm/} diff --git a/x11/aterm/distinfo b/x11/aterm/distinfo index e754858a026..72ae51eceba 100644 --- a/x11/aterm/distinfo +++ b/x11/aterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:54 jlam Exp $ +$NetBSD: distinfo,v 1.3.2.2 2002/08/25 21:22:47 jlam Exp $ SHA1 (aterm-0.4.2.tar.gz) = 8ce3f1fcdc12805068ff5acde6f130a22e1f5b9b Size (aterm-0.4.2.tar.gz) = 312730 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = 59cf8fe42bf4291b2a98c0d95170a02308197645 SHA1 (patch-ab) = 9b4e6785912de338db958e9ad48c4cafcb344270 SHA1 (patch-ac) = 28c79343079680251a013ec3fe364b01f5a5ccac SHA1 (patch-ad) = 0c87ee69672e98189afa2cfdcdd9691a1571f354 +SHA1 (patch-ae) = b4bbe033f29a8ee24cfff511fb59739d3582341d diff --git a/x11/aterm/patches/patch-ae b/x11/aterm/patches/patch-ae new file mode 100644 index 00000000000..20192241526 --- /dev/null +++ b/x11/aterm/patches/patch-ae @@ -0,0 +1,25 @@ +$NetBSD: patch-ae,v 1.1.2.2 2002/08/25 21:22:48 jlam Exp $ + +--- src/command.c.orig Thu Sep 6 18:38:07 2001 ++++ src/command.c +@@ -1146,6 +1146,11 @@ + num_fds = getdtablesize(); + #endif + ++#if defined(__NetBSD__) ++ if (num_fds > FD_SETSIZE) ++ num_fds = FD_SETSIZE; ++#endif ++ + #ifdef META8_OPTION + meta_char = (Options & Opt_meta8 ? 0x80 : 033); + if (rs_modifier +@@ -2024,7 +2029,7 @@ + #endif + + /* See if we can read from the application */ +- if (FD_ISSET(cmd_fd, &readfds)) { ++ if (retval > 0 && FD_ISSET(cmd_fd, &readfds)) { + unsigned int count = BUFSIZ; + + cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |