3 files changed, 146 insertions, 145 deletions
diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index e5a20d185470..9ca4647eb7bd 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -45,7 +45,8 @@ 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=		${WRKDIR}/.PLIST.sed
+PLIST_SUB+=    	NEWSBIN=${NEWSBIN:S=${PREFIX}/==}
+PLIST_SUB+=    	NEWSCTL=${NEWSCTL:S=${PREFIX}/==}
 
 MODIFY=		conf/quiz.def \
 		conf/substitutions \
@@ -85,10 +86,6 @@ pre-configure:
 		-e "s=/usr/local/bin=${PREFIX}/bin=" \
 		${WRKSRC}/${i}.sed >${WRKSRC}/${i}
 .endfor
-	@${SED} \
-		-e "s=news/cnewsbin=${NEWSBIN:S=${PREFIX}/==}=" \
-		-e "s=news/lib=${NEWSCTL:S=${PREFIX}/==}=" \
-		${PKGDIR}/PLIST >${PLIST}
 
 do-install:
 	${RM} -f ${PREFIX}/bin/inews
diff --git a/news/cnews/pkg-descr b/news/cnews/pkg-descr
index 69291be7ca30..b828379f9b67 100644
--- a/news/cnews/pkg-descr
+++ b/news/cnews/pkg-descr
@@ -1 +1,4 @@
 Cnews news transport software
+
+FTP: ftp://ftp.dinoex.org/pub/c-news/
+WWW: http://www.dinoex.net/c-news.html
diff --git a/news/cnews/pkg-plist b/news/cnews/pkg-plist
index 810da7d733b1..567562d87b83 100644
--- a/news/cnews/pkg-plist
+++ b/news/cnews/pkg-plist
@@ -12,144 +12,145 @@ bin/postnews
 bin/readnews
 include/dbz.h
 lib/libcnews.a
-news/cnewsbin/batch/batchcheck
-news/cnewsbin/batch/batcher
-news/cnewsbin/batch/batchih
-news/cnewsbin/batch/batchra
-news/cnewsbin/batch/batchsm
-news/cnewsbin/batch/batchsplit
-news/cnewsbin/batch/batchsplitter
-news/cnewsbin/batch/bencode
-news/cnewsbin/batch/bpfind
-news/cnewsbin/batch/c7encode
-news/cnewsbin/batch/compcun
-news/cnewsbin/batch/nencode
-news/cnewsbin/batch/sendbatches
-news/cnewsbin/batch/usenntpxmit
-news/cnewsbin/batch/viainews
-news/cnewsbin/batch/viamail
-news/cnewsbin/batch/viarsh
-news/cnewsbin/batch/viauux
-news/cnewsbin/canonhdr
-news/cnewsbin/canonsys.awk
-news/cnewsbin/ctime
-news/cnewsbin/ctl/checkgroups
-news/cnewsbin/ctl/newgroup
-news/cnewsbin/ctl/rmgroup
-news/cnewsbin/ctl/sendsys
-news/cnewsbin/ctl/version
-news/cnewsbin/dbz
-news/cnewsbin/dbzinfo
-news/cnewsbin/decompressors/bdecode
-news/cnewsbin/decompressors/bunzip2
-news/cnewsbin/decompressors/c7decode
-news/cnewsbin/decompressors/gunzip
-news/cnewsbin/dospacefor
-news/cnewsbin/expire/doexpire
-news/cnewsbin/expire/expire
-news/cnewsbin/expire/expireiflow
-news/cnewsbin/expire/upact
-news/cnewsbin/getabsdate
-news/cnewsbin/gngp
-news/cnewsbin/inject/actflag
-news/cnewsbin/inject/defaults
-news/cnewsbin/inject/defhdrs.awk
-news/cnewsbin/inject/inews
-news/cnewsbin/inject/injnews
-news/cnewsbin/inject/lines
-news/cnewsbin/inject/modroute
-news/cnewsbin/inject/pnews
-news/cnewsbin/inject/postnews
-news/cnewsbin/inject/tear
-news/cnewsbin/input/bdecode
-news/cnewsbin/input/bunzip2
-news/cnewsbin/input/c7decode
-news/cnewsbin/input/cunbatch
-news/cnewsbin/input/newsrun
-news/cnewsbin/input/newsrunning
-news/cnewsbin/input/newsspool
-news/cnewsbin/input/recenews
-news/cnewsbin/input/recpnews
-news/cnewsbin/input/rnews
-news/cnewsbin/lock
-news/cnewsbin/maint/act.to.times
-news/cnewsbin/maint/adddirs
-news/cnewsbin/maint/addgroup
-news/cnewsbin/maint/addmissing
-news/cnewsbin/maint/badexpiry
-news/cnewsbin/maint/checkactive
-news/cnewsbin/maint/delgroup
-news/cnewsbin/maint/histdups
-news/cnewsbin/maint/histfrom
-news/cnewsbin/maint/histinfo
-news/cnewsbin/maint/locknews
-news/cnewsbin/maint/logroll
-news/cnewsbin/maint/mergeactive
-news/cnewsbin/maint/mkhistory
-news/cnewsbin/maint/newsboot
-news/cnewsbin/maint/newsdaily
-news/cnewsbin/maint/newsflag
-news/cnewsbin/maint/newsfrom
-news/cnewsbin/maint/newshist
-news/cnewsbin/maint/newswatch
-news/cnewsbin/maint/spaceshort
-news/cnewsbin/mkpdir
-news/cnewsbin/namecheck.awk
-news/cnewsbin/newshostname
-news/cnewsbin/newslock
-news/cnewsbin/nov/domkov
-news/cnewsbin/nov/expov
-news/cnewsbin/nov/expovguts
-news/cnewsbin/nov/initov
-news/cnewsbin/nov/mkov
-news/cnewsbin/nov/ovsplit
-news/cnewsbin/now
-news/cnewsbin/queuelen
-news/cnewsbin/relay/delsendsys
-news/cnewsbin/relay/delversion
-news/cnewsbin/relay/dodelayed
-news/cnewsbin/relay/doexplode
-news/cnewsbin/relay/explode
-news/cnewsbin/relay/newsreply
-news/cnewsbin/relay/relaynews
-news/cnewsbin/relay/relayrun
-news/cnewsbin/report
-news/cnewsbin/sizeof
-news/cnewsbin/spacefor
-news/cnewsbin/staleness
-news/cnewsbin/touchlock
-news/cnewsbin/unlock
-news/cnewsbin/pgpverify
-news/cnewsbin/config
-news/lib/active
-news/lib/active.times
-news/lib/batchparms
-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
-@dirrm news/cnewsbin/batch
-@dirrm news/cnewsbin/ctl
-@dirrm news/cnewsbin/decompressors
-@dirrm news/cnewsbin/expire
-@dirrm news/cnewsbin/inject
-@dirrm news/cnewsbin/input
-@dirrm news/cnewsbin/maint
-@dirrm news/cnewsbin/nov
-@dirrm news/cnewsbin/relay
-@dirrm news/cnewsbin
-@dirrm news/lib/bin
-@dirrm news/lib
+@exec ranlib %D/%F
+%%NEWSBIN%%/batch/batchcheck
+%%NEWSBIN%%/batch/batcher
+%%NEWSBIN%%/batch/batchih
+%%NEWSBIN%%/batch/batchra
+%%NEWSBIN%%/batch/batchsm
+%%NEWSBIN%%/batch/batchsplit
+%%NEWSBIN%%/batch/batchsplitter
+%%NEWSBIN%%/batch/bencode
+%%NEWSBIN%%/batch/bpfind
+%%NEWSBIN%%/batch/c7encode
+%%NEWSBIN%%/batch/compcun
+%%NEWSBIN%%/batch/nencode
+%%NEWSBIN%%/batch/sendbatches
+%%NEWSBIN%%/batch/usenntpxmit
+%%NEWSBIN%%/batch/viainews
+%%NEWSBIN%%/batch/viamail
+%%NEWSBIN%%/batch/viarsh
+%%NEWSBIN%%/batch/viauux
+%%NEWSBIN%%/canonhdr
+%%NEWSBIN%%/canonsys.awk
+%%NEWSBIN%%/ctime
+%%NEWSBIN%%/ctl/checkgroups
+%%NEWSBIN%%/ctl/newgroup
+%%NEWSBIN%%/ctl/rmgroup
+%%NEWSBIN%%/ctl/sendsys
+%%NEWSBIN%%/ctl/version
+%%NEWSBIN%%/dbz
+%%NEWSBIN%%/dbzinfo
+%%NEWSBIN%%/decompressors/bdecode
+%%NEWSBIN%%/decompressors/bunzip2
+%%NEWSBIN%%/decompressors/c7decode
+%%NEWSBIN%%/decompressors/gunzip
+%%NEWSBIN%%/dospacefor
+%%NEWSBIN%%/expire/doexpire
+%%NEWSBIN%%/expire/expire
+%%NEWSBIN%%/expire/expireiflow
+%%NEWSBIN%%/expire/upact
+%%NEWSBIN%%/getabsdate
+%%NEWSBIN%%/gngp
+%%NEWSBIN%%/inject/actflag
+%%NEWSBIN%%/inject/defaults
+%%NEWSBIN%%/inject/defhdrs.awk
+%%NEWSBIN%%/inject/inews
+%%NEWSBIN%%/inject/injnews
+%%NEWSBIN%%/inject/lines
+%%NEWSBIN%%/inject/modroute
+%%NEWSBIN%%/inject/pnews
+%%NEWSBIN%%/inject/postnews
+%%NEWSBIN%%/inject/tear
+%%NEWSBIN%%/input/bdecode
+%%NEWSBIN%%/input/bunzip2
+%%NEWSBIN%%/input/c7decode
+%%NEWSBIN%%/input/cunbatch
+%%NEWSBIN%%/input/newsrun
+%%NEWSBIN%%/input/newsrunning
+%%NEWSBIN%%/input/newsspool
+%%NEWSBIN%%/input/recenews
+%%NEWSBIN%%/input/recpnews
+%%NEWSBIN%%/input/rnews
+%%NEWSBIN%%/lock
+%%NEWSBIN%%/maint/act.to.times
+%%NEWSBIN%%/maint/adddirs
+%%NEWSBIN%%/maint/addgroup
+%%NEWSBIN%%/maint/addmissing
+%%NEWSBIN%%/maint/badexpiry
+%%NEWSBIN%%/maint/checkactive
+%%NEWSBIN%%/maint/delgroup
+%%NEWSBIN%%/maint/histdups
+%%NEWSBIN%%/maint/histfrom
+%%NEWSBIN%%/maint/histinfo
+%%NEWSBIN%%/maint/locknews
+%%NEWSBIN%%/maint/logroll
+%%NEWSBIN%%/maint/mergeactive
+%%NEWSBIN%%/maint/mkhistory
+%%NEWSBIN%%/maint/newsboot
+%%NEWSBIN%%/maint/newsdaily
+%%NEWSBIN%%/maint/newsflag
+%%NEWSBIN%%/maint/newsfrom
+%%NEWSBIN%%/maint/newshist
+%%NEWSBIN%%/maint/newswatch
+%%NEWSBIN%%/maint/spaceshort
+%%NEWSBIN%%/mkpdir
+%%NEWSBIN%%/namecheck.awk
+%%NEWSBIN%%/newshostname
+%%NEWSBIN%%/newslock
+%%NEWSBIN%%/nov/domkov
+%%NEWSBIN%%/nov/expov
+%%NEWSBIN%%/nov/expovguts
+%%NEWSBIN%%/nov/initov
+%%NEWSBIN%%/nov/mkov
+%%NEWSBIN%%/nov/ovsplit
+%%NEWSBIN%%/now
+%%NEWSBIN%%/queuelen
+%%NEWSBIN%%/relay/delsendsys
+%%NEWSBIN%%/relay/delversion
+%%NEWSBIN%%/relay/dodelayed
+%%NEWSBIN%%/relay/doexplode
+%%NEWSBIN%%/relay/explode
+%%NEWSBIN%%/relay/newsreply
+%%NEWSBIN%%/relay/relaynews
+%%NEWSBIN%%/relay/relayrun
+%%NEWSBIN%%/report
+%%NEWSBIN%%/sizeof
+%%NEWSBIN%%/spacefor
+%%NEWSBIN%%/staleness
+%%NEWSBIN%%/touchlock
+%%NEWSBIN%%/unlock
+%%NEWSBIN%%/pgpverify
+%%NEWSBIN%%/config
+%%NEWSCTL%%/active
+%%NEWSCTL%%/active.times
+%%NEWSCTL%%/batchparms
+%%NEWSCTL%%/controlperm
+%%NEWSCTL%%/explist
+%%NEWSCTL%%/history
+%%NEWSCTL%%/history.dir
+%%NEWSCTL%%/history.pag
+%%NEWSCTL%%/inews
+%%NEWSCTL%%/mailname
+%%NEWSCTL%%/mailpaths
+%%NEWSCTL%%/organization
+%%NEWSCTL%%/postdefltgroup
+%%NEWSCTL%%/readnews.ctl
+%%NEWSCTL%%/readnews.help
+%%NEWSCTL%%/report.ctl
+%%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