diff options
| author | apb <apb@pkgsrc.org> | 2012-09-15 09:14:53 +0000 |
|---|---|---|
| committer | apb <apb@pkgsrc.org> | 2012-09-15 09:14:53 +0000 |
| commit | 0b0f1e8e51c0d57882e3d924e28c55c9ae4e6dd2 (patch) | |
| tree | 6ff9ccab6e95fbebc3cd1b6a385c7087a0963ade /misc/screen/Makefile | |
| parent | 20286845dac7444c6da303fe62752c886af2b258 (diff) | |
| download | pkgsrc-0b0f1e8e51c0d57882e3d924e28c55c9ae4e6dd2.tar.gz | |
Move the NetBSD-specific part of screen's pty.c to the right place.
This commit changes patch-aa so that the patched version
of pty.c contains:
... other OS-specific code
... NetBSD-specific openpty() code (from patch-aa)
... generic openpty() code
... last resort code
instead of the previous:
... other OS-specific code
... generic openpty() code
... NetBSD-specific openpty() code (from patch-aa)
... last resort code
History behind this problem:
The NetBSD-specific openpty() code was added in revision 1.1
of misc/screen/patches/patch-aa. (See PR pkg/16901.) At that
time, pkgsrc used screen-3.9.11, and the upstream version of
screen did not use openpty() at all. The patch added an "#if
defined(__NetBSD__)" block as the last OS-specific section in
pty.c, which then had:
... other OS-specific code
... NetBSD-specific openpty() code (from patch-aa)
... last resort code
In screen-3.9.15, upstream added code in pty.c to use openpty().
This was imported to pkgsrc on 2003-03-15. At that time, pkgsrc's
patch-aa accidentally inserted the NetBSD-specific code below
instead of above the new code, so the patched version of pty.c
had:
... other OS-specific code
... generic openpty() code (from upstream)
... NetBSD-specific openpty() code (from patch-aa)
... last resort code
The above is obviously wrong because the generic openpty() code
would be used instead of the NetBSD-specific code, assuming
HAVE_OPENPTY was defined by the configure script.
This problem was reported in PR pkg/25317, but the patch in the PR
was not understood so it was not applied.
This commit changes patch-aa so that the patched version of pty.c
contains:
... other OS-specific code
... NetBSD-specific openpty() code (from patch-aa)
... generic openpty() code (from upstream)
... last resort code
However, it still doesn't work on NetBSD with ptyfs mounted.
Diffstat (limited to 'misc/screen/Makefile')
| -rw-r--r-- | misc/screen/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/screen/Makefile b/misc/screen/Makefile index a6b4b9104b1..d087d340f73 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.83 2010/05/07 12:02:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.84 2012/09/15 09:14:53 apb Exp $ DISTNAME= screen-4.0.3 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= misc shells MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \ http://people.freebsd.org/~cy/distfiles/ |