- make portlint happier

10 files changed, 41 insertions, 66 deletions

diff --git a/news/cnews/files/patch-config.make b/news/cnews/files/patch-config.make
index 257dac57c176..0f402a6aca3c 100644
--- a/news/cnews/files/patch-config.make
+++ b/news/cnews/files/patch-config.make
@@ -1,6 +1,5 @@
-diff -urN ../pre-conf/include/config.make include/config.make
---- ../pre-conf/include/config.make	Thu Jan  1 01:00:00 1970
-+++ include/config.make	Mon Aug  2 20:36:19 1999
+--- include/config.make.orig	1970-01-01 01:00:00 UTC
++++ include/config.make
 @@ -0,0 +1,58 @@
 +# make header file
 +# pathname variables
diff --git a/news/cnews/files/patch-cpto b/news/cnews/files/patch-cpto
index c9626d5956e2..f0164e185559 100644
--- a/news/cnews/files/patch-cpto
+++ b/news/cnews/files/patch-cpto
@@ -1,6 +1,6 @@
---- conf/cpto.orig	1994-09-15 22:42:45.000000000 +0200
-+++ conf/cpto	2013-12-18 11:12:51.000000000 +0100
-@@ -21,7 +21,7 @@
+--- conf/cpto.orig	1994-09-15 20:42:45 UTC
++++ conf/cpto
+@@ -21,7 +21,7 @@ case "$#" in
  0|1)	echo "Usage: $0 dir file ..." >&2 ; exit 2	;;
  esac
  
diff --git a/news/cnews/files/patch-inject-makefile b/news/cnews/files/patch-inject-makefile
index f48803358108..2ecbf9ac4c89 100644
--- a/news/cnews/files/patch-inject-makefile
+++ b/news/cnews/files/patch-inject-makefile
@@ -1,15 +1,9 @@
-*** inject/makefile.ORIG	Thu Dec 29 00:30:01 1994
---- inject/makefile	Thu Feb 23 11:21:46 1995
-***************
-*** 57,61 ****
-  	cp $(PROGS) ../util/canonhdr regress/tmp/inject
-  	$(MX) regress/regress regress/master/run
-  	$(HERE) cd regress ; NEWSTZ=3660 ; export NEWSTZ ; ./regress
-! 	
-  # header dependencies follow
---- 57,61 ----
-  	cp $(PROGS) ../util/canonhdr regress/tmp/inject
-  	$(MX) regress/regress regress/master/run
-  	$(HERE) cd regress ; NEWSTZ=3660 ; export NEWSTZ ; ./regress
-! 
-  # header dependencies follow
+--- inject/makefile.orig	1994-12-28 23:30:01 UTC
++++ inject/makefile
+@@ -57,5 +57,5 @@ r:	rclean $(PROGS) ../util/canonhdr
+ 	cp $(PROGS) ../util/canonhdr regress/tmp/inject
+ 	$(MX) regress/regress regress/master/run
+ 	$(HERE) cd regress ; NEWSTZ=3660 ; export NEWSTZ ; ./regress
+-	
++
+ # header dependencies follow
diff --git a/news/cnews/files/patch-input-makefile b/news/cnews/files/patch-input-makefile
index 0beef71164fa..373ac0718b64 100644
--- a/news/cnews/files/patch-input-makefile
+++ b/news/cnews/files/patch-input-makefile
@@ -1,6 +1,6 @@
---- input/makefile.orig	1995-01-02 22:48:40.000000000 +0100
-+++ input/makefile	2013-12-18 11:20:24.000000000 +0100
-@@ -17,7 +17,7 @@
+--- input/makefile.orig	1995-01-02 21:48:40 UTC
++++ input/makefile
+@@ -17,7 +17,7 @@ all:	$(ALL)
  
  install:	$(PROGS)
  	$(MKDIR) $(DEST) $(DBIN)
diff --git a/news/cnews/files/patch-makeinc b/news/cnews/files/patch-makeinc
index 722acecbb905..812b431eefff 100644
--- a/news/cnews/files/patch-makeinc
+++ b/news/cnews/files/patch-makeinc
@@ -1,6 +1,5 @@
-diff -urN ../pre-conf/conf/makeinc conf/makeinc
---- ../pre-conf/conf/makeinc	Thu Jan  1 01:00:00 1970
-+++ conf/makeinc	Mon Aug  2 20:32:23 1999
+--- conf/makeinc.orig	1970-01-01 01:00:00 UTC
++++ conf/makeinc
 @@ -0,0 +1,3 @@
 +# makefile substitutions file
 +# how to include ../include/config.make
diff --git a/news/cnews/files/patch-mkdirs b/news/cnews/files/patch-mkdirs
index 7af0ec163667..cdf43cdda8b2 100644
--- a/news/cnews/files/patch-mkdirs
+++ b/news/cnews/files/patch-mkdirs
@@ -1,5 +1,5 @@
---- conf/mkdirs.orig	1993-07-11 05:10:40.000000000 +0200
-+++ conf/mkdirs	2013-12-18 11:18:16.000000000 +0100
+--- conf/mkdirs.orig	1993-07-11 03:10:40 UTC
++++ conf/mkdirs
 @@ -1,9 +1,9 @@
  #! /bin/sh
  for d
diff --git a/news/cnews/files/patch-quiz b/news/cnews/files/patch-quiz
index 3d1be18ff99b..dde0142d94b9 100644
--- a/news/cnews/files/patch-quiz
+++ b/news/cnews/files/patch-quiz
@@ -1,18 +1,10 @@
---- quiz.orig	1995-04-28 02:50:34.000000000 +0200
-+++ quiz	2016-09-05 23:40:26.915845000 +0200
-@@ -268,11 +268,11 @@
- esac
- 
- newfakehdrs=
--#if test " `$notinlist "$newfake" ftime.o`" != " yes"
--#then
--#	newfakehdrs="$newfakehdrs sys/timeb.h"
--#fi
+--- quiz.orig	1995-04-28 00:50:34 UTC
++++ quiz
+@@ -272,7 +272,7 @@ newfakehdrs=
+ #then
+ #	newfakehdrs="$newfakehdrs sys/timeb.h"
+ #fi
 -newfakehdrs="$newfakehdrs sys/timeb.h"
-+#if test " `$notinlist "$newfake" ftime.o`" != " yes"
-+#then
-+#	newfakehdrs="$newfakehdrs sys/timeb.h"
-+#fi
 +#newfakehdrs="$newfakehdrs sys/timeb.h"
  if test " `$notinlist "$newfake" gettimeofday.o`" != " yes"
  then
diff --git a/news/cnews/files/patch-quiz.def b/news/cnews/files/patch-quiz.def
index 79bb1366ac93..1be1b693c7e9 100644
--- a/news/cnews/files/patch-quiz.def
+++ b/news/cnews/files/patch-quiz.def
@@ -1,6 +1,5 @@
-diff -urN ../pre-conf/conf/quiz.def conf/quiz.def
---- ../pre-conf/conf/quiz.def	Thu Jan  1 01:00:00 1970
-+++ conf/quiz.def	Mon Aug  2 20:36:19 1999
+--- conf/quiz.def.orig	1970-01-01 01:00:00 UTC
++++ conf/quiz.def
 @@ -0,0 +1,68 @@
 +# These answers are interdependent; do not edit this file!
 +newsuid="news"
diff --git a/news/cnews/files/patch-report b/news/cnews/files/patch-report
index 04f8984bba4f..a61bbc8e703b 100644
--- a/news/cnews/files/patch-report
+++ b/news/cnews/files/patch-report
@@ -1,17 +1,10 @@
-*** util/report.old	Thu Sep 15 13:24:57 1994
---- util/report	Fri Sep 30 16:57:05 1994
-***************
-*** 65,70 ****
-  	else
-  		cat $r
-  	fi
-! ) | mail $args		# some sites might want "/usr/lib/sendmail -t" instead
-  
-  # and the trap handles the exit status
---- 65,70 ----
-  	else
-  		cat $r
-  	fi
-! ) | /usr/sbin/sendmail -t $args	# some sites might want "mail" instead
-  
-  # and the trap handles the exit status
+--- util/report.orig	1994-09-15 20:24:57 UTC
++++ util/report
+@@ -65,6 +65,6 @@ fi
+ 	else
+ 		cat $r
+ 	fi
+-) | mail $args		# some sites might want "/usr/lib/sendmail -t" instead
++) | /usr/sbin/sendmail -t $args	# some sites might want "mail" instead
+ 
+ # and the trap handles the exit status
diff --git a/news/cnews/files/patch-substitutions b/news/cnews/files/patch-substitutions
index a22a60de1c4e..8c2111fd8036 100644
--- a/news/cnews/files/patch-substitutions
+++ b/news/cnews/files/patch-substitutions
@@ -1,6 +1,5 @@
-diff -urN ../pre-conf/conf/substitutions conf/substitutions
---- ../pre-conf/conf/substitutions	Thu Jan  1 01:00:00 1970
-+++ conf/substitutions	Mon Aug  2 20:36:19 1999
+--- conf/substitutions.orig	1970-01-01 01:00:00 UTC
++++ conf/substitutions
 @@ -0,0 +1,8 @@
 +# general substitutions file
 +NEWSBIN	/usr/local/news/cnewsbin