2 files changed, 146 insertions, 59 deletions

diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index 503bc4a65813..d5e84d96b5f6 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.16 1996/12/07 01:30:12 adam Exp $
+# $Id: Makefile,v 1.17 1997/12/10 01:07:40 jseger Exp $
 #
 
 DISTNAME=	cnews
@@ -12,7 +12,9 @@ CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.zoo.toronto.edu/pub/
 EXTRACT_SUFX=	.tar.Z
 
-WRKSRC=		${WRKDIR}
+MAINTAINER=	ports@FreeBSD.ORG
+
+NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 MAN1=		checknews.1cn inews.1cn postnews.1cn readnews.1cn
 MAN5=		controlperm.5 news.5 newsctl.5 newsdb.5 newsoverview.5 \
@@ -22,43 +24,37 @@ MAN8=		cnewsdo.8cn expire.8cn explode.8cn mergeactive.8 \
 		newsmaint.8cn newsoverview.8 relaynews.8cn report.8cn \
 		rnews.8cn
 
-BROKEN=		"Fails while installing bin/inews."
-
 NEWSSPOOL=	${PREFIX}/newsspool
 NEWSBIN=	${PREFIX}/news/cnewsbin
 NEWSLIB=	${PREFIX}/news/lib
 MANDIR=		${PREFIX}/man
 
 do-install:
-	rm -f ${PREFIX}/bin/inews
-	cp ${WRKSRC}/libdbz/dbz.h ${PREFIX}/include
-	cp ${WRKSRC}/libcnews.a ${PREFIX}/lib
-	mkdir -p ${NEWSSPOOL}
+	${RM} -f ${PREFIX}/bin/inews
+	${INSTALL_DATA} ${WRKSRC}/libdbz/dbz.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/libcnews.a ${PREFIX}/lib
+	${MKDIR} ${NEWSSPOOL} ${NEWSBIN} ${NEWSLIB}
 	-ln -s ${NEWSSPOOL} /var/news
-	mkdir -p ${NEWSBIN} ${NEWSLIB}
 	chown news.news ${NEWSSPOOL} ${NEWSLIB}
 	chown bin.bin ${NEWSBIN}
-	cd ${WRKSRC}; \
-		echo ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install | \
-		su -m bin
-	cd ${WRKSRC}; \
-		echo ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} setup | \
-		su -m news
-	cd ${WRKSRC}; \
-		echo ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ui readpostcheck | \
-		su -m bin
+	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install
+	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} setup
+	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ui readpostcheck
+.for f in checknews cnewsdo inews injnews postnews readnews
+	chown bin.bin ${PREFIX}/bin/$f
+.endfor
 	chown news.news ${NEWSBIN}/input/newsspool
 	chmod 6755 ${NEWSBIN}/input/newsspool
-	install -c -o bin -g bin -m 444 ${WRKSRC}/man/*.1* ${MANDIR}/man1
-	install -c -o bin -g bin -m 444 ${WRKSRC}/man/*.5* ${MANDIR}/man5
-	install -c -o bin -g bin -m 444 ${WRKSRC}/man/*.8* ${MANDIR}/man8
-	@echo ""
-	@echo "!!!!!!!!"
-	@echo "you MUST change the configuration of this news setup:"
-	@echo "	cd to ${NEWSLIB} and change the following files..."
-	@echo "mailname, whoami, organization, mailpaths, sys, readnews.ctl, postdefltgroup"
-	@echo "	to suit your local system and news topology."
-	@echo "!!!!!!!!"
-	@echo ""
+	${INSTALL_MAN} ${WRKSRC}/man/*.1* ${MANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man/*.5* ${MANDIR}/man5
+	${INSTALL_MAN} ${WRKSRC}/man/*.8* ${MANDIR}/man8
+	@${ECHO} ""
+	@${ECHO} "!!!!!!!!"
+	@${ECHO} "you MUST change the configuration of this news setup:"
+	@${ECHO} "	cd to ${NEWSLIB} and change the following files..."
+	@${ECHO} "mailname, whoami, organization, mailpaths, sys, readnews.ctl, postdefltgroup"
+	@${ECHO} "	to suit your local system and news topology."
+	@${ECHO} "!!!!!!!!"
+	@${ECHO} ""
 
 .include <bsd.port.mk>
diff --git a/news/cnews/pkg-plist b/news/cnews/pkg-plist
index fc3a767e6c6e..093ace115417 100644
--- a/news/cnews/pkg-plist
+++ b/news/cnews/pkg-plist
@@ -4,56 +4,147 @@
 @exec ln -s /usr/local/newsspool /var/news
 @exec mkdir -p /usr/local/newsspool/in.coming/bad
 @exec cd /usr/local/newsspool; mkdir -p out.going out.master out.nntp
+bin/checknews
+bin/cnewsdo
+bin/inews
+bin/injnews
+bin/postnews
+bin/readnews
+include/dbz.h
 lib/libcnews.a
 @exec ranlib %D/%F
-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/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
+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
+news/cnewsbin/decompressors/bdecode
+news/cnewsbin/decompressors/c7decode
+news/cnewsbin/decompressors/gunzip
 news/cnewsbin/dospacefor
-news/cnewsbin/expire
+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
-news/cnewsbin/input
+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/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
+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
+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
+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
-include/dbz.h
+news/lib/active
+news/lib/active.times
+news/lib/batchparms
+news/lib/bin/config
+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/lib/bin