From 177e36f61fed220e941039108f2df66f33e7b125 Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Mon, 21 Oct 2002 00:15:18 +0000
Subject: Fix build on current (comment out bogus duplicate declarations)

---
 news/gup/files/patch-ab | 15 +++++++++++----
 news/gup/files/patch-ad | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 news/gup/files/patch-ad

(limited to 'news')

diff --git a/news/gup/files/patch-ab b/news/gup/files/patch-ab
index 4da3b19ed584..10dcd052dcec 100644
--- a/news/gup/files/patch-ab
+++ b/news/gup/files/patch-ab
@@ -1,10 +1,17 @@
---- rfc822.h.orig	Sun May  9 12:53:24 1999
-+++ rfc822.h	Sun May  9 12:53:58 1999
-@@ -246,7 +246,6 @@
+--- rfc822.h.orig	Sun Oct 20 16:57:18 2002
++++ rfc822.h	Sun Oct 20 16:57:33 2002
+@@ -243,12 +243,14 @@
+ extern char	*strerror();
+ 
+ /* Variables and routines that Unix(tm) provides. */
++#ifndef __FreeBSD__
  extern int	errno;
  extern int	sys_nerr;
  extern int	optind;
--extern char	*sys_errlist[];
+ extern char	*sys_errlist[];
  extern char	**environ;
  extern char	*optarg;
++#endif
  
+ #ifdef HAVE_UNISTD
+ #include <unistd.h>
diff --git a/news/gup/files/patch-ad b/news/gup/files/patch-ad
new file mode 100644
index 000000000000..b12f3770a258
--- /dev/null
+++ b/news/gup/files/patch-ad
@@ -0,0 +1,20 @@
+--- gup.c.orig	Sun Oct 20 16:55:33 2002
++++ gup.c	Sun Oct 20 16:55:50 2002
+@@ -37,7 +37,7 @@
+ 
+ 
+ char	*progname = "gup";		/* GC */
+-FILE	*log_fp = stderr;
++FILE	*log_fp;
+ 
+ static	char	*usage =
+ "\n\
+@@ -165,6 +165,8 @@
+ 
+     int		changed;
+ 
++    log_fp = stderr;
++ 
+     umask(UMASK);
+ 
+     parse_options(argc, argv);		/* Decode our command line options */
-- 
cgit v1.2.3