8 files changed, 29 insertions, 25 deletions

diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index e8163a9d6d5e..0cca9a56a6b1 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -3,16 +3,18 @@
 # Date created:		28 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.2 1995/01/24 16:43:07 pst Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:49:06 jkh Exp $
 #
 
 DISTNAME=	cnews
-EXTRACT_SUFFIX=	.tar.Z
-DISTFILES=	${DISTNAME}${EXTRACT_SUFFIX}
-MASTER_SITES=	ftp://ftp.zoo.toronto.edu/pub/
+PKGNAME=	cnews-cr.e
 CATEGORIES+=	news
+MASTER_SITES=	ftp://ftp.zoo.toronto.edu/pub/
+EXTRACT_SUFX=	.tar.Z
+
 WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
+
 NEWSSPOOL=	/usr/local/newsspool
 NEWSBIN=	/usr/local/libexec/news
 NEWSLIB=	/usr/local/lib/news
diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 2be0a5910915..8266627fd269 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -3,15 +3,17 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/23 01:42:20 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:49:08 jkh Exp $
 #
 
 DISTNAME=	inn1.4sec
-NO_WRKSUBDIR=	YES
-MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
+PKGNAME=	inn-1.4
 CATEGORIES+=	news
+MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
+NO_WRKSUBDIR=	YES
+
 pre-install:
 	mkdir -p ${PREFIX}/etc
 	mkdir -p ${PREFIX}/bin
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 2be0a5910915..8266627fd269 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -3,15 +3,17 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/23 01:42:20 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:49:08 jkh Exp $
 #
 
 DISTNAME=	inn1.4sec
-NO_WRKSUBDIR=	YES
-MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
+PKGNAME=	inn-1.4
 CATEGORIES+=	news
+MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
+NO_WRKSUBDIR=	YES
+
 pre-install:
 	mkdir -p ${PREFIX}/etc
 	mkdir -p ${PREFIX}/bin
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 2be0a5910915..8266627fd269 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -3,15 +3,17 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/23 01:42:20 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:49:08 jkh Exp $
 #
 
 DISTNAME=	inn1.4sec
-NO_WRKSUBDIR=	YES
-MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
+PKGNAME=	inn-1.4
 CATEGORIES+=	news
+MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
+NO_WRKSUBDIR=	YES
+
 pre-install:
 	mkdir -p ${PREFIX}/etc
 	mkdir -p ${PREFIX}/bin
diff --git a/news/nn/Makefile b/news/nn/Makefile
index b5c8324923b3..e608a5a7133c 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -3,12 +3,13 @@
 # Date created:		24 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.4 1995/02/26 23:16:23 ats Exp $
+# $Id: Makefile,v 1.5 1995/04/01 12:49:10 jkh Exp $
 #
 
 DISTNAME=	nn-6.5.0.b3
-MASTER_SITES=	ftp://uniwa.uwa.edu.au/pub/nn/beta/
+PKGNAME=	nn-6.5.0
 CATEGORIES+=	news
+MASTER_SITES=	ftp://uniwa.uwa.edu.au/pub/nn/beta/
 
 pre-patch:
 	@cp ${WRKSRC}/config.h-dist ${WRKSRC}/config.h
diff --git a/news/nntp/Makefile b/news/nntp/Makefile
index e40c72a12da5..7799f98b114a 100644
--- a/news/nntp/Makefile
+++ b/news/nntp/Makefile
@@ -3,14 +3,13 @@
 # Date created:		29 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.2 1994/11/26 17:32:34 adam Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:49:11 jkh Exp $
 #
 
 DISTNAME=	nntp-t5
-MASTER_SITES=	ftp://nic.sura.net/pub/news/software/nntp/
+PKGNAME=	nntp-1.5.11.4
 CATEGORIES+=	news
-#DO_NADA=	echo ${.TARGET}:
-#DEPENDS=	news/cnews
+MASTER_SITES=	ftp://nic.sura.net/pub/news/software/nntp/
 
 pre-patch:
 	@cp ${WRKSRC}/conf.h.dist ${WRKSRC}/conf.h
diff --git a/news/trn/Makefile b/news/trn/Makefile
index dc0bf6794702..c9b523516116 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -7,10 +7,8 @@
 #
 
 DISTNAME=	trn-3.6
-MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 CATEGORIES+=	news
-EXTRACT_SUFX=	.tar.gz
-DISTFILES=	trn-3.6.tar.gz
+MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
 IS_INTERACTIVE=	yes
 
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index dc0bf6794702..c9b523516116 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -7,10 +7,8 @@
 #
 
 DISTNAME=	trn-3.6
-MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 CATEGORIES+=	news
-EXTRACT_SUFX=	.tar.gz
-DISTFILES=	trn-3.6.tar.gz
+MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
 IS_INTERACTIVE=	yes