11 files changed, 51 insertions, 42 deletions

diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index 80dcc741bc34..117f108c94f9 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.12 1995/10/05 10:20:26 adam Exp $
+# $Id: Makefile,v 1.13 1996/11/18 11:37:31 asami Exp $
 #
 
 DISTNAME=	cnews
@@ -14,6 +14,13 @@ EXTRACT_SUFX=	.tar.Z
 
 WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
+MAN1=		checknews.1cn inews.1cn postnews.1cn readnews.1cn
+MAN5=		controlperm.5 news.5 newsctl.5 newsdb.5 newsoverview.5 \
+		newssys.5 \
+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
 
 NEWSSPOOL=	${PREFIX}/newsspool
 NEWSBIN=	${PREFIX}/libexec/news
@@ -40,7 +47,6 @@ do-install:
 		su -m bin
 	chown news.news ${NEWSBIN}/input/newsspool
 	chmod 6755 ${NEWSBIN}/input/newsspool
-	mkdir -p ${MANDIR}/man1 ${MANDIR}/man5 ${MANDIR}/man8
 	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
diff --git a/news/cnews/pkg-plist b/news/cnews/pkg-plist
index 7d053989d980..e326f3fec68a 100644
--- a/news/cnews/pkg-plist
+++ b/news/cnews/pkg-plist
@@ -1,4 +1,3 @@
-@cwd /usr/local
 @comment Package is not complete without minimal /var/news installation :-(
 @comment Basically just in.* and out.*    /var/news might be a symbolic link
 @comment and it might not exist yet :-(
diff --git a/news/knews/pkg-plist b/news/knews/pkg-plist
index 9d8af461d6d1..3dca832870b4 100644
--- a/news/knews/pkg-plist
+++ b/news/knews/pkg-plist
@@ -1,4 +1,3 @@
-@cwd /usr/X11R6
 bin/knews
 bin/knewsd
 lib/X11/app-defaults/Knews
diff --git a/news/nn/Makefile b/news/nn/Makefile
index b7a6a2b7c420..666357746f37 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.8 1996/03/04 11:27:35 ache Exp $
+# $Id: Makefile,v 1.9 1996/11/18 11:37:47 asami Exp $
 #
 
 DISTNAME=	nn-6.5.0.b3
@@ -12,6 +12,10 @@ CATEGORIES=	news
 MASTER_SITES=	ftp://uniwa.uwa.edu.au/pub/nn/beta/
 MAINTAINER=     ache@FreeBSD.ORG
 
+MAN1=		nn.1 nncheck.1 nngoback.1 nngrab.1  nngrep.1 nnpost.1 \
+		nntidy.1 nnacct.1 nnadmin.1 nnstats.1 nnusage.1
+MAN8=		nnmaster.8 nnspew.8
+
 pre-patch:
 	@cp ${WRKSRC}/config.h-dist ${WRKSRC}/config.h
 
diff --git a/news/nn/pkg-plist b/news/nn/pkg-plist
index 385e949704b9..4c0bc90aa718 100644
--- a/news/nn/pkg-plist
+++ b/news/nn/pkg-plist
@@ -1,4 +1,3 @@
-@cwd /usr/local
 lib/nn
 lib/news/inews
 bin/nn
@@ -12,16 +11,16 @@ bin/nngoback
 bin/nngrep
 bin/nnpost
 bin/nnbatch
-man/man1/nn.1
-man/man1/nncheck.1
-man/man1/nngoback.1
-man/man1/nngrab.1
-man/man1/nngrep.1
-man/man1/nnpost.1
-man/man1/nntidy.1
-man/man1/nnacct.1
-man/man1/nnadmin.1
-man/man1/nnstats.1
-man/man1/nnusage.1
-man/man8/nnmaster.8
-man/man8/nnspew.8
+man/man1/nn.1.gz
+man/man1/nncheck.1.gz
+man/man1/nngoback.1.gz
+man/man1/nngrab.1.gz
+man/man1/nngrep.1.gz
+man/man1/nnpost.1.gz
+man/man1/nntidy.1.gz
+man/man1/nnacct.1.gz
+man/man1/nnadmin.1.gz
+man/man1/nnstats.1.gz
+man/man1/nnusage.1.gz
+man/man8/nnmaster.8.gz
+man/man8/nnspew.8.gz
diff --git a/news/nntp/Makefile b/news/nntp/Makefile
index 6aa9463fbe9d..48b630d4d255 100644
--- a/news/nntp/Makefile
+++ b/news/nntp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.9 1996/03/20 01:48:26 adam Exp $
+# $Id: Makefile,v 1.10 1996/11/18 11:37:53 asami Exp $
 #
 
 DISTNAME=	nntp-t5
@@ -15,6 +15,9 @@ MAINTAINER=	adam@veda.is
 
 BUILD_DEPENDS=	${PREFIX}/lib/libcnews.a:${PORTSDIR}/news/cnews
 
+MAN1=		nntpxmit.1
+MAN8=		nntpd.8c mkgrdates.8c
+
 post-extract:
 	@cp ${WRKSRC}/conf.h.dist ${WRKSRC}/conf.h
 
diff --git a/news/nntp/pkg-plist b/news/nntp/pkg-plist
index 556dbb505a31..212baa660f7e 100644
--- a/news/nntp/pkg-plist
+++ b/news/nntp/pkg-plist
@@ -1,8 +1,7 @@
-@cwd /usr/local
 sbin/nntpd
-man/man8/nntpd.8c
-man/man8/mkgrdates.8c
-man/man1/nntpxmit.1
+man/man8/nntpd.8c.gz
+man/man8/mkgrdates.8c.gz
+man/man1/nntpxmit.1.gz
 libexec/news/nntpxmit
 libexec/news/nntpxfer
 @comment     just in case anyone wants it
diff --git a/news/trn/Makefile b/news/trn/Makefile
index d4abe2230a29..07ed78aecc31 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -3,17 +3,18 @@
 # Date created:		21 October 1994
 # Whom:			smace
 #
-# $Id$
+# $Id: Makefile,v 1.8 1996/11/18 13:01:30 asami Exp $
 #
 
 DISTNAME=	trn-3.6
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
-IS_INTERACTIVE=	yes
-
 RUN_DEPENDS=  munpack:${PORTSDIR}/mail/mpack
 
+IS_INTERACTIVE=	yes
+MAN1=		trn.1 Pnews.1 Rnmail.1 newsetup.1 newsgroups.1
+
 pre-configure:
 	@echo "===> Running pre-configure target for ${DISTNAME}"
 	@sh ${SCRIPTDIR}/preconf ${PORTSDIR} ${.CURDIR} ${WRKSRC}
diff --git a/news/trn/pkg-plist b/news/trn/pkg-plist
index e40ad75e4773..8779bd949556 100644
--- a/news/trn/pkg-plist
+++ b/news/trn/pkg-plist
@@ -1,5 +1,4 @@
 @exec echo "Be sure to edit %D/bin/Pnews and %D/bin/newsetup to set the Distribution codes"
-@cwd /usr/local
 bin/Pnews
 bin/Rnmail
 bin/newsetup
@@ -15,8 +14,8 @@ lib/trn/makedir
 lib/trn/mbox.saver
 lib/trn/newsnews
 lib/trn/norm.saver
-man/man1/trn.1
-man/man1/Pnews.1
-man/man1/Rnmail.1
-man/man1/newsetup.1
-man/man1/newsgroups.1
+man/man1/trn.1.gz
+man/man1/Pnews.1.gz
+man/man1/Rnmail.1.gz
+man/man1/newsetup.1.gz
+man/man1/newsgroups.1.gz
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index d4abe2230a29..07ed78aecc31 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -3,17 +3,18 @@
 # Date created:		21 October 1994
 # Whom:			smace
 #
-# $Id$
+# $Id: Makefile,v 1.8 1996/11/18 13:01:30 asami Exp $
 #
 
 DISTNAME=	trn-3.6
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
-IS_INTERACTIVE=	yes
-
 RUN_DEPENDS=  munpack:${PORTSDIR}/mail/mpack
 
+IS_INTERACTIVE=	yes
+MAN1=		trn.1 Pnews.1 Rnmail.1 newsetup.1 newsgroups.1
+
 pre-configure:
 	@echo "===> Running pre-configure target for ${DISTNAME}"
 	@sh ${SCRIPTDIR}/preconf ${PORTSDIR} ${.CURDIR} ${WRKSRC}
diff --git a/news/trn4/pkg-plist b/news/trn4/pkg-plist
index e40ad75e4773..8779bd949556 100644
--- a/news/trn4/pkg-plist
+++ b/news/trn4/pkg-plist
@@ -1,5 +1,4 @@
 @exec echo "Be sure to edit %D/bin/Pnews and %D/bin/newsetup to set the Distribution codes"
-@cwd /usr/local
 bin/Pnews
 bin/Rnmail
 bin/newsetup
@@ -15,8 +14,8 @@ lib/trn/makedir
 lib/trn/mbox.saver
 lib/trn/newsnews
 lib/trn/norm.saver
-man/man1/trn.1
-man/man1/Pnews.1
-man/man1/Rnmail.1
-man/man1/newsetup.1
-man/man1/newsgroups.1
+man/man1/trn.1.gz
+man/man1/Pnews.1.gz
+man/man1/Rnmail.1.gz
+man/man1/newsetup.1.gz
+man/man1/newsgroups.1.gz