4 files changed, 45 insertions, 9 deletions
diff --git a/news/nn/patches/patch-aa b/news/nn/patches/patch-aa
index 792b8b565f9..aa3e83771f5 100644
--- a/news/nn/patches/patch-aa
+++ b/news/nn/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.9 2005/04/11 11:18:06 schwarz Exp $
+$NetBSD: patch-aa,v 1.10 2006/06/01 23:11:29 joerg Exp $
 
---- Makefile.orig	Fri Feb  8 05:14:41 2002
-+++ Makefile	Sat Apr  9 00:48:08 2005
+--- Makefile.orig	2002-02-08 04:14:41.000000000 +0000
++++ Makefile
 @@ -18,16 +18,16 @@
  #
  # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
@@ -9,7 +9,8 @@ $NetBSD: patch-aa,v 1.9 2005/04/11 11:18:06 schwarz Exp $
 -CC =		cc
 +#CC =		cc
  
- CPP =		$(CC) -E
+-CPP =		$(CC) -E
++#CPP =		$(CC) -E
  #CPP =		/lib/cpp
  #CPP =		/usr/bin/cpp -no-cpp-precomp	# for MacOS X
  
@@ -22,7 +23,7 @@ $NetBSD: patch-aa,v 1.9 2005/04/11 11:18:06 schwarz Exp $
  
  
  SHELL = /bin/sh
-@@ -97,3 +97,5 @@
+@@ -97,3 +97,5 @@ split: tar
  man/nn.1.D: man/nn.1
  	sh SPLITNN1
  
diff --git a/news/nn/patches/patch-ap b/news/nn/patches/patch-ap
index 5d953312fd1..924a31cd4c1 100644
--- a/news/nn/patches/patch-ap
+++ b/news/nn/patches/patch-ap
@@ -1,8 +1,17 @@
-$NetBSD: patch-ap,v 1.3 2002/07/08 02:21:20 kim Exp $
+$NetBSD: patch-ap,v 1.4 2006/06/01 23:11:29 joerg Exp $
 
---- global.h.orig	Sun Feb  3 22:53:13 2002
-+++ global.h	Sun Jul  7 21:33:09 2002
-@@ -374,12 +374,12 @@
+--- global.h.orig	2002-02-04 03:53:13.000000000 +0000
++++ global.h
+@@ -146,8 +146,6 @@ extern gid_t    group_id;
+ extern int
+     process_id;
+ 
+-extern int errno;
+-
+ /*
+  *	Storage management
+  */
+@@ -374,12 +372,12 @@ void	db_read_group	__APROTO((group_heade
  void	db_read_group	__APROTO((group_header *gh));
  #endif
  void	db_write_group	__APROTO((group_header *gh));
diff --git a/news/nn/patches/patch-be b/news/nn/patches/patch-be
new file mode 100644
index 00000000000..3bd85d0bd5e
--- /dev/null
+++ b/news/nn/patches/patch-be
@@ -0,0 +1,12 @@
+$NetBSD: patch-be,v 1.1 2006/06/01 23:11:29 joerg Exp $
+
+--- global.c.orig	2006-06-01 23:08:34.000000000 +0000
++++ global.c
+@@ -61,7 +61,6 @@ export int who_am_i;
+ export int dont_write_console = 0;
+ export int mail_errors_mode = 2;
+ 
+-extern int errno;
+ struct passwd *getpwuid();
+ extern char *getlogin(), *getenv();
+ 
diff --git a/news/nn/patches/patch-bf b/news/nn/patches/patch-bf
new file mode 100644
index 00000000000..0d6e727929f
--- /dev/null
+++ b/news/nn/patches/patch-bf
@@ -0,0 +1,14 @@
+$NetBSD: patch-bf,v 1.1 2006/06/01 23:11:29 joerg Exp $
+
+--- execute.c.orig	2006-06-01 23:09:21.000000000 +0000
++++ execute.c
+@@ -23,9 +23,6 @@ export char *init_shell = SHELL;
+ export char *user_shell;
+ export char *exec_chdir_to = NULL;
+ 
+-extern int errno;
+-
+-
+ static int
+ shell_check()
+ {