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.

3 files changed, 10 insertions, 10 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/
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index c2012383090..8e0cb3bfa78 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2011/03/14 06:15:23 rumko Exp $
+$NetBSD: distinfo,v 1.33 2012/09/15 09:14:53 apb Exp $
 
 SHA1 (screen-4.0.3.tar.gz) = 7bc6e2f0959ffaae6f52d698c26c774e7dec3545
 RMD160 (screen-4.0.3.tar.gz) = 8c3903c1642ae30fd9d5706298919428552f7754
 Size (screen-4.0.3.tar.gz) = 840602 bytes
-SHA1 (patch-aa) = f3f56a45dc7ab55db41b1a8d16a26134691280b1
+SHA1 (patch-aa) = e8894dffc4a6d05fddcdb1f4091c5f41b7639fcf
 SHA1 (patch-ab) = f4fc914ad9c48cb83cf3633630cb83e4a8e90ff5
 SHA1 (patch-ac) = 36a1f3e465b511dc795ee9e7f016416b5312d6f0
 SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691
diff --git a/misc/screen/patches/patch-aa b/misc/screen/patches/patch-aa
index ad44606661c..181a0fe7972 100644
--- a/misc/screen/patches/patch-aa
+++ b/misc/screen/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2004/06/16 21:35:00 christos Exp $
+$NetBSD: patch-aa,v 1.11 2012/09/15 09:14:53 apb Exp $
 
---- pty.c.orig	2003-09-08 10:26:18.000000000 -0400
-+++ pty.c	2004-06-16 17:28:12.000000000 -0400
+--- pty.c.orig	2003-09-08 14:26:18.000000000 +0000
++++ pty.c
 @@ -34,7 +34,7 @@
  #endif
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2004/06/16 21:35:00 christos Exp $
  # include <sys/stropts.h>
  #endif
  
-@@ -332,6 +332,45 @@
+@@ -313,6 +313,45 @@ char **ttyn;
  
  /***************************************************************/
  
@@ -54,6 +54,6 @@ $NetBSD: patch-aa,v 1.10 2004/06/16 21:35:00 christos Exp $
 +
 +/***************************************************************/
 +
- #ifndef PTY_DONE
+ #if defined(HAVE_OPENPTY) && !defined(PTY_DONE)
+ #define PTY_DONE
  int
- OpenPTY(ttyn)