Macros defined in "config.h" cause prototypes in <strings.h> to break,

so include the latter before the former.

5 files changed, 67 insertions, 14 deletions

diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
index ebcbcc7ed87..c7f7fc9034a 100644
--- a/news/nntpclnt/Makefile
+++ b/news/nntpclnt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/12/03 15:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/04/01 03:28:36 kim Exp $
 
 DISTNAME=	nntpclnt-1.6.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/
 
diff --git a/news/nntpclnt/distinfo b/news/nntpclnt/distinfo
index 79a0294b884..13f96ef2421 100644
--- a/news/nntpclnt/distinfo
+++ b/news/nntpclnt/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:19:55 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/04/01 03:28:36 kim Exp $
 
 SHA1 (nntpclnt-1.6.1.tar.gz) = df24e9083185680d85bdc016e9e4ba54f4071f80
 RMD160 (nntpclnt-1.6.1.tar.gz) = b3d8ec94d74cc1a0f88264756b89c91fabde0750
 Size (nntpclnt-1.6.1.tar.gz) = 34369 bytes
-SHA1 (patch-aa) = 62bcf11bb2cb0b39baf8188816a039165e9e6338
-SHA1 (patch-ab) = 2cffb1a1eb68c7520bef6b81d41c924e5aa5be2c
+SHA1 (patch-aa) = 187e8e36a38d29ea77eb50aa3736c4d476a74dd3
+SHA1 (patch-ab) = 594f068acbc6794cc4e22c77d3474ea7673a4f87
 SHA1 (patch-ac) = ed067e2f2c6c22e32ca388dc6f990aa720d762aa
+SHA1 (patch-ad) = 1b648dcaba5625326e17ecdce90622a02e207f17
diff --git a/news/nntpclnt/patches/patch-aa b/news/nntpclnt/patches/patch-aa
index e702e8a4236..b208db33222 100644
--- a/news/nntpclnt/patches/patch-aa
+++ b/news/nntpclnt/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2002/09/18 06:28:06 tron Exp $
+$NetBSD: patch-aa,v 1.4 2005/04/01 03:28:36 kim Exp $
 
---- uname.c.orig	Thu Aug 11 23:37:53 1994
-+++ uname.c	Wed Sep 18 08:26:34 2002
-@@ -16,6 +16,7 @@
+--- uname.c.orig	1994-08-11 17:37:53.000000000 -0400
++++ uname.c	2005-03-31 22:23:31.000000000 -0500
+@@ -15,6 +15,7 @@
+ static char	*rcsId = "@(#)$Id: patch-aa,v 1.4 2005/04/01 03:28:36 kim Exp $";
  
  #include <stdio.h>
- #include "config.h"
 +#include <strings.h>
+ #include "config.h"
  
  #ifdef DOUNAME
- # define DONE
 @@ -66,14 +67,13 @@
  char *uptr;
  {
diff --git a/news/nntpclnt/patches/patch-ab b/news/nntpclnt/patches/patch-ab
index b26b8d9c3f9..bd9ea5af936 100644
--- a/news/nntpclnt/patches/patch-ab
+++ b/news/nntpclnt/patches/patch-ab
@@ -1,7 +1,31 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:11:13 agc Exp $
+$NetBSD: patch-ab,v 1.3 2005/04/01 03:28:36 kim Exp $
 
---- nntpclnt.c.orig	Thu Aug 11 23:37:51 1994
-+++ nntpclnt.c	Fri May 22 10:20:49 1998
+--- nntpclnt.c.orig	1994-08-11 17:37:51.000000000 -0400
++++ nntpclnt.c	2005-03-31 22:25:28.000000000 -0500
+@@ -24,6 +24,11 @@
+  * Include configuration parameters only if we're made in the nntp tree.
+  */
+ 
++#if defined(USG) || defined(MSDOS)
++#include <string.h>
++#else
++#include <strings.h>
++#endif
+ #ifdef NNTPSRC
+ #include "config.h"
+ #endif /* NNTPSRC */
+@@ -64,11 +69,6 @@
+ #define net_read(a,b,c,d,e)        soread(a,b,c)
+ #define net_write(a,b,c,d)	   sowrite(a,b,c)
+ #endif
+-#if defined(USG) || defined(MSDOS)
+-#include <string.h>
+-#else
+-#include <strings.h>
+-#endif
+ #include "nntpclnt.h"
+ #ifdef NONETDB
+ # define        IPPORT_NNTP     ((unsigned short) 119)
 @@ -199,7 +199,7 @@
  server_init(machine)
  char    *machine;
diff --git a/news/nntpclnt/patches/patch-ad b/news/nntpclnt/patches/patch-ad
new file mode 100644
index 00000000000..67072be4600
--- /dev/null
+++ b/news/nntpclnt/patches/patch-ad
@@ -0,0 +1,28 @@
+$NetBSD: patch-ad,v 1.1 2005/04/01 03:28:36 kim Exp $
+
+--- inews.c.orig	1994-08-11 17:37:50.000000000 -0400
++++ inews.c	2005-03-31 22:22:59.000000000 -0500
+@@ -17,6 +17,11 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#ifdef USG
++#include <string.h>
++#else /* not USG */
++#include <strings.h>
++#endif /* not USG */
+ #include "config.h"
+ #include "nntp.h"
+ #include "nntpclnt.h"
+@@ -27,11 +32,6 @@
+ extern struct passwd *getpwnam();
+ #endif
+ #endif
+-#ifdef USG
+-#include <string.h>
+-#else /* not USG */
+-#include <strings.h>
+-#endif /* not USG */
+ /* for gen_frompath() */
+ #define FROM 1
+ #define PATH 2