Fix errno. On DragonFly, force -traditional for cpp.

6 files changed, 55 insertions, 13 deletions

diff --git a/news/nn/Makefile b/news/nn/Makefile
index 636bcd93ff5..da14e8ea61f 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/06/01 23:11:29 joerg Exp $
 
 DISTNAME=	nn-6.6.5
 CATEGORIES=	news
@@ -29,6 +29,10 @@ MFILE=         m-mipsel.h
 MFILE=		m-${LOWER_ARCH}.h
 .endif
 
+.if ${OPSYS} == "DragonFly"
+CPP+=		-traditional
+.endif
+
 MAKE_ENV+=	CC=${CC:Q}
 
 post-patch:
diff --git a/news/nn/distinfo b/news/nn/distinfo
index bb87f6fce61..f81753df415 100644
--- a/news/nn/distinfo
+++ b/news/nn/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/06/17 15:36:32 hira Exp $
+$NetBSD: distinfo,v 1.10 2006/06/01 23:11:29 joerg Exp $
 
 SHA1 (nn-6.6.5.tar.Z) = 7f96de47dd96862fc9eb9b29a251964a01b63b1b
 RMD160 (nn-6.6.5.tar.Z) = 460592974b953ba0d6cb5a7234e6e4d688051090
 Size (nn-6.6.5.tar.Z) = 826135 bytes
-SHA1 (patch-aa) = cf8d85f3ba9f677836f962b814a1ba21e7218faf
+SHA1 (patch-aa) = e82b641d3f67cbf57cfb92dc469e1509c2205286
 SHA1 (patch-ab) = 262d50b08031187e2fc99bf49f547fbcf21a2f39
 SHA1 (patch-ac) = 0388486772d5c8f57438a70b8d3bcfe55be5473d
 SHA1 (patch-ad) = 30f6a683b9d6f6b347822589b72baf8c00ac5c2d
@@ -18,7 +18,7 @@ SHA1 (patch-al) = 86ef5d494eaf07b024640d3d1d2ae36fcff0cb87
 SHA1 (patch-am) = bf8d96a52fb9a4113827a20ccc00ffaced566b8b
 SHA1 (patch-an) = 772ee53b349e0e4b0f70efa5a86682a38e42893c
 SHA1 (patch-ao) = 1eaa536567c78d9a346848a6f5c73d722ef52253
-SHA1 (patch-ap) = 5f6377ae6dea06e5e20c2e003b44c2f05afc22b4
+SHA1 (patch-ap) = a40fe9840594bffc7d8f576b5ea6e49ec7bf4d7d
 SHA1 (patch-aq) = d93d9612b4048242316182326954ffc95f338e07
 SHA1 (patch-ar) = f584b683c3218146507a4fc71369cad58fa43de0
 SHA1 (patch-as) = 1f8688cdf80a9059744a4469461e16647fc9a66f
@@ -33,3 +33,5 @@ SHA1 (patch-ba) = bbc9cbec0d191be082b1f211d146916e07100d43
 SHA1 (patch-bb) = af094b78b3f2fc0cdb77dea834d74a35fbb170a4
 SHA1 (patch-bc) = 981b2abf745d41f82e1dd4b77981457a5f19591c
 SHA1 (patch-bd) = ed29e33c446dc62296d0079e51c6089bb4706a95
+SHA1 (patch-be) = 9a12e0eb1f9f9e821d2beb08adc887dab69382f1
+SHA1 (patch-bf) = 723695b59196db63a0128f60637a4d11a1d7818e
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()
+ {