aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Piazza <cpiazza@FreeBSD.org>2000-04-09 17:33:32 +0000
committerChris Piazza <cpiazza@FreeBSD.org>2000-04-09 17:33:32 +0000
commitf39d3f29e6126cdc0a2f27d2b70c8d6667774330 (patch)
treeab2f44c93df74a3fd0f6c30b0eac92355922e845
parent59df8af48ea44d533d5de8118602cc174bda92da (diff)
downloadports-f39d3f29e6126cdc0a2f27d2b70c8d6667774330.tar.gz
ports-f39d3f29e6126cdc0a2f27d2b70c8d6667774330.zip
Update with the new PORTNAME/PORTVERSION variables
Notes
Notes: svn path=/head/; revision=27420
-rw-r--r--news/atp/Makefile6
-rw-r--r--news/aub/Makefile5
-rw-r--r--news/bgrab/Makefile4
-rw-r--r--news/cnews/Makefile7
-rw-r--r--news/dejasearch/Makefile4
-rw-r--r--news/diablo/Makefile6
-rw-r--r--news/dnews/Makefile6
-rw-r--r--news/fidogate/Makefile4
-rw-r--r--news/gup/Makefile4
-rw-r--r--news/ifmail/Makefile4
-rw-r--r--news/inn-current/Makefile4
-rw-r--r--news/inn-stable/Makefile8
-rw-r--r--news/inn/Makefile4
-rw-r--r--news/knews/Makefile4
-rw-r--r--news/leafnode+/Makefile4
-rw-r--r--news/leafnode/Makefile4
-rw-r--r--news/newsfetch/Makefile4
-rw-r--r--news/newsfish/Makefile4
-rw-r--r--news/nn/Makefile4
-rw-r--r--news/nntp/Makefile6
-rw-r--r--news/nntpbtr/Makefile4
-rw-r--r--news/nntpcache/Makefile4
-rw-r--r--news/p5-Gateway/Makefile6
-rw-r--r--news/p5-News-Article/Makefile6
-rw-r--r--news/p5-News-Newsrc/Makefile6
-rw-r--r--news/pan/Makefile4
-rw-r--r--news/pan2/Makefile4
-rw-r--r--news/pgpmoose/Makefile7
-rw-r--r--news/plor/Makefile4
-rw-r--r--news/rkive/Makefile6
-rw-r--r--news/slnr/Makefile4
-rw-r--r--news/slrn/Makefile4
-rw-r--r--news/slurp/Makefile4
-rw-r--r--news/suck/Makefile4
-rw-r--r--news/tin/Makefile4
-rw-r--r--news/trn/Makefile4
-rw-r--r--news/trn4/Makefile6
-rw-r--r--news/unpost/Makefile4
-rw-r--r--news/xmitbin/Makefile6
-rw-r--r--news/xvnews/Makefile4
40 files changed, 95 insertions, 96 deletions
diff --git a/news/atp/Makefile b/news/atp/Makefile
index d015761bf03c..83253ec6dfc3 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: atp
-# Version required: 1.50
# Date created: 9 Nov 1997
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= atp-1.50-src
-PKGNAME= atp-1.50
+PORTNAME= atp
+PORTVERSION= 1.50
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/bbs/mail
+DISTNAME= atp-1.50-src
MAINTAINER= dburr@FreeBSD.org
diff --git a/news/aub/Makefile b/news/aub/Makefile
index 6bdc48be27ff..7a1dc0f9ee41 100644
--- a/news/aub/Makefile
+++ b/news/aub/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: aub
-# Version required: 0.0
# Date created: Sun Oct 12, 1997
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= aub
-PKGNAME= aub-2.0.5
+PORTNAME= aub
+PORTVERSION= 2.0.5
CATEGORIES= news
MASTER_SITES= ftp://ftp.cdrom.com/pub/perl/CPAN/scripts/news/nntpstuff/aub/ \
ftp://ftp.digital.com/pub/plan/perl/CPAN/scripts/news/nntpstuff/aub/ \
diff --git a/news/bgrab/Makefile b/news/bgrab/Makefile
index d335c881477b..dab2c2327392 100644
--- a/news/bgrab/Makefile
+++ b/news/bgrab/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bgrab
-# Version required: 1.3.4
# Date created: 20 March 2000
# Whom: Kelly Yancey <kbyanc@posi.net>
#
# $FreeBSD$
#
-DISTNAME= bgrab-1.3.4
+PORTNAME= bgrab
+PORTVERSION= 1.3.4
CATEGORIES= news
MASTER_SITES= http://www.student.dtu.dk/~c960941/bgrab/
diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index b19accfd80c1..2096ddc06a01 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: cnews
-# Version required: 940927
# Date created: 28 September 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= c-news
-PKGNAME= cnews-cr.g
+PORTNAME= cnews
+PORTVERSION= cr.g
CATEGORIES= news
MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/c-news/ \
ftp://ftp.lan-ks.de/pub/c-news/ \
@@ -17,7 +16,7 @@ MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/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} \
+DISTFILES= c-news${EXTRACT_SUFX} \
pgpverify-1.12
PATCH_SITES= ftp://ftp.lan-ks.de/pub/c-news/ \
diff --git a/news/dejasearch/Makefile b/news/dejasearch/Makefile
index 19a33f35d3da..c1594a4ac5de 100644
--- a/news/dejasearch/Makefile
+++ b/news/dejasearch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dejasearch
-# Version required: 1.7.2
# Date created: 15 March 1999
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= dejasearch-1.7.2
+PORTNAME= dejasearch
+PORTVERSION= 1.7.2
CATEGORIES= news
MASTER_SITES= http://homemade.hypermart.net/dejasearch/ \
http://homemade.virtualave.net/dejasearch/ \
diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index a9803c53abf5..7250ce30eb73 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: diablo
-# Version required: 1.10
# Date created: June 2nd 1997
# Whom: jfitz
#
# $FreeBSD$
#
-DISTNAME= diablo-1.15-rel
-PKGNAME= diablo-1.15
+PORTNAME= diablo
+PORTVERSION= 1.15
CATEGORIES= news
MASTER_SITES= http://www.backplane.com/diablo/
+DISTNAME= ${PKGNAME}-rel
EXTRACT_SUFX= .tgz
MAINTAINER= jfitz@FreeBSD.org
diff --git a/news/dnews/Makefile b/news/dnews/Makefile
index 7ea6b9328af3..d28a4b215fa0 100644
--- a/news/dnews/Makefile
+++ b/news/dnews/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: dnews
-# Version required: 47k
# Date created: Thu May 29 17:16:36 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= dnews47k_freebsd
-PKGNAME= dnews-4.7k
+PORTNAME= dnews
+PORTVERSION= 4.7k
CATEGORIES= news
MASTER_SITES= ftp://ftp.netwinsite.com/pub/netwinsite/dnews/
+DISTNAME= dnews47k_freebsd
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile
index 13c8f68f91be..0ea463d9f185 100644
--- a/news/fidogate/Makefile
+++ b/news/fidogate/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fidogate
-# Version required: fidogate-4.4.0
# Date created: 02 Dez 1997
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
#
-DISTNAME= fidogate-4.4.0
+PORTNAME= fidogate
+PORTVERSION= 4.4.0
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.fido.de/pub/fidogate/ \
diff --git a/news/gup/Makefile b/news/gup/Makefile
index c3c467165292..773462284b4d 100644
--- a/news/gup/Makefile
+++ b/news/gup/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gup
-# Version required: 0.4
# Date created: 22 November 1998
# Whom: Denis Shaposhnikov <dsh@vlink.ru>
#
# $FreeBSD$
#
-DISTNAME= gup-0.4
+PORTNAME= gup
+PORTVERSION= 0.4
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/unoff-contrib/
diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile
index 9ee57013db03..800126dc0889 100644
--- a/news/ifmail/Makefile
+++ b/news/ifmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ifmail
-# Version required: 2.15
# Date created: 19 Feb 1997
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
#
-DISTNAME= ifmail-2.15
+PORTNAME= ifmail
+PORTVERSION= 2.15
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.average.org/ifmail/ \
diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 1cd6de9f96c2..41a755abfd90 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: inn
-# Version required: 2.2
# Date created: 20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2)
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= inn-2.2.2
+PORTNAME= inn
+PORTVERSION= 2.2.2
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 49c1c3f54d9d..8e811dcb9485 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: inn
-# Version required: 2.2
# Date created: 20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
# Whom: torstenb
#
# $FreeBSD$
-DISTNAME= inn-STABLE_2_2-2000-02-25_03-09
-PKGNAME= inn-stable-v22
+PORTNAME= inn-stable
+PORTVERSION= v22
CATEGORIES= news
MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
ftp://ftp.isc.org/isc/inn/snapshots/
+DISTNAME= inn-STABLE_2_2-2000-02-25_03-09
MAINTAINER= andreas@FreeBSD.org
@@ -114,7 +114,7 @@ post-install:
${CHOWN} news:news ${NEWSSPOOL}/uniover
${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
- # create log and run subdir with a .keep_me file to make sure
+ # create log and run subdir with a .keep_me file to make sure
# packaging works. The mkdir might be unnecessary, but to be sure ...
.for dir in log run
${MKDIR} -p ${NEWSLIB}/${dir}
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 1cd6de9f96c2..41a755abfd90 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: inn
-# Version required: 2.2
# Date created: 20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2)
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= inn-2.2.2
+PORTNAME= inn
+PORTVERSION= 2.2.2
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/
diff --git a/news/knews/Makefile b/news/knews/Makefile
index b6f5e4b9b881..9fc872f36439 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: knews
-# Version required: 0.9.8
# Date created: Sun Apr 14 09:23:59 MET DST 1996
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= knews-1.0b.1
+PORTNAME= knews
+PORTVERSION= 1.0.b1
CATEGORIES= news
MASTER_SITES= http://www.matematik.su.se/~kjj/
diff --git a/news/leafnode+/Makefile b/news/leafnode+/Makefile
index 7bb1f8360652..46280399449d 100644
--- a/news/leafnode+/Makefile
+++ b/news/leafnode+/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: leafnode+
-# Version required: 2.10
# Date created: 19 November 1998
# Whom: Tom Hukins <tom@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= leafnode+-2.10
+PORTNAME= leafnode+
+PORTVERSION= 2.10
CATEGORIES= news
MASTER_SITES= ftp://hiroshima.isdn.uiuc.edu/leafnode+/
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 62e54c460e61..5ceacafcbf48 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: leafnode
-# Version required: 1.9.7
# Date created: 10 April 1996
# Whom: Brian Somers <brian@Awfulhak.org>
#
# $FreeBSD$
#
-DISTNAME= leafnode-1.9.11
+PORTNAME= leafnode
+PORTVERSION= 1.9.11
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.Awfulhak.org/leafnode/
diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile
index 64b5ea474927..1eba1661bd2f 100644
--- a/news/newsfetch/Makefile
+++ b/news/newsfetch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: newsfetch
-# Version required: 1.21
# Date created: 12 September 1997
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
# $FreeBSD$
#
-DISTNAME= newsfetch-1.21
+PORTNAME= newsfetch
+PORTVERSION= 1.21
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/news/readers
diff --git a/news/newsfish/Makefile b/news/newsfish/Makefile
index 120760e77467..358acc7e980e 100644
--- a/news/newsfish/Makefile
+++ b/news/newsfish/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: newsfish
-# Version required: 1.2
# Date created: 17 January 1999
# Whom: asaddi@philosophysw.com
#
# $FreeBSD$
#
-DISTNAME= newsfish-1.2
+PORTNAME= newsfish
+PORTVERSION= 1.2
CATEGORIES= news
MASTER_SITES= http://www.philosophysw.com/download/
diff --git a/news/nn/Makefile b/news/nn/Makefile
index f45a8ce547ea..d3940c7ae24d 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nn
-# Version required: 6.5.6
# Date created: 24 September 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= nn-6.5.6
+PORTNAME= nn
+PORTVERSION= 6.5.6
CATEGORIES= news
MASTER_SITES= ftp://ftp.visi.com/users/mtpins/nn/
EXTRACT_SUFX= .tar.Z
diff --git a/news/nntp/Makefile b/news/nntp/Makefile
index a1d986745882..20d0feb71d70 100644
--- a/news/nntp/Makefile
+++ b/news/nntp/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: nntp
-# Version required: t5
# Date created: 29 September 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= nntp.1.5.12.2
-PKGNAME= nntp-1.5.12.2
+PORTNAME= nntp
+PORTVERSION= 1.5.12.2
CATEGORIES= news
MASTER_SITES= ftp://ftp.academ.com/pub/nntp/server/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
PATCH_SITES= ftp://ftp.lan-ks.de/pub/c-news/ \
ftp://ftp.dinoex.org/pub/c-news/
diff --git a/news/nntpbtr/Makefile b/news/nntpbtr/Makefile
index 48928a847bb6..01990e124c2e 100644
--- a/news/nntpbtr/Makefile
+++ b/news/nntpbtr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nntpbtr
-# Version required: 1.7
# Date created: 1 July 1996
# Whom: dk
#
# $FreeBSD$
#
-DISTNAME= nntpbtr-1.7
+PORTNAME= nntpbtr
+PORTVERSION= 1.7
CATEGORIES= news
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/news/
EXTRACT_SUFX= .tar.Z
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 306776508a29..2aac03ccc827 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nntpcache
-# Version required: 2.3.2
# Date created: 6 January 1997
# Whom: proff@suburbia.net
#
# $FreeBSD$
#
-DISTNAME= nntpcache-2.4.0b2
+PORTNAME= nntpcache
+PORTVERSION= 2.4.0b2
CATEGORIES= news
MASTER_SITES= ftp://nntpcache.org/pub/nntpcache/ \
ftp://ftp.ntnu.no/pub/unix/news/nntpcache/ \
diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile
index 2dca286ebafd..98bfec9bf18d 100644
--- a/news/p5-Gateway/Makefile
+++ b/news/p5-Gateway/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Gateway
-# Version required: 0.42
# Date created: January 2, 1998
# Whom: Don Croyle <croyle@gelemna.ft-wayne.in.us>
#
# $FreeBSD$
#
-DISTNAME= Gateway-0.42
-PKGNAME= p5-Gateway-0.42
+PORTNAME= p5-Gateway
+PORTVERSION= 0.42
CATEGORIES= news perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= News
+DISTNAME= Gateway-0.42
MAINTAINER= croyle@gelemna.ft-wayne.in.us
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index 7712420ff579..983e2478329a 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-News-Article
-# Version required: 1.21
# Date created: January 2, 1998
# Whom: Don Croyle <croyle@gelemna.ft-wayne.in.us>
#
# $FreeBSD$
#
-DISTNAME= News-Article-1.21
-PKGNAME= p5-News-Article-1.21
+PORTNAME= p5-News-Article
+PORTVERSION= 1.21
CATEGORIES= news perl5
MASTER_SITES= http://www.erlenstar.demon.co.uk/perl/ \
http://www.infonex.com/~dacroyle/freebsd/
+DISTNAME= News-Article-1.21
MAINTAINER= croyle@gelemna.ft-wayne.in.us
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index 31a0ec82f4d4..49ef552c43b0 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-News-Newsrc
-# Version required: 1.07
# Date created: February 7, 1998
# Whom: Don Croyle <croyle@gelemna.ft-wayne.in.us>
#
# $FreeBSD$
#
-DISTNAME= News-Newsrc-1.07
-PKGNAME= p5-News-Newsrc-1.07
+PORTNAME= p5-News-Newsrc
+PORTVERSION= 1.07
CATEGORIES= news perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= News
+DISTNAME= News-Newsrc-1.07
MAINTAINER= croyle@gelemna.ft-wayne.in.us
diff --git a/news/pan/Makefile b/news/pan/Makefile
index f1c492e996f3..4daa007d44f2 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pan
-# Version required: 0.7.6
# Date created: 07 August 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= pan-0.7.6
+PORTNAME= pan
+PORTVERSION= 0.7.6
CATEGORIES= news gnome
MASTER_SITES= ftp://source.rebelbase.com/pub/pan/ \
ftp://source.rebelbase.com/pub/pan/obsolete/
diff --git a/news/pan2/Makefile b/news/pan2/Makefile
index f1c492e996f3..4daa007d44f2 100644
--- a/news/pan2/Makefile
+++ b/news/pan2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pan
-# Version required: 0.7.6
# Date created: 07 August 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= pan-0.7.6
+PORTNAME= pan
+PORTVERSION= 0.7.6
CATEGORIES= news gnome
MASTER_SITES= ftp://source.rebelbase.com/pub/pan/ \
ftp://source.rebelbase.com/pub/pan/obsolete/
diff --git a/news/pgpmoose/Makefile b/news/pgpmoose/Makefile
index aad3c5707b5c..58b25e92ab4c 100644
--- a/news/pgpmoose/Makefile
+++ b/news/pgpmoose/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: pgpmoose
-# Version required: 1.19 in pmapp
# Date created: 28 Nov 1997
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
+#
-DISTNAME= PGPMoose
-PKGNAME= pgpmoose-1.19
+PORTNAME= pgpmoose
+PORTVERSION= 1.19
CATEGORIES= news security
MASTER_SITES= http://people.qualcomm.com/ggr/ \
ftp://ftp.dinoex.sub.de/pub/approved/
+DISTNAME= PGPMoose
EXTRACT_SUFX= .tar.Z
MAINTAINER= dirk.meyer@dinoex.sub.org
diff --git a/news/plor/Makefile b/news/plor/Makefile
index 79be6e78babd..bf9346f7e2b5 100644
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: plor
-# Version Required: 0.3.0
# Date Created: 30 Dec 1996
# Whom: Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
#
# $FreeBSD$
#
-DISTNAME= plor-0.3.1
+PORTNAME= plor
+PORTVERSION= 0.3.1
CATEGORIES= news
MASTER_SITES= ftp://ftp.psy.unipd.it/pub/pluto/developers/ \
ftp://ftp.unipd.it/pub/Linux/pluto/developers/
diff --git a/news/rkive/Makefile b/news/rkive/Makefile
index 5414f16dd6dc..01135c28662c 100644
--- a/news/rkive/Makefile
+++ b/news/rkive/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rkive
-# Version required: 3.1
# Date created: 03 Jul 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= rkive3.1
-PKGNAME= rkive-3.1
+PORTNAME= rkive
+PORTVERSION= 3.1
CATEGORIES= news
MASTER_SITES= ftp://ftp.vmunix.org/pub/misc/rkive/
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= torstenb@FreeBSD.org
diff --git a/news/slnr/Makefile b/news/slnr/Makefile
index 4f3cb4ea1e42..990dba7e8327 100644
--- a/news/slnr/Makefile
+++ b/news/slnr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: slnr
-# Version required: 2.3.0
# Date created: 21 July 1996
# Whom: Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
#
# $FreeBSD$
#
-DISTNAME= slnr-2.3.0
+PORTNAME= slnr
+PORTVERSION= 2.3.0
CATEGORIES= news
MASTER_SITES= http://www3.sympatico.ca/john.vanderhoek/tim/src/slnr/
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 2345af5f9583..dc6dcedbd2be 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: slrn
-# Version required: 0.9.6.2
# Date created: 28 March 1997
# Whom: Carey Jones <mcj@acquiesce.org>
#
# $FreeBSD$
#
-DISTNAME= slrn-0.9.6.2
+PORTNAME= slrn
+PORTVERSION= 0.9.6.2
CATEGORIES= news
MASTER_SITES= ftp://space.mit.edu/pub/davis/slrn/
diff --git a/news/slurp/Makefile b/news/slurp/Makefile
index ca56c4718d6f..4b6956cbdcf5 100644
--- a/news/slurp/Makefile
+++ b/news/slurp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: slurp
-# Version required: 1.10
# Date created: 30 Jun 1996
# Whom: jraynard
#
# $FreeBSD$
#
-DISTNAME= slurp-1.10
+PORTNAME= slurp
+PORTVERSION= 1.10
CATEGORIES= news
MASTER_SITES= ftp://ftp.demon.co.uk/pub/news/slurp/
EXTRACT_SUFX= .tar.Z
diff --git a/news/suck/Makefile b/news/suck/Makefile
index 17e20977666f..6b3291ee011b 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: suck
-# Version required: 4.2.3
# Date created: 30 Mar 1996
# Whom: graphite@taurus.bekkoame.or.jp
#
# $FreeBSD$
#
-DISTNAME= suck-4.2.3
+PORTNAME= suck
+PORTVERSION= 4.2.3
CATEGORIES= news
MASTER_SITES= http://home.att.net/~bobyetman/
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 87ec52c51a17..09dc71bb4a5a 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# New ports collection makefile for: tin
-# Version required: tinpre-1.4
# Date created: 25 July 1996
# Whom: obrien@cs.ucdavis.edu
#
# $FreeBSD$
#
-DISTNAME= tin-1.4.2
+PORTNAME= tin
+PORTVERSION= 1.4.2
CATEGORIES= news
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v1.4/ \
ftp://nuxi.ucdavis.edu/pub/tin/v1.4/ \
diff --git a/news/trn/Makefile b/news/trn/Makefile
index c670c76b8c64..c70844028cdf 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: trn
-# Version required: 3.6
# Date created: 21 October 1994
# Whom: smace
#
# $FreeBSD$
#
-DISTNAME= trn-3.6
+PORTNAME= trn
+PORTVERSION= 3.6
CATEGORIES= news
MASTER_SITES= ftp://ftp.uu.net/networking/news/readers/trn/
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index 8c38f4388940..275a7be938d6 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: trn
-# Version required: 4.0-test72
# Date created: 21 October 1994
# Whom: smace
#
# $FreeBSD$
#
-DISTNAME= trn4-test72
-PKGNAME= trn-4.0b72
+PORTNAME= trn
+PORTVERSION= 4.0.b72
CATEGORIES= news
MASTER_SITES= ftp://ftp.clari.net/private/trn/ \
ftp://ftp.uu.net/private/trn/
+DISTNAME= trn4-test72
MAINTAINER= mph@freebsd.org
diff --git a/news/unpost/Makefile b/news/unpost/Makefile
index 1a5c00bbc071..c60c48f5f5a9 100644
--- a/news/unpost/Makefile
+++ b/news/unpost/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: unpoost
-# Version required: 2.3.4
# Date created: 14 october 1997
# Whom: volf@oasis.IAEhv.nl
#
# $FreeBSD$
#
-DISTNAME= unpost-2.3.4
+PORTNAME= unpost
+PORTVERSION= 2.3.4
CATEGORIES= news
MASTER_SITES= http://people.FreeBSD.org/~steve/distfiles/
diff --git a/news/xmitbin/Makefile b/news/xmitbin/Makefile
index b23f93e0e3fe..25f057f1bdc4 100644
--- a/news/xmitbin/Makefile
+++ b/news/xmitbin/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xmitnin
-# Version required: 1.9
# Date created: 29 Nov 1997
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xmitBin-1.9
-PKGNAME= xmitbin-1.9
+PORTNAME= xmitbin
+PORTVERSION= 1.9
CATEGORIES= news mail
MASTER_SITES= ftp://ftp.cadence.com/utils/
+DISTNAME= xmitBin-1.9
EXTRACT_SUFX= .tar.Z
MAINTAINER= dburr@FreeBSD.org
diff --git a/news/xvnews/Makefile b/news/xvnews/Makefile
index 3b3eb213fac2..8691c671175a 100644
--- a/news/xvnews/Makefile
+++ b/news/xvnews/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xvnews
-# Version required: 2.3.2
# Date created: 31 Jul 1996
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= xvnews-2.3.2
+PORTNAME= xvnews
+PORTVERSION= 2.3.2
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications