From feec2a3789f77a9261d920043fd83454fc7a6480 Mon Sep 17 00:00:00 2001
From: adam <adam@FreeBSD.org>
Date: Sat, 1 Oct 1994 19:00:06 +0000
Subject: 4.4 fixes. Also added all: target to makefile

---
 news/cnews/files/patch-aa |  4 ++--
 news/cnews/files/patch-ab | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)

(limited to 'news/cnews')

diff --git a/news/cnews/files/patch-aa b/news/cnews/files/patch-aa
index 6d9c42eda99e..2fcdc397680b 100644
--- a/news/cnews/files/patch-aa
+++ b/news/cnews/files/patch-aa
@@ -36,7 +36,7 @@
 + # These answers are interdependent; do not edit this file!
 + addrsize="big"
 + # These answers are interdependent; do not edit this file!
-+ fake=" fsync.o"
++ fake=" fgetline.o fsync.o"
 + # These answers are interdependent; do not edit this file!
 + storeval=""
 + # These answers are interdependent; do not edit this file!
@@ -152,4 +152,4 @@
 + 
 + # fake files needed
 + HFAKE= sys/timeb.h
-+ OFAKE= fsync.o
++ OFAKE= fgetline.o fsync.o
diff --git a/news/cnews/files/patch-ab b/news/cnews/files/patch-ab
index c440b34c1ecb..a1cf811cfbba 100644
--- a/news/cnews/files/patch-ab
+++ b/news/cnews/files/patch-ab
@@ -1,3 +1,56 @@
+*** ../work.old/makefile	Mon Sep 26 16:21:40 1994
+--- ./makefile	Sat Oct  1 11:35:43 1994
+***************
+*** 16,22 ****
+  # System V bug fix
+  SHELL=/bin/sh
+  
+! build:	msub sub mx libcnews.a pgms
+  	: everything built successfully
+  
+  lib:	libcnews.a
+--- 16,22 ----
+  # System V bug fix
+  SHELL=/bin/sh
+  
+! build all:	msub sub mx libcnews.a pgms
+  	: everything built successfully
+  
+  lib:	libcnews.a
+*** ../work.old/util/dostatfs.c	Thu Sep  8 13:06:30 1994
+--- ./util/dostatfs.c	Sat Oct  1 11:27:59 1994
+***************
+*** 6,11 ****
+--- 6,12 ----
+  #include <string.h>
+  #include <sys/types.h>
+  
++ #include <sys/param.h>
+  #include <sys/mount.h>
+  
+  #ifndef MNAMELEN
+***************
+*** 19,26 ****
+  #include <sys/statfs.h>
+  #endif
+  
+- #define	f_fsize	f_bsize		/* idiotic incompatible naming in 4.4 */
+  #endif	/* MNAMELEN */
+  
+  extern int debug;
+  
+--- 20,30 ----
+  #include <sys/statfs.h>
+  #endif
+  
+  #endif	/* MNAMELEN */
++ 
++ #if BSD4_4 >= 1
++ #define	f_fsize	f_bsize		/* idiotic incompatible naming in 4.4 */
++ #endif
+  
+  extern int debug;
+  
 *** ./maint/makefile	Tue Sep 20 21:56:32 1994
 --- ../cnews/maint/makefile	Thu Sep 29 09:40:58 1994
 ***************
-- 
cgit