Index: head/news/cnews/files/patch-config.make =================================================================== --- head/news/cnews/files/patch-config.make (revision 432718) +++ head/news/cnews/files/patch-config.make (revision 432719) @@ -1,62 +1,61 @@ -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 +# =()@>()= +NEWSARTS=/var/news +# =()@>()= +NEWSOV=/var/news/over.view +# =()@>()= +NEWSBIN=/usr/local/news/cnewsbin +# =()@>()= +NEWSCTL=/usr/local/news/lib +# =()@>()= +NEWSCONFIG=/usr/local/news/cnewsbin/config + +# workaround for System V make bug +SHELL=/bin/sh + +# directories where things go +UIBIN=/usr/local/bin +RBIN=/usr/local/news/cnewsbin/input + +# compilation stuff +# LIB is for makefile dependencies, LIBS for cc invocations +LIB=../libcnews.a +LIBS=../libcnews.a +CFLAGS+=$(MORECFLAGS) -I../include +LDFLAGS=$(CFLAGS) +LINTFLAGS=$(MORELINTFLAGS) -I../include + +# directories etc. +CONF=../conf +MAKE=make +TO=$(CONF)/cpto +IN=$(CONF)/cmpto $(CMPOPT) +CF=$(CONF)/checkfile $(CMPOPT) +MKDIR=$(CONF)/mkdirs +MX=chmod +x +UPDATE=$(CONF)/update.ran ../libcnews.a +LIBCMP=$(CONF)/libcmp ../libcnews.a + +# misc configuration bits +SPACEFOR=statfs +DOSPACEFOR=dospacefor +QUEUELEN=tay +UID=news +GID=news +SIZE=big +DBZ=libdbz +STDIO=sysstdio +SERVER= +REPORTTO=newsmaster +URGENTTO=newscrisis + +# things for testing +HERE=. ../conf/rsetup ; + +# fake files needed +HFAKE= sys/timeb.h +OFAKE= fgetline.o Index: head/news/cnews/files/patch-cpto =================================================================== --- head/news/cnews/files/patch-cpto (revision 432718) +++ head/news/cnews/files/patch-cpto (revision 432719) @@ -1,11 +1,11 @@ ---- 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 -dest="$1" +dest="${DESTDIR}$1" shift if test ! -d "$dest" then Index: head/news/cnews/files/patch-inject-makefile =================================================================== --- head/news/cnews/files/patch-inject-makefile (revision 432718) +++ head/news/cnews/files/patch-inject-makefile (revision 432719) @@ -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 Index: head/news/cnews/files/patch-input-makefile =================================================================== --- head/news/cnews/files/patch-input-makefile (revision 432718) +++ head/news/cnews/files/patch-input-makefile (revision 432719) @@ -1,11 +1,11 @@ ---- 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) - rm -f $(DEST)/newsspool + rm -f ${DESTDIR}$(DEST)/newsspool $(TO) $(DEST) $(PROGS) $(TO) $(RBIN) $(RCVRS) $(TO) $(DBIN) $(DECS) Index: head/news/cnews/files/patch-makeinc =================================================================== --- head/news/cnews/files/patch-makeinc (revision 432718) +++ head/news/cnews/files/patch-makeinc (revision 432719) @@ -1,7 +1,6 @@ -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 +INCLUDE .include "../include/config.make" Index: head/news/cnews/files/patch-mkdirs =================================================================== --- head/news/cnews/files/patch-mkdirs (revision 432718) +++ head/news/cnews/files/patch-mkdirs (revision 432719) @@ -1,14 +1,14 @@ ---- 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 do - if test ! -d "$d" + if test ! -d "${DESTDIR}$d" then - mkdir "$d" || exit 1 + mkdir "${DESTDIR}$d" || exit 1 fi done exit 0 Index: head/news/cnews/files/patch-quiz =================================================================== --- head/news/cnews/files/patch-quiz (revision 432718) +++ head/news/cnews/files/patch-quiz (revision 432719) @@ -1,19 +1,11 @@ ---- 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 newfakehdrs="$newfakehdrs sys/time.h" Index: head/news/cnews/files/patch-quiz.def =================================================================== --- head/news/cnews/files/patch-quiz.def (revision 432718) +++ head/news/cnews/files/patch-quiz.def (revision 432719) @@ -1,72 +1,71 @@ -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" +# These answers are interdependent; do not edit this file! +newsgid="news" +# These answers are interdependent; do not edit this file! +newsarts="/var/news" +# These answers are interdependent; do not edit this file! +newsov="/var/news/over.view" +# These answers are interdependent; do not edit this file! +newsctl="/usr/local/news/lib" +# These answers are interdependent; do not edit this file! +newsbin="/usr/local/news/cnewsbin" +# These answers are interdependent; do not edit this file! +newspath="/bin:/usr/bin:/usr/local/bin" +# These answers are interdependent; do not edit this file! +newsumask="022" +# These answers are interdependent; do not edit this file! +newsconfig="/usr/local/news/cnewsbin/config" +# These answers are interdependent; do not edit this file! +newscrisis="newscrisis" +# These answers are interdependent; do not edit this file! +newsmaster="newsmaster" +# These answers are interdependent; do not edit this file! +addrsize="big" +# These answers are interdependent; do not edit this file! +fake=" fgetline.o" +# These answers are interdependent; do not edit this file! +storeval="" +# These answers are interdependent; do not edit this file! +faststdio="no" +# These answers are interdependent; do not edit this file! +fakehdrs=" sys/timeb.h" +# These answers are interdependent; do not edit this file! +ranlib="yes" +# These answers are interdependent; do not edit this file! +make="make" +# These answers are interdependent; do not edit this file! +include="bsd" +# These answers are interdependent; do not edit this file! +cc="" +# These answers are interdependent; do not edit this file! +copts="-O" +# These answers are interdependent; do not edit this file! +ldopts="" +# These answers are interdependent; do not edit this file! +postlibs="" +# These answers are interdependent; do not edit this file! +uucptype="tay" +# These answers are interdependent; do not edit this file! +dftype="statfs" +# These answers are interdependent; do not edit this file! +dfdirs="" +# These answers are interdependent; do not edit this file! +archive="yes" +# These answers are interdependent; do not edit this file! +spacelow="no" +# These answers are interdependent; do not edit this file! +nfsgroup="no" +# These answers are interdependent; do not edit this file! +server="newsie" +# These answers are interdependent; do not edit this file! +rbin="/usr/local/news/cnewsbin/input" +# These answers are interdependent; do not edit this file! +bin="/usr/local/bin" +# These answers are interdependent; do not edit this file! +faststrchr="no" +# These answers are interdependent; do not edit this file! +sftype="c" Index: head/news/cnews/files/patch-report =================================================================== --- head/news/cnews/files/patch-report (revision 432718) +++ head/news/cnews/files/patch-report (revision 432719) @@ -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 Index: head/news/cnews/files/patch-substitutions =================================================================== --- head/news/cnews/files/patch-substitutions (revision 432718) +++ head/news/cnews/files/patch-substitutions (revision 432719) @@ -1,12 +1,11 @@ -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 +NEWSCTL /usr/local/news/lib +NEWSARTS /var/news +NEWSOV /var/news/over.view +NEWSPATH /bin:/usr/bin:/usr/local/bin +NEWSUMASK 022 +NEWSCONFIG /usr/local/news/cnewsbin/config