Use MAN? macros. CATEGORIES+= -> CATEGORIES.

13 files changed, 34 insertions, 47 deletions

diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index f5982e253af3..80dcc741bc34 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -3,12 +3,12 @@
 # Date created:		28 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.11 1995/07/02 12:40:13 asami Exp $
+# $Id: Makefile,v 1.12 1995/10/05 10:20:26 adam Exp $
 #
 
 DISTNAME=	cnews
 PKGNAME=	cnews-cr.g
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.zoo.toronto.edu/pub/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 7477c0f2faa3..0cbdd83d2bda 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -3,12 +3,12 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.15 1996/06/24 21:52:17 torstenb Exp $
+# $Id: Makefile,v 1.16 1996/07/08 22:55:17 torstenb Exp $
 #
 
 DISTNAME=	inn1.4sec
 PKGNAME=	inn-1.4
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 7477c0f2faa3..0cbdd83d2bda 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -3,12 +3,12 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.15 1996/06/24 21:52:17 torstenb Exp $
+# $Id: Makefile,v 1.16 1996/07/08 22:55:17 torstenb Exp $
 #
 
 DISTNAME=	inn1.4sec
 PKGNAME=	inn-1.4
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 7477c0f2faa3..0cbdd83d2bda 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -3,12 +3,12 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.15 1996/06/24 21:52:17 torstenb Exp $
+# $Id: Makefile,v 1.16 1996/07/08 22:55:17 torstenb Exp $
 #
 
 DISTNAME=	inn1.4sec
 PKGNAME=	inn-1.4
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/nn/Makefile b/news/nn/Makefile
index 3c4a0af6796e..b7a6a2b7c420 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -3,12 +3,12 @@
 # Date created:		24 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.7 1995/04/15 03:11:37 ache Exp $
+# $Id: Makefile,v 1.8 1996/03/04 11:27:35 ache Exp $
 #
 
 DISTNAME=	nn-6.5.0.b3
 PKGNAME=	nn-6.5.0
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://uniwa.uwa.edu.au/pub/nn/beta/
 MAINTAINER=     ache@FreeBSD.ORG
 
diff --git a/news/nntp/Makefile b/news/nntp/Makefile
index 689683dab34d..6aa9463fbe9d 100644
--- a/news/nntp/Makefile
+++ b/news/nntp/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.8 1995/11/27 00:08:37 asami Exp $
+# $Id: Makefile,v 1.9 1996/03/20 01:48:26 adam Exp $
 #
 
 DISTNAME=	nntp-t5
 PKGNAME=	nntp-1.5.11.5
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://nic.sura.net/pub/news/software/nntp/
 
 MAINTAINER=	adam@veda.is
diff --git a/news/nntpbtr/Makefile b/news/nntpbtr/Makefile
index 8b7909c288c2..01e9cefc26be 100644
--- a/news/nntpbtr/Makefile
+++ b/news/nntpbtr/Makefile
@@ -3,16 +3,18 @@
 # Date created:         1 July 1996
 # Whom:                 dk
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/23 08:05:10 asami Exp $
 #
 
 DISTNAME=       nntpbtr-1.7
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=   ftp://ftp.kiae.su/unix/news/
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	dk@farm.org
 
+MAN1=		nntpbtr.1
+
 # "patch" complains otherwise
 post-extract:
 	rm -rf ${WRKSRC}/RCS
@@ -21,9 +23,4 @@ pre-build:
 	cd ${FILESDIR} ; pax -rw -l -u dbz ${WRKDIR} || true
 	cd ${WRKDIR}/dbz ; ${CC} ${CFLAGS} -c -I. dbz.c
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/nntpbtr.1
-.endif
-
 .include <bsd.port.mk>
diff --git a/news/slnr/Makefile b/news/slnr/Makefile
index 942cf9982a84..2d803d4af648 100644
--- a/news/slnr/Makefile
+++ b/news/slnr/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 July 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/01 08:08:54 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/13 12:41:30 asami Exp $
 #
 
 DISTNAME=	slnr
 PKGNAME=	slnr-2.13
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/off-line/slnr/ \
 		ftp://ftp.adelaide.edu.au/pub/news/readers/off-line/slnr/
 DISTFILES=	part1.Z part2.Z part3.Z
diff --git a/news/slurp/Makefile b/news/slurp/Makefile
index d27b55e64584..a50b074c5143 100644
--- a/news/slurp/Makefile
+++ b/news/slurp/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jun 1996
 # Whom:			jraynard
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/27 21:54:11 asami Exp $
 #
 
 DISTNAME=	slurp-1.10
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/news/slurp/
 EXTRACT_SUFX=	.tar.Z
 
@@ -16,6 +16,7 @@ MAINTAINER=	jraynard@FreeBSD.ORG
 #RUN_DEPENDS=	${PREFIX}/etc/innd:${PORTSDIR}/news/inn
 
 NO_WRKSUBDIR=	yes
+MAN1=		slurp.1
 
 pre-build:
 	@(cd ${WRKSRC}; cp conf.h conf.h.orig; \
@@ -24,12 +25,9 @@ pre-build:
 	@cp ${FILESDIR}/dbz.* ${WRKSRC}
 
 do-install:
-	mkdir -p ${PREFIX}/news/bin ${PREFIX}/news/lib
+	${MKDIR} ${PREFIX}/news/bin ${PREFIX}/news/lib
 	install -c -o news -g news -m 0555 -s ${WRKSRC}/slurp ${PREFIX}/news/bin/
-	install -c -o man -g man -m 0444 ${WRKSRC}/slurp.1 ${PREFIX}/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/slurp.1
-.endif
+	${INSTALL_MAN} ${WRKSRC}/slurp.1 ${PREFIX}/man/man1
 	install -c -o news -g news -m 0644 ${WRKSRC}/slurp.sys ${PREFIX}/news/lib/	
 
 .include <bsd.port.mk>
diff --git a/news/suck/Makefile b/news/suck/Makefile
index 6f67c1289a86..2e66f62dc1e5 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -3,27 +3,23 @@
 # Date created:		30 Mar 1996
 # Whom:			graphite@taurus.bekkoame.or.jp
 #
-# $Id: Makefile,v 1.1.1.1 1996/03/31 23:19:18 asami Exp $
+# $Id: Makefile,v 1.2 1996/04/07 08:15:23 asami Exp $
 #
 
 DISTNAME=	suck-2.6.2
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/sbin/ \
 		ftp://ftp.iis.u-tokyo.ac.jp/pub2/Linux/sources/sbin/
 
 MAINTAINER=	graphite@taurus.bekkoame.or.jp
 
 USE_GMAKE=	yes
+MAN1=		suck.1 rpost.1 testhost.1
 
 post-install:
-	install -c -o bin -g bin -m 755 ${WRKSRC}/sample/get.news.innxmit ${PREFIX}/sbin
-	install -c -o bin -g bin -m 755 ${WRKSRC}/sample/get.news.rnews ${PREFIX}/sbin
-	install -c -o bin -g bin -m 755 ${WRKSRC}/sample/put.news ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.innxmit ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.rnews ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/put.news ${PREFIX}/bin
 	install -c -o bin -g bin -m 640 ${WRKSRC}/sample/*.sample ${PREFIX}/etc
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/suck.1
-	gzip -9nf ${PREFIX}/man/man1/rpost.1
-	gzip -9nf ${PREFIX}/man/man1/testhost.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/news/tin/Makefile b/news/tin/Makefile
index b610c75085df..334611f28ee7 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -4,12 +4,12 @@
 # Date created:		25 July 1996
 # Whom:			obrien@cs.ucdavis.edu
 #
-# $Id: Makefile,v 1.12 1996/11/12 20:44:59 ache Exp $
+# $Id: Makefile,v 1.13 1996/11/17 01:25:16 ache Exp $
 #
 
 DISTNAME=       tin1.3-unoff-BETA-961115
 PKGNAME=        tin-1.3.961115
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.akk.uni-karlsruhe.de/pub/tin/  \
 		ftp://nuxi.cs.ucdavis.edu/pub/tin/
 EXTRACT_SUFX=	.tgz
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --with-nntp-default-server=news  \
 		 --with-metamail=${PREFIX}/bin/metamail
 MAKEFILE=	makefile
 ALL_TARGET=     build
+MAN1=		tin.1
 
 .if defined(NNTP_ONLY)
 CONFIGURE_ARGS+=	--enable-nntp-only
@@ -37,9 +38,4 @@ post-configure:
 	echo '#define NNTP_SERVER_FILE "${PREFIX}/etc/nntpserver"' >>${WRKSRC}/include/autoconf.h
 	echo '#define SMTP_SERVER_FILE "${PREFIX}/etc/smtpserver"' >>${WRKSRC}/include/autoconf.h
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/tin.1
-.endif
-
 .include <bsd.port.mk>
diff --git a/news/trn/Makefile b/news/trn/Makefile
index a96aef8a3a4a..ed9e198486a1 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	trn-3.6
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
 IS_INTERACTIVE=	yes
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index a96aef8a3a4a..ed9e198486a1 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	trn-3.6
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
 IS_INTERACTIVE=	yes