3 files changed, 64 insertions, 64 deletions

diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index b4b095f016d9..9e1591b79034 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.14 1996/11/18 14:10:12 asami Exp $
+# $Id: Makefile,v 1.15 1996/11/21 12:10:16 asami Exp $
 #
 
 DISTNAME=	cnews
@@ -23,8 +23,8 @@ MAN8=		cnewsdo.8cn expire.8cn explode.8cn mergeactive.8 \
 		rnews.8cn
 
 NEWSSPOOL=	${PREFIX}/newsspool
-NEWSBIN=	${PREFIX}/libexec/news
-NEWSLIB=	${PREFIX}/lib/news
+NEWSBIN=	${PREFIX}/news/cnewsbin
+NEWSLIB=	${PREFIX}/news/lib
 MANDIR=		${PREFIX}/man
 
 do-install:
diff --git a/news/cnews/files/patch-aa b/news/cnews/files/patch-aa
index e34ccb3ec770..d21942b85be9 100644
--- a/news/cnews/files/patch-aa
+++ b/news/cnews/files/patch-aa
@@ -20,15 +20,15 @@
 + # 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/lib/news"
++ newsctl="/usr/local/news/lib"
 + # These answers are interdependent; do not edit this file!
-+ newsbin="/usr/local/libexec/news"
++ 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/lib/news/bin/config"
++ newsconfig="/usr/local/news/lib/bin/config"
 + # These answers are interdependent; do not edit this file!
 + newscrisis="newscrisis"
 + # These answers are interdependent; do not edit this file!
@@ -72,7 +72,7 @@
 + # These answers are interdependent; do not edit this file!
 + server="newsie"
 + # These answers are interdependent; do not edit this file!
-+ rbin="/usr/local/libexec/news/input"
++ 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!
@@ -85,13 +85,13 @@
 *** 0 ****
 --- 1,8 ----
 + # general substitutions file
-+ NEWSBIN	/usr/local/libexec/news
-+ NEWSCTL	/usr/local/lib/news
++ NEWSBIN	/usr/local/news/cnewsbin
++ NEWSCTL	/usr/local/news/lib
 + NEWSARTS	/var/news
 + NEWSOV	/var/news
 + NEWSPATH	/bin:/usr/bin:/usr/local/bin
 + NEWSUMASK	022
-+ NEWSCONFIG	/usr/local/lib/news/bin/config
++ NEWSCONFIG	/usr/local/news/lib/bin/config
 *** ../work/include/config.make	Wed Dec 31 16:00:00 1969
 --- ./include/config.make	Tue Oct 25 04:00:55 1994
 ***************
@@ -104,18 +104,18 @@
 + # =()<NEWSOV=@<NEWSOV>@>()=
 + NEWSOV=/var/news
 + # =()<NEWSBIN=@<NEWSBIN>@>()=
-+ NEWSBIN=/usr/local/libexec/news
++ NEWSBIN=/usr/local/news/cnewsbin
 + # =()<NEWSCTL=@<NEWSCTL>@>()=
-+ NEWSCTL=/usr/local/lib/news
++ NEWSCTL=/usr/local/news/lib
 + # =()<NEWSCONFIG=@<NEWSCONFIG>@>()=
-+ NEWSCONFIG=/usr/local/lib/news/bin/config
++ NEWSCONFIG=/usr/local/news/lib/bin/config
 + 
 + # workaround for System V make bug
 + SHELL=/bin/sh
 + 
 + # directories where things go
 + UIBIN=/usr/local/bin
-+ RBIN=/usr/local/libexec/news/input
++ RBIN=/usr/local/news/cnewsbin/input
 + 
 + # compilation stuff
 + # LIB is for makefile dependencies, LIBS for cc invocations
diff --git a/news/cnews/pkg-plist b/news/cnews/pkg-plist
index 3b7a6eee6740..42911e640c4c 100644
--- a/news/cnews/pkg-plist
+++ b/news/cnews/pkg-plist
@@ -6,56 +6,56 @@
 @exec cd /usr/local/newsspool; mkdir -p out.going out.master out.nntp
 lib/libcnews.a
 @exec ranlib %D/%F
-lib/news/active
-lib/news/active.times
-lib/news/batchparms
-lib/news/bin
-lib/news/controlperm
-lib/news/explist
-lib/news/history
-lib/news/history.dir
-lib/news/history.pag
-lib/news/inews
-lib/news/mailname
-lib/news/mailpaths
-lib/news/organization
-lib/news/postdefltgroup
-lib/news/readnews.ctl
-lib/news/readnews.help
-lib/news/report.ctl
-lib/news/sys
-lib/news/versionname
-lib/news/whoami
-libexec/news/batch
-libexec/news/canonhdr
-libexec/news/canonsys.awk
-libexec/news/ctime
-libexec/news/ctl
-libexec/news/dbz
-libexec/news/dbzinfo
-libexec/news/decompressors
-libexec/news/dospacefor
-libexec/news/expire
-libexec/news/getabsdate
-libexec/news/gngp
-libexec/news/inject
-libexec/news/input
-libexec/news/lock
-libexec/news/maint
-libexec/news/mkpdir
-libexec/news/namecheck.awk
-libexec/news/newshostname
-libexec/news/newslock
-libexec/news/nov
-libexec/news/now
-libexec/news/queuelen
-libexec/news/relay
-libexec/news/report
-libexec/news/sizeof
-libexec/news/spacefor
-libexec/news/staleness
-libexec/news/touchlock
-libexec/news/unlock
+news/lib/active
+news/lib/active.times
+news/lib/batchparms
+news/lib/bin
+news/lib/controlperm
+news/lib/explist
+news/lib/history
+news/lib/history.dir
+news/lib/history.pag
+news/lib/inews
+news/lib/mailname
+news/lib/mailpaths
+news/lib/organization
+news/lib/postdefltgroup
+news/lib/readnews.ctl
+news/lib/readnews.help
+news/lib/report.ctl
+news/lib/sys
+news/lib/versionname
+news/lib/whoami
+news/cnewsbin/batch
+news/cnewsbin/canonhdr
+news/cnewsbin/canonsys.awk
+news/cnewsbin/ctime
+news/cnewsbin/ctl
+news/cnewsbin/dbz
+news/cnewsbin/dbzinfo
+news/cnewsbin/decompressors
+news/cnewsbin/dospacefor
+news/cnewsbin/expire
+news/cnewsbin/getabsdate
+news/cnewsbin/gngp
+news/cnewsbin/inject
+news/cnewsbin/input
+news/cnewsbin/lock
+news/cnewsbin/maint
+news/cnewsbin/mkpdir
+news/cnewsbin/namecheck.awk
+news/cnewsbin/newshostname
+news/cnewsbin/newslock
+news/cnewsbin/nov
+news/cnewsbin/now
+news/cnewsbin/queuelen
+news/cnewsbin/relay
+news/cnewsbin/report
+news/cnewsbin/sizeof
+news/cnewsbin/spacefor
+news/cnewsbin/staleness
+news/cnewsbin/touchlock
+news/cnewsbin/unlock
 man/man1/checknews.1cn.gz
 man/man1/inews.1cn.gz
 man/man1/postnews.1cn.gz