summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftp/IglooFTP/Makefile6
-rw-r--r--ftp/axyftp/Makefile6
-rw-r--r--ftp/cftp/Makefile4
-rw-r--r--ftp/curl/Makefile5
-rw-r--r--ftp/downloader/Makefile6
-rw-r--r--ftp/ftpfind/Makefile4
-rw-r--r--ftp/ftplocate/Makefile4
-rw-r--r--ftp/ftpmirror/Makefile4
-rw-r--r--ftp/ftpsearch/Makefile4
-rw-r--r--ftp/ftptool/Makefile6
-rw-r--r--ftp/gftp/Makefile4
-rw-r--r--ftp/greed/Makefile6
-rw-r--r--ftp/gtm/Makefile4
-rw-r--r--ftp/jmirror/Makefile4
-rw-r--r--ftp/lftp/Makefile4
-rw-r--r--ftp/llnlxdir/Makefile7
-rw-r--r--ftp/llnlxftp/Makefile7
-rw-r--r--ftp/mirror/Makefile4
-rw-r--r--ftp/moxftp/Makefile4
-rw-r--r--ftp/ncftp/Makefile6
-rw-r--r--ftp/ncftp1/Makefile6
-rw-r--r--ftp/ncftp2/Makefile10
-rw-r--r--ftp/ncftp3/Makefile6
-rw-r--r--ftp/omi/Makefile10
-rw-r--r--ftp/pavuk/Makefile6
-rw-r--r--ftp/proftpd-devel/Makefile6
-rw-r--r--ftp/proftpd/Makefile6
-rw-r--r--ftp/sftp/Makefile4
-rw-r--r--ftp/spegla/Makefile4
-rw-r--r--ftp/wget-devel/Makefile4
-rw-r--r--ftp/wget/Makefile4
-rw-r--r--ftp/wu-ftpd+ipv6/Makefile8
-rw-r--r--ftp/wu-ftpd/Makefile8
-rw-r--r--ftp/xrmftp/Makefile4
-rw-r--r--ftp/yafc/Makefile4
-rw-r--r--ftp/yale-tftpd/Makefile4
36 files changed, 96 insertions, 97 deletions
diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 404fb137d61f..5bfe7740fb94 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: IglooFTP
-# Version required: 0.6.1
# Date created: 3 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= IglooFTP-0.6.1.src
-PKGNAME= IglooFTP-0.6.1
+PORTNAME= IglooFTP
+PORTVERSION= 0.6.1
CATEGORIES= ftp
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://littleigloo.org/pub/iglooftp/
MASTER_SITE_SUBDIR= system/network/file-transfer
+DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= will@FreeBSD.org
diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile
index 9e325dae316d..51475f8d2d07 100644
--- a/ftp/axyftp/Makefile
+++ b/ftp/axyftp/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: wxftp
-# Version required: 0.4.4
# Date created: 22 October 1998
# Whom: Antti Kaipila <anttik@iki.fi>
#
# $FreeBSD$
#
-DISTNAME= wxftp-0.4.4.src
-PKGNAME= wxftp-0.4.4
+PORTNAME= wxftp
+PORTVERSION= 0.4.4
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.wxftp.seul.org/pub/wxftp/0.4.4/ \
ftp://ftp.sunsite.auc.dk/disk2/linuxberg.com/files/x11/network/ \
ftp://ftp.bitcon.no/.10/linux/linuxberg/files/x11/network/
+DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= kris@FreeBSD.org
diff --git a/ftp/cftp/Makefile b/ftp/cftp/Makefile
index 3d81651476c2..12eac5a274f1 100644
--- a/ftp/cftp/Makefile
+++ b/ftp/cftp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cftp
-# Version required: 0.9.3
# Date created: 14 October 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= cftp-0.9.3
+PORTNAME= cftp
+PORTVERSION= 0.9.3
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.giga.or.at/pub/nih/cftp/ \
http://people.FreeBSD.org/~andy/distfiles/
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 1668ea9caf47..2e3fd4b14cf6 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: curl
-# Version required: 6.5.2
# Date created: 12 December 1998
# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
#
# $FreeBSD$
+#
-DISTNAME= curl-6.5.2
+PORTNAME= curl
+PORTVERSION= 6.5.2
CATEGORIES= ftp www
MASTER_SITES= http://curl.haxx.nu/stuff/ \
ftp://ftp.rhrz.uni-bonn.de/pub-koeln/net/inet/ \
diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index cbeec1d32253..b66adc219638 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: downloader
-# Version required: 1.11
# Date Created: 23 June 1999
# Whom: Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= nt-1.11
-PKGNAME= downloader-1.11
+PORTNAME= downloader
+PORTVERSION= 1.11
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.server51.freshmeat.net/pub/d4x/ \
ftp://ftp.lonyay.edu.hu/pub/software/nt/ \
http://people.FreeBSD.org/~imura/distfiles/
+DISTNAME= nt-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/ftp/ftpfind/Makefile b/ftp/ftpfind/Makefile
index 964b2c8d587d..12bbca400521 100644
--- a/ftp/ftpfind/Makefile
+++ b/ftp/ftpfind/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ftpfind
-# Version required: 0.996
# Date created: Feb 21 1998
# Whom: Tomokazu ISHII <t-ishii@tryplanet.com>
#
# $FreeBSD$
#
-DISTNAME= ftpfind-0.996
+PORTNAME= ftpfind
+PORTVERSION= 0.996
CATEGORIES= ftp
MASTER_SITES= http://hp.vector.co.jp/authors/VA013366/ \
http://www.tryplanet.com/t-ishii/programs/ftpfind/
diff --git a/ftp/ftplocate/Makefile b/ftp/ftplocate/Makefile
index 338550eb8625..d01f7e9409ca 100644
--- a/ftp/ftplocate/Makefile
+++ b/ftp/ftplocate/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Ftplocate
-# Version required: 2.01
# Date created: 7 December 1999
# Whom: tung@turtle.ee.ncku.edu.tw
#
# $FreeBSD$
#
-DISTNAME= ftplocate-2.01
+PORTNAME= ftplocate
+PORTVERSION= 2.01
CATEGORIES= ftp www
MASTER_SITES= ftp://ftp.ee.ncku.edu.tw/pub/ftplocate/
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index bd6cf6218431..9ded91b31cdf 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ftpmirror
-# Version required: 1.96
# Date created: 10 January 1999
# Whom: Yasuhiro Fukuma <yasuf@big.or.jp>
#
# $FreeBSD$
#
-DISTNAME= ftpmirror-1.96
+PORTNAME= ftpmirror
+PORTVERSION= 1.96
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.intec.co.jp/pub/utils/ftpmirror/beta/
diff --git a/ftp/ftpsearch/Makefile b/ftp/ftpsearch/Makefile
index 6048d0f10707..b53e1a109dc4 100644
--- a/ftp/ftpsearch/Makefile
+++ b/ftp/ftpsearch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ftpsearch
-# Version required: 1.0
# Date created: 07 Dec 1996
# Whom: Tor.Egge@idi.ntnu.no
#
# $FreeBSD$
#
-DISTNAME= ftpsearch-1.0
+PORTNAME= ftpsearch
+PORTVERSION= 1.0
CATEGORIES= ftp
MASTER_SITES= ftp://ftpsearch.ntnu.no/pub/ftpsearch/
diff --git a/ftp/ftptool/Makefile b/ftp/ftptool/Makefile
index 83129bbbeae8..421b5da5a9e1 100644
--- a/ftp/ftptool/Makefile
+++ b/ftp/ftptool/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: Ftptool
-# Version required: 4.6
# Date created: 19 March 1996
# Whom: janek@gaja.ipan.lublin.pl
#
# $FreeBSD$
#
-DISTNAME= ftptool-4.6
+PORTNAME= ftptool
+PORTVERSION= 4.6
CATEGORIES= ftp
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
-DISTFILES= Ftptool4.6.tar.gz
+DISTFILES= Ftptool${PORTVERSION}.tar.gz
MAINTAINER= janek@gaja.ipan.lublin.pl
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index eed2b02d46f9..b28911128987 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gftp
-# Version required: 2.0.5a
# Date Created: 21 Feb 1999
# Whom: Damjan Marion <dmarion@open.hr>
#
# $FreeBSD$
#
-DISTNAME= gftp-2.0.5a
+PORTNAME= gftp
+PORTVERSION= 2.0.5a
CATEGORIES= ftp
MASTER_SITES= http://gftp.seul.org/ \
ftp://gftp.seul.org/pub/gftp/
diff --git a/ftp/greed/Makefile b/ftp/greed/Makefile
index fcc2740b9f89..6e33b6ce1b53 100644
--- a/ftp/greed/Makefile
+++ b/ftp/greed/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: greed
-# Version required: 0.81+
# Date created: 13 April 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= greed.81p
-PKGNAME= greed-0.81p
+PORTNAME= greed
+PORTVERSION= 0.81p
CATEGORIES= ftp www
MASTER_SITES= http://www.public.asu.edu/~arturner/greed/
+DISTNAME= greed.81p
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/ftp/gtm/Makefile b/ftp/gtm/Makefile
index aa2f213244cf..efda117c714f 100644
--- a/ftp/gtm/Makefile
+++ b/ftp/gtm/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: gtm
-# Version required: 0.3.1
# Date created: 05/28/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gtm-0.3.1
+PORTNAME= gtm
+PORTVERSION= 0.3.1
CATEGORIES= ftp gnome
MASTER_SITES= http://www.rnl.ist.utl.pt/~bapm/gtm/files/ \
http://www.nectar.cc/distfiles/
diff --git a/ftp/jmirror/Makefile b/ftp/jmirror/Makefile
index 266efb72eac4..1136f5048855 100644
--- a/ftp/jmirror/Makefile
+++ b/ftp/jmirror/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jmirror
-# Version required: 1.0b
# Date Created: 4 Febuary 1999
# Whom: Justin Robinson
#
# $FreeBSD$
#
-DISTNAME= jmirror-1.0b
+PORTNAME= jmirror
+PORTVERSION= 1.0b
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.ruin.org/pub/All/
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 0ac5703159b9..16068ca37be9 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lftp
-# Version required: 2.2.0a
# Date created: 11 September 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= lftp-2.2.0a
+PORTNAME= lftp
+PORTVERSION= 2.2.0a
CATEGORIES= ftp ipv6
MASTER_SITES= ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
${MASTER_SITE_SUNSITE}
diff --git a/ftp/llnlxdir/Makefile b/ftp/llnlxdir/Makefile
index 94a1693626fb..34d60b88956b 100644
--- a/ftp/llnlxdir/Makefile
+++ b/ftp/llnlxdir/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: llnlxdir
-# Version required: 2.0
# Date created: 9 November 1997
-#
# Whom: Dima Ruban <dima@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= latest_xdir
-PKGNAME= llnlxdir-2.1
+PORTNAME= llnlxdir
+PORTVERSION= 2.1
CATEGORIES= ftp
MASTER_SITES= ftp://ftp-lc.llnl.gov/pub/ia/llnlxdir/
+DISTNAME= latest_xdir
EXTRACT_SUFX= .tar.Z
MAINTAINER= dima@FreeBSD.org
diff --git a/ftp/llnlxftp/Makefile b/ftp/llnlxftp/Makefile
index c9796ea3e3f0..2cd79a1e8fbd 100644
--- a/ftp/llnlxftp/Makefile
+++ b/ftp/llnlxftp/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: llnlxftp
-# Version required: 2.1
# Date created: 9 November 1997
-#
# Whom: Dima Ruban <dima@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= latest_xftp
-PKGNAME= llnlxftp-2.1
+PORTNAME= llnlxftp
+PORTVERSION= 2.1
CATEGORIES= ftp
MASTER_SITES= ftp://ftp-lc.llnl.gov/pub/ia/llnlxftp/
+DISTNAME= latest_xftp
EXTRACT_SUFX= .tar.Z
MAINTAINER= dima@FreeBSD.org
diff --git a/ftp/mirror/Makefile b/ftp/mirror/Makefile
index 1bff3933c737..d8c6185b5680 100644
--- a/ftp/mirror/Makefile
+++ b/ftp/mirror/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mirror
-# Version required: 2.9
# Date created: 15 May 1995
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= mirror-2.9
+PORTNAME= mirror
+PORTVERSION= 2.9
CATEGORIES= ftp
MASTER_SITES= ftp://src.doc.ic.ac.uk/computing/archiving/mirror/
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile
index 7547d10b5bac..5dd48cdcafa5 100644
--- a/ftp/moxftp/Makefile
+++ b/ftp/moxftp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: moxftp
-# Version required: 2.2
# Date created: 19 December 1994
# Whom: janek
#
# $FreeBSD$
#
-DISTNAME= moxftp-2.2
+PORTNAME= moxftp
+PORTVERSION= 2.2
CATEGORIES= ftp
MASTER_SITES= ftp://metalab.unc.edu/pub/X11/contrib/applications/ \
ftp://ftp.inria.fr/X/contrib-R5/applications/ \
diff --git a/ftp/ncftp/Makefile b/ftp/ncftp/Makefile
index 7e006c1bf20e..d0b72fe96b9b 100644
--- a/ftp/ncftp/Makefile
+++ b/ftp/ncftp/Makefile
@@ -1,15 +1,15 @@
# ex:ts=8
# Ports collection makefile for: ncftp
-# Version required: 0.0
# Date created: 20 Jun 1996
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= ncftp-1.9.5
+PORTNAME= ncftp
+PORTVERSION= 1.9.5
CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
+MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
MAINTAINER= obrien@FreeBSD.org
diff --git a/ftp/ncftp1/Makefile b/ftp/ncftp1/Makefile
index 7e006c1bf20e..d0b72fe96b9b 100644
--- a/ftp/ncftp1/Makefile
+++ b/ftp/ncftp1/Makefile
@@ -1,15 +1,15 @@
# ex:ts=8
# Ports collection makefile for: ncftp
-# Version required: 0.0
# Date created: 20 Jun 1996
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= ncftp-1.9.5
+PORTNAME= ncftp
+PORTVERSION= 1.9.5
CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
+MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
MAINTAINER= obrien@FreeBSD.org
diff --git a/ftp/ncftp2/Makefile b/ftp/ncftp2/Makefile
index 9a50fb89dc9b..aa9d466652f6 100644
--- a/ftp/ncftp2/Makefile
+++ b/ftp/ncftp2/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: ncftp2
-# Version required: 2.4.3
# Date created: 4 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= ncftp-2.4.3
+PORTNAME= ncftp
+PORTVERSION= 2.4.3
CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
+MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
MAINTAINER= ache@FreeBSD.org
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes
MAN1= ncftp2.1
do-install:
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 793c7128261b..621514d1b589 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: ncftp3
-# Version required: 0.0
# Date created: 4 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= ncftp-3.0.1-src
-PKGNAME= ncftp3-3.0.1
+PORTNAME= ncftp3
+PORTVERSION= 3.0.1
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
+DISTNAME= ncftp-${PORTVERSION}-src
MAINTAINER= obrien@FreeBSD.org
diff --git a/ftp/omi/Makefile b/ftp/omi/Makefile
index 011c1658acb4..bc19a60dfa33 100644
--- a/ftp/omi/Makefile
+++ b/ftp/omi/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: omi
# http://fromme.com/omi/
-# Version required: alpha
# Date created: 19 August 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= omi-alpha-9
+PORTNAME= omi
+PORTVERSION= alpha-9
CATEGORIES= ftp
-MASTER_SITES= http://dorifer.heim3.tu-clausthal.de/~olli/omi/
+MASTER_SITES= http://dorifer.heim3.tu-clausthal.de/~olli/omi/
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
-ALL_TARGET= freebsd
+ALL_TARGET= freebsd
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/omi ${PREFIX}/bin
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 27ce7e4ceffe..5195d1298d2e 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: pavuk
-# Version required: 0.9pl18
# Date created: 19 March 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= pavuk-0.9pl18
-PKGNAME= pavuk-0.9.18
+PORTNAME= pavuk
+PORTVERSION= 0.9.18
CATEGORIES= ftp www
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.idata.sk/pub/unix/www/ \
ftp://ftp.phacka.sk/pub/pavuk/ \
http://www.idata.sk/~ondrej/sw/
MASTER_SITE_SUBDIR= X11/gtkbuffet/apps/pavuk
+DISTNAME= ${PORTNAME}-0.9pl18
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 1a5d87901330..3ed74182fd80 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: proftpd
-# Version required: 1.2.0pl10
# Date created: 26 January 1998
# Whom: Stephane Legrand
#
# $FreeBSD$
#
-DISTNAME= proftpd-1.2.0pre10
-PKGNAME= proftpd-1.2.0p10
+PORTNAME= proftpd
+PORTVERSION= 1.2.0p10
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.tos.net/pub/proftpd/ \
ftp://ftp.stikman.com/pub/proftpd/ \
ftp://ftp.linux.co.uk/pub/packages/proftpd/ \
ftp://ftp.drenik.net/linux/ftp/proftpd/
+DISTNAME= ${PORTNAME}-1.2.0pre10
MAINTAINER= mharo@FreeBSD.org
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 1a5d87901330..3ed74182fd80 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: proftpd
-# Version required: 1.2.0pl10
# Date created: 26 January 1998
# Whom: Stephane Legrand
#
# $FreeBSD$
#
-DISTNAME= proftpd-1.2.0pre10
-PKGNAME= proftpd-1.2.0p10
+PORTNAME= proftpd
+PORTVERSION= 1.2.0p10
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.tos.net/pub/proftpd/ \
ftp://ftp.stikman.com/pub/proftpd/ \
ftp://ftp.linux.co.uk/pub/packages/proftpd/ \
ftp://ftp.drenik.net/linux/ftp/proftpd/
+DISTNAME= ${PORTNAME}-1.2.0pre10
MAINTAINER= mharo@FreeBSD.org
diff --git a/ftp/sftp/Makefile b/ftp/sftp/Makefile
index 44f406051296..ed4c507f202f 100644
--- a/ftp/sftp/Makefile
+++ b/ftp/sftp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sftp
-# Version required: 0.7
# Date created: 30 December 1999
# Whom: Cy Shubert <Cy.Shubert@uumail.gov.bc.ca>
#
# $FreeBSD$
#
-DISTNAME= sftp-0.7
+PORTNAME= sftp
+PORTVERSION= 0.7
CATEGORIES= ftp security
MASTER_SITES= ftp://ftp.xbill.org/pub/sftp/
diff --git a/ftp/spegla/Makefile b/ftp/spegla/Makefile
index b9c462c271a8..9a559a6ca2ee 100644
--- a/ftp/spegla/Makefile
+++ b/ftp/spegla/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# New ports collection makefile for: spegla
-# Version required: 1.04p1
# Date created: Sun Apr 19 16:17:25 PDT 1998
# Whom: Jordan Hubbard <jkh@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= spegla-1.04p1
+PORTNAME= spegla
+PORTVERSION= 1.04p1
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.luth.se/pub/unix/mirror/ \
ftp://subzero.campus.luth.se/pub/spegla/
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index 318dcbdbe5c8..b2934f301eaf 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: wget
-# Version required: 0.0
# Date created: 31 December 1996
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wget-1.5.3
+PORTNAME= wget
+PORTVERSION= 1.5.3
CATEGORIES= ftp www
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 318dcbdbe5c8..b2934f301eaf 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: wget
-# Version required: 0.0
# Date created: 31 December 1996
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wget-1.5.3
+PORTNAME= wget
+PORTVERSION= 1.5.3
CATEGORIES= ftp www
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index 5ad84e730b6a..7e9391cdaa18 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wu-ftpd
-# Version required: 2.6.*
# Date created: 18 Oct 1994
# Whom: torstenb
#
@@ -8,11 +7,12 @@
# REMINDER: to use ftpaccess(5) you need to specify -a in command line,
# it is changed from previous versions
-DISTNAME= wu-ftpd-2.6.0
+PORTNAME= wu-ftpd
+PORTVERSION= 2.6.0
CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
+MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
Y2K= http://www.cetis.hvu.nl/~koos/wu-ftpd-faq.html#QA35
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index 5ad84e730b6a..7e9391cdaa18 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wu-ftpd
-# Version required: 2.6.*
# Date created: 18 Oct 1994
# Whom: torstenb
#
@@ -8,11 +7,12 @@
# REMINDER: to use ftpaccess(5) you need to specify -a in command line,
# it is changed from previous versions
-DISTNAME= wu-ftpd-2.6.0
+PORTNAME= wu-ftpd
+PORTVERSION= 2.6.0
CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
+MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
Y2K= http://www.cetis.hvu.nl/~koos/wu-ftpd-faq.html#QA35
diff --git a/ftp/xrmftp/Makefile b/ftp/xrmftp/Makefile
index de004489324e..8bb66a6b3ab8 100644
--- a/ftp/xrmftp/Makefile
+++ b/ftp/xrmftp/Makefile
@@ -1,12 +1,12 @@
# New ports collection Makefile for: xrmftp
-# Version required: 1.2.4
# Date created: 28 March 2000
# Whom: Matt Heckaman <matt@LUCIDA.QC.CA>
#
# $FreeBSD$
#
-DISTNAME= xrmftp-1.2.4
+PORTNAME= xrmftp
+PORTVERSION= 1.2.4
CATEGORIES= ftp
MASTER_SITES= http://www.mat.uni.torun.pl/~rafmet/ \
ftp://ftp.netspring.net/pub/people/rafal-metkowski/
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index 3819a1a6cccf..f78cc09f2d07 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: yafc
-# Version required: 0.5.1
# Date created: 10 June 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= yafc-0.5.1
+PORTNAME= yafc
+PORTVERSION= 0.5.1
CATEGORIES= ftp
MASTER_SITES= ftp://mayer.physto.se/pub/yafc/
diff --git a/ftp/yale-tftpd/Makefile b/ftp/yale-tftpd/Makefile
index 7109f756d8f2..ed30fd47c12b 100644
--- a/ftp/yale-tftpd/Makefile
+++ b/ftp/yale-tftpd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: yale-tftpd
-# Version required: 3.0
# Date created: Oct 8, 1994
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= yale-tftpd-3.0
+PORTNAME= yale-tftpd
+PORTVERSION= 3.0
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.cert.dfn.de/pub/tools/net/yale-tftpd/