2 files changed, 45 insertions, 48 deletions

diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index f1d7c1fd8630..dcc07f080c6b 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cnews
 PORTVERSION=	cr.g
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/c-news/ \
 		ftp://ftp.funet.fi/pub/unix/news/cnews/ \
@@ -46,19 +46,22 @@ MAN8=		cnewsdo.8cn expire.8cn explode.8cn mergeactive.8 \
 		mkhistory.8cn newsaux.8cn newsbatch.8cn newsmail.8cn \
 		newsmaint.8cn newsoverview.8 relaynews.8cn report.8cn \
 		rnews.8cn
-PLIST_SUB+=	NEWSBIN=${NEWSBIN:S=${PREFIX}/==}
-PLIST_SUB+=	NEWSCTL=${NEWSCTL:S=${PREFIX}/==}
-PLIST_SUB+=	NEWSARTS=${NEWSARTS:S=${PREFIX}/==}
-PLIST_SUB+=	NEWSOV=${NEWSOV:S=${PREFIX}/==}
+PLIST_SUB+=	VARBASE=${VARBASE}
+PLIST_SUB+=	NEWSBIN=${NEWSBIN:S=^${PREFIX}/==}
+PLIST_SUB+=	NEWSCTL=${NEWSCTL:S=^${VARBASE}/==}
+PLIST_SUB+=	NEWSCTLBASE=${NEWSCTL:S=/news==:S=^${VARBASE}/==}
+PLIST_SUB+=	NEWSARTS=${NEWSARTS:S=^${VARBASE}/==}
+PLIST_SUB+=	NEWSOV=${NEWSOV:S=^${VARBASE}/==}
 
 MODIFY=		conf/quiz.def \
 		conf/substitutions \
 		include/config.make
 
+VARBASE?=	/var
 NEWSBIN?=	${PREFIX}/libexec/cnews
-NEWSCTL?=	${PREFIX}/news/lib
-NEWSARTS?=	/var/news
-NEWSOV?=	/var/news/over.view
+NEWSCTL?=	${VARBASE}/lib/news
+NEWSARTS?=	${VARBASE}/news
+NEWSOV?=	${VARBASE}/news
 PGPVERIFY?=	pgpverify-1.12
 
 .include <bsd.port.pre.mk>
diff --git a/news/cnews/pkg-plist b/news/cnews/pkg-plist
index aa4b9effe9f1..03738064dd09 100644
--- a/news/cnews/pkg-plist
+++ b/news/cnews/pkg-plist
@@ -118,6 +118,19 @@ lib/libcnews.a
 %%NEWSBIN%%/unlock
 %%NEWSBIN%%/pgpverify
 %%NEWSBIN%%/config
+@dirrm %%NEWSBIN%%/batch
+@dirrm %%NEWSBIN%%/ctl
+@dirrm %%NEWSBIN%%/decompressors
+@dirrm %%NEWSBIN%%/expire
+@dirrm %%NEWSBIN%%/inject
+@dirrm %%NEWSBIN%%/input
+@dirrm %%NEWSBIN%%/maint
+@dirrm %%NEWSBIN%%/nov
+@dirrm %%NEWSBIN%%/relay
+@dirrm %%NEWSBIN%%
+@cwd %%VARBASE%%
+@owner news
+@group news
 %%NEWSCTL%%/active
 %%NEWSCTL%%/active.times
 %%NEWSCTL%%/batchparms
@@ -137,45 +150,26 @@ lib/libcnews.a
 %%NEWSCTL%%/sys
 %%NEWSCTL%%/versionname
 %%NEWSCTL%%/whoami
-@dirrm %%NEWSBIN%%/batch
-@dirrm %%NEWSBIN%%/ctl
-@dirrm %%NEWSBIN%%/decompressors
-@dirrm %%NEWSBIN%%/expire
-@dirrm %%NEWSBIN%%/inject
-@dirrm %%NEWSBIN%%/input
-@dirrm %%NEWSBIN%%/maint
-@dirrm %%NEWSBIN%%/nov
-@dirrm %%NEWSBIN%%/relay
-@dirrm %%NEWSBIN%%
 @dirrm %%NEWSCTL%%/bin
 @dirrm %%NEWSCTL%%
-@dirrm news
-@exec mkdir %D/%%NEWSCTL%%/bin
-@exec mkdir -p %%NEWSOV%%/control
-@exec mkdir -p %%NEWSOV%%/junk
-@exec mkdir -p %%NEWSOV%%/news/announce/newusers
-@unexec rmdir %%NEWSOV%%/control
-@unexec rmdir %%NEWSOV%%/junk
-@unexec rmdir %%NEWSOV%%/news/announce/newusers
-@unexec rmdir %%NEWSOV%%/news/announce
-@unexec rmdir %%NEWSOV%%/news
-@unexec rmdir %%NEWSOV%%
-@exec mkdir -p %%NEWSARTS%%/control
-@exec mkdir -p %%NEWSARTS%%/junk
-@exec mkdir -p %%NEWSARTS%%/news/announce/newusers
-@exec mkdir -p %%NEWSARTS%%/in.coming/bad
-@exec mkdir -p %%NEWSARTS%%/out.going
-@exec mkdir -p %%NEWSARTS%%/out.master
-@exec mkdir -p %%NEWSARTS%%/out.nntp
-@exec chown -R news:news %%NEWSARTS%%
-@unexec rmdir %%NEWSARTS%%/control
-@unexec rmdir %%NEWSARTS%%/junk
-@unexec rmdir %%NEWSARTS%%/news/announce/newusers
-@unexec rmdir %%NEWSARTS%%/news/announce
-@unexec rmdir %%NEWSARTS%%/news
-@unexec rmdir %%NEWSARTS%%/in.coming/bad
-@unexec rmdir %%NEWSARTS%%/in.coming
-@unexec rmdir %%NEWSARTS%%/out.going
-@unexec rmdir %%NEWSARTS%%/out.master
-@unexec rmdir %%NEWSARTS%%/out.nntp
-@unexec rmdir %%NEWSARTS%%
+@dirrm %%NEWSCTLBASE%%
+@exec mkdir -p %D/%%NEWSCTL%%/bin
+@dirrm %%NEWSARTS%%/control
+@dirrm %%NEWSARTS%%/junk
+@dirrm %%NEWSARTS%%/news/announce/newusers
+@dirrm %%NEWSARTS%%/news/announce
+@dirrm %%NEWSARTS%%/news
+@dirrm %%NEWSARTS%%/in.coming/bad
+@dirrm %%NEWSARTS%%/in.coming
+@dirrm %%NEWSARTS%%/out.going
+@dirrm %%NEWSARTS%%/out.master
+@dirrm %%NEWSARTS%%/out.nntp
+@dirrm %%NEWSARTS%%
+@exec mkdir -p %D/%%NEWSARTS%%/control
+@exec mkdir -p %D/%%NEWSARTS%%/junk
+@exec mkdir -p %D/%%NEWSARTS%%/news/announce/newusers
+@exec mkdir -p %D/%%NEWSARTS%%/in.coming/bad
+@exec chmod g+w %D/%%NEWSARTS%%/in.coming
+@exec mkdir -p %D/%%NEWSARTS%%/out.going
+@exec mkdir -p %D/%%NEWSARTS%%/out.master
+@exec mkdir -p %D/%%NEWSARTS%%/out.nntp