diff options
| author | dholland <dholland@pkgsrc.org> | 2011-12-21 08:45:34 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-12-21 08:45:34 +0000 |
| commit | 9ff3998f7f5b3ac3fc2f864c85e097d47812d3f1 (patch) | |
| tree | c32e353c517ef4236cbba8090d600fc0469c8590 /editors | |
| parent | f2da359e528b23cf1f8b3db781ac09b9ec14811a (diff) | |
| download | pkgsrc-9ff3998f7f5b3ac3fc2f864c85e097d47812d3f1.tar.gz | |
If you have ptyfs set up and this package detects it, it assumes you
must be on System V and also have STREAMS. Avoid the STREAMS code for
NetBSD.
Note: I haven't tested this or even looked at any of the code except
for what was trying to use STREAMS, so it may not work; but now it at
least builds, and the behavior if ptyfs is not detected is unchanged.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/cooledit/distinfo | 4 | ||||
| -rw-r--r-- | editors/cooledit/patches/patch-rxvt___rxvtlib_h | 18 | ||||
| -rw-r--r-- | editors/cooledit/patches/patch-rxvt_rxvtlib__command_c | 23 |
3 files changed, 44 insertions, 1 deletions
diff --git a/editors/cooledit/distinfo b/editors/cooledit/distinfo index 2a4d3dea045..c6cb4faf547 100644 --- a/editors/cooledit/distinfo +++ b/editors/cooledit/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2006/07/22 04:34:48 minskim Exp $ +$NetBSD: distinfo,v 1.8 2011/12/21 08:45:34 dholland Exp $ SHA1 (cooledit-3.17.17.tar.gz) = 73f9bffcb5e3e92f0a71d3f34fef19eb0287ee07 RMD160 (cooledit-3.17.17.tar.gz) = 96ddde14fada220c381142d68147735ac5c75163 @@ -10,3 +10,5 @@ SHA1 (patch-ae) = b5de0e395562effea6790be06b65d0d7265a4ea1 SHA1 (patch-af) = c3d948e490e1756c33080e252949de0fb1c4743a SHA1 (patch-ah) = 6c657d734f7b4ec15321cf8ed8db1cecbb89db07 SHA1 (patch-ai) = 48ef9745aef54e337aa5f55710a4c4711ffe017c +SHA1 (patch-rxvt___rxvtlib_h) = 1491dedc31005f9da7c4311bcc9cd1948f4c53dc +SHA1 (patch-rxvt_rxvtlib__command_c) = 65fd59841ccb8fbba84f9f1d38d602be4cffcc54 diff --git a/editors/cooledit/patches/patch-rxvt___rxvtlib_h b/editors/cooledit/patches/patch-rxvt___rxvtlib_h new file mode 100644 index 00000000000..ed005fa2f89 --- /dev/null +++ b/editors/cooledit/patches/patch-rxvt___rxvtlib_h @@ -0,0 +1,18 @@ +$NetBSD: patch-rxvt___rxvtlib_h,v 1.1 2011/12/21 08:45:34 dholland Exp $ + +If the configuration detects /dev/ptmx, it tries to use it; but avoid +in that case trying to do STREAMS things. + +--- rxvt/_rxvtlib.h~ 2005-04-04 20:47:45.000000000 +0000 ++++ rxvt/_rxvtlib.h +@@ -130,8 +130,10 @@ + #endif + #ifdef PTYS_ARE_PTMX + # include <sys/resource.h> /* for struct rlimit */ ++#ifndef __NetBSD__ + # include <sys/stropts.h> /* for I_PUSH */ + #endif ++#endif + #ifdef UTMP_SUPPORT + # if ! defined(HAVE_STRUCT_UTMPX) && ! defined(HAVE_STRUCT_UTMP) + # error cannot build with utmp support - no utmp or utmpx struct found diff --git a/editors/cooledit/patches/patch-rxvt_rxvtlib__command_c b/editors/cooledit/patches/patch-rxvt_rxvtlib__command_c new file mode 100644 index 00000000000..26cc989f714 --- /dev/null +++ b/editors/cooledit/patches/patch-rxvt_rxvtlib__command_c @@ -0,0 +1,23 @@ +$NetBSD: patch-rxvt_rxvtlib__command_c,v 1.1 2011/12/21 08:45:34 dholland Exp $ + +If the configuration detects /dev/ptmx, it tries to use it; but avoid +in that case trying to do STREAMS things. + +--- rxvt/rxvtlib_command.c~ 2005-04-04 20:47:45.000000000 +0000 ++++ rxvt/rxvtlib_command.c +@@ -386,6 +386,7 @@ int rxvtlib_get_tty (rxvtlib + return -1; + } + #ifdef PTYS_ARE_PTMX ++#ifndef __NetBSD__ + /* + * Push STREAMS modules: + * ptem: pseudo-terminal hardware emulation module. +@@ -398,6 +399,7 @@ int rxvtlib_get_tty (rxvtlib + ioctl (fd, I_PUSH, "ttcompat"); + } + #endif ++#endif + if (o->changettyowner) { + /* change ownership of tty to real uid and real group */ + unsigned int mode = 0622; |