4 files changed, 52 insertions, 10 deletions

diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index ca6b7b23f090..039675cf07d5 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.18 1998/08/30 15:45:29 steve Exp $
+# $Id: Makefile,v 1.19 1998/12/17 21:54:51 jseger Exp $
 #
 
 DISTNAME=	c-news
@@ -13,12 +13,27 @@ MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/c-news/ \
 		ftp://ftp.funet.fi/pub/unix/news/cnews/ \
 		ftp://ftp.win.or.jp/pub/network/news/cnews/ \
 		ftp://ftp.redcom.ru/pub/unix/usenet/c-news/ \
-		ftp://ftp.mc.hik.se/pub/unix/news/c-news/
+		ftp://ftp.mc.hik.se/pub/unix/news/c-news/ \
+		ftp://ftp.dinoex.org/pub/c-news/
 EXTRACT_SUFX=	.tar.Z
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		pgpverify-1.11
 
-MAINTAINER=	ports@FreeBSD.ORG
+PATCH_SITES=    ftp://ftp.dinoex.org/pub/c-news/
+PATCHFILES=     c-news-patch-fileart.c c-news-patch-namecheck.awk \
+		c-news-patch-newsrun c-news-patch-sendbatches \
+		c-news-patch-ctl-pgp3 c-news-patch-ctl-more \
+		c-news-patch-ctl-regexp \
+		c-news-patch-doexpire c-news-patch-queuelen.tay \
+		c-news-patch-bunzip2 \
+		c-news-patch-ctl-underscore \
+		c-news-patch-pgpverify-1.11
 
+MAINTAINER=	dirk.meyer@dinoex.sub.org
+
+DIST_SUBDIR=	c-news
 NO_WRKSUBDIR=	yes
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAKEFILE=	makefile
 MAN1=		checknews.1cn inews.1cn postnews.1cn readnews.1cn
 MAN5=		controlperm.5 news.5 newsctl.5 newsdb.5 newsoverview.5 \
@@ -31,7 +46,10 @@ MAN8=		cnewsdo.8cn expire.8cn explode.8cn mergeactive.8 \
 NEWSSPOOL=	${PREFIX}/newsspool
 NEWSBIN=	${PREFIX}/news/cnewsbin
 NEWSLIB=	${PREFIX}/news/lib
-MANDIR=		${PREFIX}/man
+PGPVERIFY=	pgpverify-1.11
+
+pre-patch:
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${PGPVERIFY} ${WRKSRC}/${PGPVERIFY}
 
 do-install:
 	${RM} -f ${PREFIX}/bin/inews
@@ -41,6 +59,7 @@ do-install:
 	-ln -s ${NEWSSPOOL} /var/news
 	chown news.news ${NEWSSPOOL} ${NEWSLIB}
 	chown bin.bin ${NEWSBIN}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PGPVERIFY} ${NEWSBIN}/pgpverify
 	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install
 	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} setup
 	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ui readpostcheck
@@ -49,9 +68,15 @@ do-install:
 .endfor
 	chown news.news ${NEWSBIN}/input/newsspool
 	chmod 6755 ${NEWSBIN}/input/newsspool
-	${INSTALL_MAN} ${WRKSRC}/man/*.1* ${MANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/man/*.5* ${MANDIR}/man5
-	${INSTALL_MAN} ${WRKSRC}/man/*.8* ${MANDIR}/man8
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man1
+.endfor
+.for i in ${MAN5}
+	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man5
+.endfor
+.for i in ${MAN8}
+	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man8
+.endfor
 	@${ECHO} ""
 	@${ECHO} "!!!!!!!!"
 	@${ECHO} "you MUST change the configuration of this news setup:"
diff --git a/news/cnews/distinfo b/news/cnews/distinfo
index be863f6c0299..6362f0a40bee 100644
--- a/news/cnews/distinfo
+++ b/news/cnews/distinfo
@@ -1 +1,14 @@
-MD5 (c-news.tar.Z) = c2a144d1dabd2af1b3f6816de5e38b3c
+MD5 (c-news/c-news.tar.Z) = c2a144d1dabd2af1b3f6816de5e38b3c
+MD5 (c-news/pgpverify-1.11) = 247a0659ef396dfa18b9e193d9a5baab
+MD5 (c-news/c-news-patch-fileart.c) = cf003ba4cd88641b620b2b19c3d7c715
+MD5 (c-news/c-news-patch-namecheck.awk) = 4d93aa88bac7459065cad3e4dd86e7cb
+MD5 (c-news/c-news-patch-newsrun) = 6d71577c687f092277d3d3d747477f38
+MD5 (c-news/c-news-patch-sendbatches) = 978b2e56f5b9ddd113ff784ad709b8d7
+MD5 (c-news/c-news-patch-ctl-pgp3) = 3648dd74974928b317f0169f254b19bd
+MD5 (c-news/c-news-patch-ctl-more) = 66aebd0a53ac2340dd2f1493f0096ac7
+MD5 (c-news/c-news-patch-ctl-regexp) = faaa68c80a78199ef6a1e60c6a420eca
+MD5 (c-news/c-news-patch-doexpire) = ffd3c907cdaebe43ea2dfdc49b84686e
+MD5 (c-news/c-news-patch-queuelen.tay) = 58d3e06a518fbf6bfee10081041fb85c
+MD5 (c-news/c-news-patch-bunzip2) = c4893fcaec140b29f1bea42b81e1bdf5
+MD5 (c-news/c-news-patch-ctl-underscore) = 65ddefc8be3793cfc9d1e6d5b8302fd4
+MD5 (c-news/c-news-patch-pgpverify-1.11) = 38c3882ad333a0e1be02fda2352a1c05
diff --git a/news/cnews/files/patch-aa b/news/cnews/files/patch-aa
index d21942b85be9..4b4c54a34013 100644
--- a/news/cnews/files/patch-aa
+++ b/news/cnews/files/patch-aa
@@ -58,7 +58,7 @@
 + # These answers are interdependent; do not edit this file!
 + postlibs=""
 + # These answers are interdependent; do not edit this file!
-+ uucptype="null"
++ uucptype="tay"
 + # These answers are interdependent; do not edit this file!
 + dftype="statfs"
 + # These answers are interdependent; do not edit this file!
@@ -139,7 +139,7 @@
 + # misc configuration bits
 + SPACEFOR=statfs
 + DOSPACEFOR=dospacefor
-+ QUEUELEN=null
++ QUEUELEN=tay
 + UID=news
 + GID=news
 + SIZE=big
diff --git a/news/cnews/pkg-plist b/news/cnews/pkg-plist
index 093ace115417..2899ccbd914b 100644
--- a/news/cnews/pkg-plist
+++ b/news/cnews/pkg-plist
@@ -42,6 +42,7 @@ 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
@@ -62,6 +63,7 @@ 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
@@ -118,6 +120,7 @@ news/cnewsbin/spacefor
 news/cnewsbin/staleness
 news/cnewsbin/touchlock
 news/cnewsbin/unlock
+news/cnewsbin/pgpverify
 news/lib/active
 news/lib/active.times
 news/lib/batchparms
@@ -148,3 +151,4 @@ news/lib/whoami
 @dirrm news/cnewsbin/nov
 @dirrm news/cnewsbin/relay
 @dirrm news/lib/bin
+@dirrm news/cnewsbin