aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--benchmarks/nttcp/Makefile4
-rw-r--r--benchmarks/ttcp/Makefile4
-rw-r--r--databases/rrdtool/Makefile4
-rw-r--r--databases/rrdtool10/Makefile4
-rw-r--r--dns/adns/Makefile4
-rw-r--r--dns/bind8/Makefile4
-rw-r--r--dns/bind9/Makefile4
-rw-r--r--dns/bind94/Makefile4
-rw-r--r--dns/bind95/Makefile4
-rw-r--r--dns/bind96/Makefile4
-rw-r--r--dns/ddup/Makefile6
-rw-r--r--dns/dhid/Makefile4
-rw-r--r--dns/dlint/Makefile6
-rw-r--r--dns/dnsutl/Makefile4
-rw-r--r--dns/dnswalk/Makefile5
-rw-r--r--dns/doc/Makefile4
-rw-r--r--dns/domtools/Makefile9
-rw-r--r--dns/h2n/Makefile6
-rw-r--r--dns/hesiod/Makefile4
-rw-r--r--dns/nslint/Makefile4
-rw-r--r--dns/nsping/Makefile7
-rw-r--r--dns/p5-Net-DNS/Makefile6
-rw-r--r--net-im/ayttm/Makefile4
-rw-r--r--net-im/centericq/Makefile5
-rw-r--r--net-im/climm/Makefile4
-rw-r--r--net-im/gaim/Makefile4
-rw-r--r--net-im/gicq/Makefile4
-rw-r--r--net-im/gnomeicu/Makefile4
-rw-r--r--net-im/gnomeicu2/Makefile4
-rw-r--r--net-im/gtkyahoo/Makefile4
-rw-r--r--net-im/icb/Makefile4
-rw-r--r--net-im/icqlib/Makefile4
-rw-r--r--net-im/libicq/Makefile4
-rw-r--r--net-im/licq/Makefile4
-rw-r--r--net-im/micq/Makefile4
-rw-r--r--net-im/naim/Makefile6
-rw-r--r--net-im/tik/Makefile4
-rw-r--r--net-im/xicq/Makefile6
-rw-r--r--net-mgmt/argus/Makefile6
-rw-r--r--net-mgmt/arpwatch-devel/Makefile4
-rw-r--r--net-mgmt/arpwatch/Makefile4
-rw-r--r--net-mgmt/bpft/Makefile4
-rw-r--r--net-mgmt/choparp/Makefile4
-rw-r--r--net-mgmt/ciscoconf/Makefile6
-rw-r--r--net-mgmt/clog/Makefile4
-rw-r--r--net-mgmt/cricket/Makefile4
-rw-r--r--net-mgmt/dhcpconf/Makefile8
-rw-r--r--net-mgmt/icmpquery/Makefile6
-rw-r--r--net-mgmt/ipfm/Makefile4
-rw-r--r--net-mgmt/irrtoolset/Makefile6
-rw-r--r--net-mgmt/isic/Makefile4
-rw-r--r--net-mgmt/libsmi/Makefile4
-rw-r--r--net-mgmt/mrtg/Makefile4
-rw-r--r--net-mgmt/net-snmp-devel/Makefile4
-rw-r--r--net-mgmt/net-snmp/Makefile4
-rw-r--r--net-mgmt/net-snmp4/Makefile4
-rw-r--r--net-mgmt/net-snmp53/Makefile4
-rw-r--r--net-mgmt/nocol/Makefile4
-rw-r--r--net-mgmt/nstreams/Makefile4
-rw-r--r--net-mgmt/p5-Net-IPv4Addr/Makefile6
-rw-r--r--net-mgmt/p5-SNMP-Util/Makefile6
-rw-r--r--net-mgmt/p5-SNMP/Makefile6
-rw-r--r--net-mgmt/p5-SNMP_Session/Makefile6
-rw-r--r--net-mgmt/scotty3/Makefile4
-rw-r--r--net-mgmt/trafd/Makefile4
-rw-r--r--net-mgmt/wide-dhcp/Makefile6
-rw-r--r--net/SSLtelnet/Makefile4
-rw-r--r--net/adns/Makefile4
-rw-r--r--net/archie.el/Makefile6
-rw-r--r--net/archie/Makefile6
-rw-r--r--net/argus/Makefile6
-rw-r--r--net/arla/Makefile4
-rw-r--r--net/arpwatch-devel/Makefile4
-rw-r--r--net/arpwatch/Makefile4
-rw-r--r--net/ascend-radius/Makefile5
-rw-r--r--net/ayttm/Makefile4
-rw-r--r--net/bb/Makefile4
-rw-r--r--net/bind8/Makefile4
-rw-r--r--net/bind9/Makefile4
-rw-r--r--net/bing/Makefile4
-rw-r--r--net/binkd/Makefile6
-rw-r--r--net/boclient/Makefile6
-rw-r--r--net/bounce/Makefile6
-rw-r--r--net/bpft/Makefile4
-rw-r--r--net/brouted/Makefile4
-rw-r--r--net/cap/Makefile7
-rw-r--r--net/centericq/Makefile5
-rw-r--r--net/choparp/Makefile4
-rw-r--r--net/ciscoconf/Makefile6
-rw-r--r--net/citrix_ica/Makefile8
-rw-r--r--net/citrix_xenapp/Makefile8
-rw-r--r--net/clog/Makefile4
-rw-r--r--net/clusterit/Makefile4
-rw-r--r--net/cnet/Makefile6
-rw-r--r--net/coda5_client/Makefile6
-rw-r--r--net/coda5_doc/Makefile6
-rw-r--r--net/coda5_server/Makefile6
-rw-r--r--net/coda_client/Makefile6
-rw-r--r--net/coda_doc/Makefile6
-rw-r--r--net/coda_intro/Makefile6
-rw-r--r--net/coda_server/Makefile6
-rw-r--r--net/cricket/Makefile4
-rw-r--r--net/cvsup-bin/Makefile4
-rw-r--r--net/cvsup-mirror/Makefile4
-rw-r--r--net/cvsup/Makefile4
-rw-r--r--net/cvsupd-bin/Makefile4
-rw-r--r--net/dante/Makefile4
-rw-r--r--net/datapipe/Makefile6
-rw-r--r--net/ddup/Makefile6
-rw-r--r--net/delegate/Makefile6
-rw-r--r--net/dgd-lpmud/Makefile5
-rw-r--r--net/dgd-net/Makefile6
-rw-r--r--net/dgd/Makefile6
-rw-r--r--net/dhcpconf/Makefile8
-rw-r--r--net/dhid/Makefile4
-rw-r--r--net/dlint/Makefile6
-rw-r--r--net/dnsutl/Makefile4
-rw-r--r--net/dnswalk/Makefile5
-rw-r--r--net/doc/Makefile4
-rw-r--r--net/domtools/Makefile9
-rw-r--r--net/echoping/Makefile4
-rw-r--r--net/etherboot/Makefile5
-rw-r--r--net/ethereal/Makefile4
-rw-r--r--net/everybuddy/Makefile4
-rw-r--r--net/fping/Makefile5
-rw-r--r--net/freewais-sf/Makefile6
-rw-r--r--net/fspclient/Makefile6
-rw-r--r--net/gaim-snapshot/Makefile4
-rw-r--r--net/gaim/Makefile4
-rw-r--r--net/gated/Makefile6
-rw-r--r--net/generic-nqs/Makefile6
-rw-r--r--net/ggsd/Makefile6
-rw-r--r--net/gicq/Makefile4
-rw-r--r--net/gnet-glib2/Makefile4
-rw-r--r--net/gnet/Makefile4
-rw-r--r--net/gnet2/Makefile4
-rw-r--r--net/gnomba/Makefile4
-rw-r--r--net/gnome-vnc/Makefile4
-rw-r--r--net/gnomeicu/Makefile4
-rw-r--r--net/gnomeicu/gnomeicu/Makefile4
-rw-r--r--net/gnomeicu2/Makefile4
-rw-r--r--net/gnosamba/Makefile4
-rw-r--r--net/gnu-finger/Makefile6
-rw-r--r--net/gopher/Makefile6
-rw-r--r--net/gtic/Makefile4
-rw-r--r--net/gtkyahoo/Makefile4
-rw-r--r--net/h2n/Makefile6
-rw-r--r--net/hesiod/Makefile4
-rw-r--r--net/icb/Makefile4
-rw-r--r--net/icmpinfo/Makefile4
-rw-r--r--net/icmpquery/Makefile6
-rw-r--r--net/icqlib/Makefile4
-rw-r--r--net/icqlib0/Makefile4
-rw-r--r--net/icqnix/Makefile6
-rw-r--r--net/ipfm/Makefile4
-rw-r--r--net/iplog/Makefile4
-rw-r--r--net/ipw/Makefile6
-rw-r--r--net/irrtoolset/Makefile6
-rw-r--r--net/isc-dhcp2/Makefile6
-rw-r--r--net/isc-dhcp3-server/Makefile6
-rw-r--r--net/isc-dhcp3/Makefile6
-rw-r--r--net/isc-dhcp30-server/Makefile6
-rw-r--r--net/isc-dhcp31-server/Makefile6
-rw-r--r--net/isc-dhcp40-server/Makefile6
-rw-r--r--net/isic/Makefile4
-rw-r--r--net/kdenetwork11/Makefile4
-rw-r--r--net/kdenetwork2/Makefile4
-rw-r--r--net/kdenetwork3/Makefile4
-rw-r--r--net/kdenetwork4/Makefile4
-rw-r--r--net/kdetelnet/Makefile4
-rw-r--r--net/kicq/Makefile4
-rw-r--r--net/ksamba/Makefile4
-rw-r--r--net/lambdamoo/Makefile6
-rw-r--r--net/ldapsdk/Makefile6
-rw-r--r--net/libicq/Makefile4
-rw-r--r--net/libnet/Makefile4
-rw-r--r--net/libnet10/Makefile4
-rw-r--r--net/libnids/Makefile5
-rw-r--r--net/libsmi/Makefile4
-rw-r--r--net/libsocket++/Makefile6
-rw-r--r--net/libunp/Makefile6
-rw-r--r--net/libunpipc/Makefile6
-rw-r--r--net/licq-devel/Makefile4
-rw-r--r--net/licq/Makefile4
-rw-r--r--net/macipgw/Makefile4
-rw-r--r--net/mars_nwe/Makefile6
-rw-r--r--net/merlinmon/Makefile6
-rw-r--r--net/micq/Makefile4
-rw-r--r--net/mopd/Makefile4
-rw-r--r--net/mpd-netgraph/Makefile4
-rw-r--r--net/mpd/Makefile4
-rw-r--r--net/mpich/Makefile4
-rw-r--r--net/mpich2/Makefile4
-rw-r--r--net/mrt/Makefile6
-rw-r--r--net/mrtg/Makefile4
-rw-r--r--net/mtr/Makefile4
-rw-r--r--net/naim/Makefile6
-rw-r--r--net/nam/Makefile6
-rw-r--r--net/ncplib/Makefile4
-rw-r--r--net/net-snmp/Makefile4
-rw-r--r--net/net-snmp4/Makefile4
-rw-r--r--net/netatalk-asun/Makefile5
-rw-r--r--net/netatalk-devel/Makefile4
-rw-r--r--net/netatalk/Makefile4
-rw-r--r--net/netcat/Makefile6
-rw-r--r--net/netpipes/Makefile8
-rw-r--r--net/nettest/Makefile6
-rw-r--r--net/ngrep/Makefile4
-rw-r--r--net/nocol/Makefile4
-rw-r--r--net/ns/Makefile6
-rw-r--r--net/ns2/Makefile6
-rw-r--r--net/nslint/Makefile4
-rw-r--r--net/nsping/Makefile7
-rw-r--r--net/nstreams/Makefile4
-rw-r--r--net/ntimelord/Makefile4
-rw-r--r--net/ntop/Makefile6
-rw-r--r--net/ntp-devel/Makefile4
-rw-r--r--net/ntp-stable/Makefile4
-rw-r--r--net/ntp/Makefile4
-rw-r--r--net/nttcp/Makefile4
-rw-r--r--net/opal/Makefile7
-rw-r--r--net/opal3/Makefile7
-rw-r--r--net/opengatekeeper/Makefile6
-rw-r--r--net/openh323-112/Makefile7
-rw-r--r--net/openh323/Makefile7
-rw-r--r--net/openldap/Makefile4
-rw-r--r--net/openldap12/Makefile4
-rw-r--r--net/openldap2/Makefile4
-rw-r--r--net/openldap20-server/Makefile4
-rw-r--r--net/openldap20/Makefile4
-rw-r--r--net/openldap21-server/Makefile4
-rw-r--r--net/openldap21/Makefile4
-rw-r--r--net/openldap22-server/Makefile4
-rw-r--r--net/openldap22/Makefile4
-rw-r--r--net/openldap23-server/Makefile4
-rw-r--r--net/openldap24-server/Makefile4
-rw-r--r--net/p5-Archie/Makefile6
-rw-r--r--net/p5-Net-DNS/Makefile6
-rw-r--r--net/p5-Net-Daemon/Makefile6
-rw-r--r--net/p5-Net-IPv4Addr/Makefile6
-rw-r--r--net/p5-Net-RawIP/Makefile6
-rw-r--r--net/p5-Net-Telnet/Makefile6
-rw-r--r--net/p5-Net-Whois/Makefile6
-rw-r--r--net/p5-Net/Makefile6
-rw-r--r--net/p5-PlRPC/Makefile6
-rw-r--r--net/p5-SNMP-Util/Makefile6
-rw-r--r--net/p5-SNMP/Makefile6
-rw-r--r--net/p5-SNMP_Session/Makefile6
-rw-r--r--net/p5-Socks/Makefile6
-rw-r--r--net/p5-URI/Makefile6
-rw-r--r--net/p5-pRPC/Makefile6
-rw-r--r--net/pathchar/Makefile6
-rw-r--r--net/pchar/Makefile4
-rw-r--r--net/pcnfsd/Makefile6
-rw-r--r--net/perldap/Makefile4
-rw-r--r--net/pipsecd/Makefile6
-rw-r--r--net/pmf/Makefile4
-rw-r--r--net/poptop/Makefile6
-rw-r--r--net/ppp-nt/Makefile6
-rw-r--r--net/pppload/Makefile4
-rw-r--r--net/ppptraf/Makefile4
-rw-r--r--net/pptpclient/Makefile6
-rw-r--r--net/ppxp/Makefile4
-rw-r--r--net/priss/Makefile6
-rw-r--r--net/pvm/Makefile6
-rw-r--r--net/queso/Makefile4
-rw-r--r--net/radius/Makefile6
-rw-r--r--net/radiusclient/Makefile4
-rw-r--r--net/radiusd-cistron/Makefile6
-rw-r--r--net/radreport/Makefile6
-rw-r--r--net/ratoolset/Makefile6
-rw-r--r--net/rboot/Makefile4
-rw-r--r--net/rdist6/Makefile4
-rw-r--r--net/relay/Makefile6
-rw-r--r--net/rinetd/Makefile6
-rw-r--r--net/ripetools/Makefile6
-rw-r--r--net/rmsg/Makefile4
-rw-r--r--net/rrdtool/Makefile4
-rw-r--r--net/rrdtool10/Makefile4
-rw-r--r--net/rshell/Makefile3
-rw-r--r--net/rsync/Makefile4
-rw-r--r--net/rtsp_proxy/Makefile6
-rw-r--r--net/rwhois/Makefile8
-rw-r--r--net/rwhoisd/Makefile8
-rw-r--r--net/samba-devel/Makefile5
-rw-r--r--net/samba/Makefile5
-rw-r--r--net/samba3/Makefile5
-rw-r--r--net/scotty/Makefile4
-rw-r--r--net/scotty3/Makefile4
-rw-r--r--net/sendfile/Makefile6
-rw-r--r--net/sharity-light/Makefile6
-rw-r--r--net/slirp/Makefile4
-rw-r--r--net/smbtcpdump/Makefile6
-rw-r--r--net/sniffit/Makefile6
-rw-r--r--net/socks5/Makefile6
-rw-r--r--net/sup/Makefile6
-rw-r--r--net/tac_plus4/Makefile6
-rw-r--r--net/tcpflow/Makefile4
-rw-r--r--net/tcpshow/Makefile4
-rw-r--r--net/tcptrace/Makefile6
-rw-r--r--net/tcserver/Makefile8
-rw-r--r--net/tdetect/Makefile6
-rw-r--r--net/telnetx/Makefile6
-rw-r--r--net/telserv/Makefile6
-rw-r--r--net/tik/Makefile4
-rw-r--r--net/tintin++-devel/Makefile6
-rw-r--r--net/tintin++/Makefile6
-rw-r--r--net/tinyfugue/Makefile6
-rw-r--r--net/tn3270/Makefile6
-rw-r--r--net/tn5250/Makefile4
-rw-r--r--net/traceroute/Makefile6
-rw-r--r--net/trafd/Makefile4
-rw-r--r--net/trafshow/Makefile4
-rw-r--r--net/trafshow3/Makefile4
-rw-r--r--net/trafshow4/Makefile4
-rw-r--r--net/ttcp/Makefile4
-rw-r--r--net/ttt/Makefile4
-rw-r--r--net/tund/Makefile4
-rw-r--r--net/ucd-snmp/Makefile4
-rw-r--r--net/vnc/Makefile5
-rw-r--r--net/wais/Makefile4
-rw-r--r--net/wide-dhcp/Makefile6
-rw-r--r--net/wireshark/Makefile4
-rw-r--r--net/wmnet/Makefile4
-rw-r--r--net/xarchie/Makefile4
-rw-r--r--net/xferstats/Makefile4
-rw-r--r--net/xicq/Makefile6
-rw-r--r--net/xipmsg/Makefile6
-rw-r--r--net/xisp/Makefile5
-rw-r--r--net/xtraceroute/Makefile4
-rw-r--r--net/xwhois/Makefile4
-rw-r--r--net/ytalk/Makefile4
-rw-r--r--net/zebra-devel/Makefile4
-rw-r--r--net/zebra-pj/Makefile4
-rw-r--r--net/zebra/Makefile4
-rw-r--r--net/zephyr/Makefile4
-rw-r--r--net/ztelnet/Makefile5
337 files changed, 828 insertions, 838 deletions
diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
index ddb37b804cdd..82552f3665f9 100644
--- a/benchmarks/nttcp/Makefile
+++ b/benchmarks/nttcp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nttcp
-# Version required: 1.45
# Date created: 11 Nov 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= nttcp-1.45
+PORTNAME= nttcp
+PORTVERSION= 1.45
CATEGORIES= net benchmarks
MASTER_SITES= http://users.leo.org/~bartel/nttcp/ \
http://people.FreeBSD.org/~billf/
diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile
index 8b531fa1beb9..9557a832240e 100644
--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ttcp
-# Version required: 1.12
# Date created: Tue Jun 1 22:58:13 PDT 1999
# Whom: mharo@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= ttcp-1.12
+PORTNAME= ttcp
+PORTVERSION= 1.12
CATEGORIES= net
MASTER_SITES= ftp://ftp.sgi.com/sgi/src/ttcp/
DISTFILES= ttcp.c ttcp.1 README
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 122e84b51340..eddfece77d14 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rrdtool
-# Version required: 1.0.13
# Date created: 20 July 1999
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= rrdtool-1.0.13
+PORTNAME= rrdtool
+PORTVERSION= 1.0.13
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 122e84b51340..eddfece77d14 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rrdtool
-# Version required: 1.0.13
# Date created: 20 July 1999
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= rrdtool-1.0.13
+PORTNAME= rrdtool
+PORTVERSION= 1.0.13
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index f0ea2209d6bd..09fb109d31cd 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: adns
-# Version required: 0.7
# Date created: Mon Mar 3, 2000
# Whom: Kostya Lukin <lukin@okbmei.msk.su>
#
# $FreeBSD$
#
-DISTNAME= adns-0.7
+PORTNAME= adns
+PORTVERSION= 0.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.chiark.greenend.org.uk/users/ian/adns/
diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile
index 136af25adf71..decc947babe1 100644
--- a/dns/bind8/Makefile
+++ b/dns/bind8/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bind
-# Version required: 8.2.2-P5
# Date created: 18 July 1997
# Whom: jseger@scds.com
#
# $FreeBSD$
#
-DISTNAME= bind-8.2.2.p5
+PORTNAME= bind
+PORTVERSION= 8.2.2.p5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind/src/8.2.2-P5/
DISTFILES= bind-src.tar.gz bind-doc.tar.gz
diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index 136af25adf71..decc947babe1 100644
--- a/dns/bind9/Makefile
+++ b/dns/bind9/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bind
-# Version required: 8.2.2-P5
# Date created: 18 July 1997
# Whom: jseger@scds.com
#
# $FreeBSD$
#
-DISTNAME= bind-8.2.2.p5
+PORTNAME= bind
+PORTVERSION= 8.2.2.p5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind/src/8.2.2-P5/
DISTFILES= bind-src.tar.gz bind-doc.tar.gz
diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index 136af25adf71..decc947babe1 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bind
-# Version required: 8.2.2-P5
# Date created: 18 July 1997
# Whom: jseger@scds.com
#
# $FreeBSD$
#
-DISTNAME= bind-8.2.2.p5
+PORTNAME= bind
+PORTVERSION= 8.2.2.p5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind/src/8.2.2-P5/
DISTFILES= bind-src.tar.gz bind-doc.tar.gz
diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index 136af25adf71..decc947babe1 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bind
-# Version required: 8.2.2-P5
# Date created: 18 July 1997
# Whom: jseger@scds.com
#
# $FreeBSD$
#
-DISTNAME= bind-8.2.2.p5
+PORTNAME= bind
+PORTVERSION= 8.2.2.p5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind/src/8.2.2-P5/
DISTFILES= bind-src.tar.gz bind-doc.tar.gz
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 136af25adf71..decc947babe1 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bind
-# Version required: 8.2.2-P5
# Date created: 18 July 1997
# Whom: jseger@scds.com
#
# $FreeBSD$
#
-DISTNAME= bind-8.2.2.p5
+PORTNAME= bind
+PORTVERSION= 8.2.2.p5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind/src/8.2.2-P5/
DISTFILES= bind-src.tar.gz bind-doc.tar.gz
diff --git a/dns/ddup/Makefile b/dns/ddup/Makefile
index 684c8b4b74e3..c7f82db72767 100644
--- a/dns/ddup/Makefile
+++ b/dns/ddup/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ddup
-# Version required: 2.0.4
# Date created: 30 September 1999
# Whom: cjm2
#
# $FreeBSD$
#
-DISTNAME= ddup-2.2Dm
-PKGNAME= ddup-2.2
+PORTNAME= ddup
+PORTVERSION= 2.2
CATEGORIES= net
MASTER_SITES= ftp://ddup.sourceforge.net/pub/ddup/
+DISTNAME= ddup-2.2Dm
MAINTAINER= cjm2@altavista.net
diff --git a/dns/dhid/Makefile b/dns/dhid/Makefile
index f2ed00222c1d..b3cac1562db8 100644
--- a/dns/dhid/Makefile
+++ b/dns/dhid/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dhid
-# Version required: 3.1
# Date created: Sat Aug 21 06:13:59 EDT 1999
# Whom: Oryx Gazella <oryx@ungulate.net>
#
# $FreeBSD$
#
-DISTNAME= dhid-3.1
+PORTNAME= dhid
+PORTVERSION= 3.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.dhis.org/pub/dhis/
diff --git a/dns/dlint/Makefile b/dns/dlint/Makefile
index 5fa28cb88c57..1054528bc062 100644
--- a/dns/dlint/Makefile
+++ b/dns/dlint/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: dlint
-# Version required: 0.0
# Date created: Wed Dec 23, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= dlint1.3.3
-PKGNAME= dlint-1.3.3
+PORTNAME= dlint
+PORTVERSION= 1.3.3
CATEGORIES= net
MASTER_SITES= http://www.domtools.com/pub/
+DISTFILES= dlint-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/dns/dnsutl/Makefile b/dns/dnsutl/Makefile
index 71c2c57171fd..fd88845dcb6e 100644
--- a/dns/dnsutl/Makefile
+++ b/dns/dnsutl/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: dnsutl
-# Version required: 1.5
# Date created: Nov 05, 1998
# Whom: Karl Dietz (Karl.Dietz@frankfurt.netsurf.de)
#
# $FreeBSD$
#
-DISTNAME= dnsutl-1.5
+PORTNAME= dnsutl
+PORTVERSION= 1.5
CATEGORIES= net
MASTER_SITES= http://www.canb.auug.org.au/~millerp/dnsutl/ \
http://www.tip.net.au/~millerp/dnsutl/ \
diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile
index 03d60abbd235..97e01c49fd46 100644
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: dnswalk
-# Version required: 2.0.2
# Date created: 17 January 1998
# Whom: Matthew Hunt <mph@pobox.com>
#
# $FreeBSD$
+#
-DISTNAME= dnswalk-2.0.2
+PORTNAME= dnswalk
+PORTVERSION= 2.0.2
CATEGORIES= net
MASTER_SITES= http://www.visi.com/~barr/dnswalk/
diff --git a/dns/doc/Makefile b/dns/doc/Makefile
index d94a90584d8d..fe4391879372 100644
--- a/dns/doc/Makefile
+++ b/dns/doc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: doc
-# Version required: 2.1.4
# Date created: 28 November 1999
# Whom: MIHIRA Yoshiro <sanpei@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= doc-2.1.4
+PORTNAME= doc
+PORTVERSION= 2.1.4
CATEGORIES= net
MASTER_SITES= ftp://ftp.his.com/pub/brad/dns/
diff --git a/dns/domtools/Makefile b/dns/domtools/Makefile
index cd919a2005ca..13e8e64b9fc8 100644
--- a/dns/domtools/Makefile
+++ b/dns/domtools/Makefile
@@ -1,23 +1,22 @@
# New ports collection makefile for: domtools
-# Version required: 1.4.0
# Date created: 12 Jun 1999
# Whom: alexp
#
# $FreeBSD$
#
-DISTNAME= domtools${VERSION}
-PKGNAME= domtools-${VERSION}
+PORTNAME= domtools
+PORTVERSION= 1.4.0
CATEGORIES= net
MASTER_SITES= http://www.domtools.com/pub/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= veers@disturbed.net
USE_PERL5= YES
NO_BUILD= YES
-WRKSRC= ${WRKDIR}/domtools${VERSION}/
-VERSION= 1.4.0
+WRKSRC= ${WRKDIR}/domtools${PORTVERSION}/
# XXX - patches/patch-aa modifies Makefile
# and so does the post-patch target
diff --git a/dns/h2n/Makefile b/dns/h2n/Makefile
index 2e5e4f4164a7..de8bb03f9e8e 100644
--- a/dns/h2n/Makefile
+++ b/dns/h2n/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: h2n
-# Version required: 1.29
# Date created: 27 Nov 1997
# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= dns
-PKGNAME= h2n-1.29
+PORTNAME= h2n
+PORTVERSION= 1.29
CATEGORIES= net
MASTER_SITES= ftp://ftp.iij.ad.jp/pub/published/oreilly/nutshell/dnsbind/ \
ftp://ftp.uu.net/published/oreilly/nutshell/dnsbind/
+DISTNAME= dns
EXTRACT_SUFX= .tar.Z
MAINTAINER= sada@FreeBSD.org
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index e5432e412be9..66662a58e717 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: Hesiod
-# Version required: 3.0.2
# Date created: 6/11/1998
# Whom: n@nectar.com
#
# $FreeBSD$
#
-DISTNAME= hesiod-3.0.2
+PORTNAME= hesiod
+PORTVERSION= 3.0.2
CATEGORIES= net
MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/ \
http://www.nectar.cc/distfiles/
diff --git a/dns/nslint/Makefile b/dns/nslint/Makefile
index 5554a255a9ad..40da8bb97609 100644
--- a/dns/nslint/Makefile
+++ b/dns/nslint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nslint
-# Version required: 2.0.1
# Date created: 27 October 1997
# Whom: dglo@ssec.wisc.edu
#
# $FreeBSD$
#
-DISTNAME= nslint-2.0.1
+PORTNAME= nslint
+PORTVERSION= 2.0.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.ee.lbl.gov/
EXTRACT_SUFX= .tar.Z
diff --git a/dns/nsping/Makefile b/dns/nsping/Makefile
index 797cb44f4349..1a7ec01cb6bb 100644
--- a/dns/nsping/Makefile
+++ b/dns/nsping/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: nsping
-# Version required: 0.8
# Date created: 04 March 2000
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= nsping
-PKGNAME= nsping-0.8
+PORTNAME= nsping
+PORTVERSION= 0.8
CATEGORIES= net
MASTER_SITES= http://www.enteract.com/~tqbf/
+DISTNAME= nsping
MAINTAINER= kris@FreeBSD.org
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index db02e38e52b6..11365bcbb706 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Net-DNS
-# Version required: 0.12
# Date created: April 5th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Net-DNS-0.12
-PKGNAME= p5-Net-DNS-0.12
+PORTNAME= p5-Net-DNS
+PORTVERSION= 0.12
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
+DISTNAME= Net-DNS-0.12
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 077b8cede0dd..2f47186196a1 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: everybuddy
-# Version required: 0.1.1
# Date created: 1 Mar 2000
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= everybuddy-0.1.1
+PORTNAME= everybuddy
+PORTVERSION= 0.1.1
CATEGORIES= net
MASTER_SITES= http://www.everybuddy.com/files/
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 91de95d7894e..bc8bd79e94af 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: centericq
-# Version required: 2.0.0
# Date created: 25 December 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= center-2.0.0
+PORTNAME= centericq
+PORTVERSION= 2.0.0
CATEGORIES= net
MASTER_SITES= http://konst.org.ua/download/
+DISTNAME= center-${PORTVERSION}
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index 9e43fdd2914b..3ce86e375286 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: micq
-# Version required: 0.4.4
# Date created: 11 Oct 1998
# Whom: mph
#
# $FreeBSD$
#
-DISTNAME= micq-0.4.4
+PORTNAME= micq
+PORTVERSION= 0.4.4
CATEGORIES= net
MASTER_SITES= ftp://micq.chatzone.org/pub/micq/V0.4.4/
EXTRACT_SUFX= .tgz
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 527c39d58a4c..3b49a1e46af4 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gaim
-# Version required: 0.9.13
# Date created: 26 Mar 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gaim-0.9.13
+PORTNAME= gaim
+PORTVERSION= 0.9.13
CATEGORIES= net
MASTER_SITES= ftp://ftp.marko.net/pub/gaim/
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 2fe0b9425991..f273a0935cab 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gicq
-# Version required: 0.33
# Date Created: 31 Oct 1998
# Whom: Seiichirou Hiraoka
#
# $FreeBSD$
#
-DISTNAME= gicq-0.33
+PORTNAME= gicq
+PORTVERSION= 0.33
CATEGORIES= net
MASTER_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
ftp://ftp.korsoft.com/pub/gicq/
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 68b9e4934e95..b0dd8c209478 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: GnomeICU
-# Version required: 0.90b
# Date created: 03/16/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnomeicu-0.90b
+PORTNAME= gnomeicu
+PORTVERSION= 0.90.b
CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 68b9e4934e95..b0dd8c209478 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: GnomeICU
-# Version required: 0.90b
# Date created: 03/16/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnomeicu-0.90b
+PORTNAME= gnomeicu
+PORTVERSION= 0.90.b
CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index 9b7f63b36973..af38ea9e1a62 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkyahoo
-# Version required: 0.16
# Date created: 18 August 1999
# Whom: dannyman@dannyland.org
#
# $FreeBSD$
#
-DISTNAME= gtkyahoo-0.16
+PORTNAME= gtkyahoo
+PORTVERSION= 0.16
CATEGORIES= net
MASTER_SITES= http://www.unixtools.org/gtkyahoo/dist/tars/
diff --git a/net-im/icb/Makefile b/net-im/icb/Makefile
index e506dbbff5c0..4ac82816c650 100644
--- a/net-im/icb/Makefile
+++ b/net-im/icb/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: icb
-# Version required: 0.0
# Date created: Tue Feb 03, 1998
# Whom: David O'Brien (obrien@NUXI.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= icb-5.0.9
+PORTNAME= icb
+PORTVERSION= 5.0.9
CATEGORIES= net
MASTER_SITES= ftp://ftp.swcp.com/pub/icb/clients/unix/ \
ftp://ftp.empire.net/pub/icb/clients/ \
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 6d5e43ea264d..41ace90baf34 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: icqlib
-# Version required: 0.1.3
# Date created: 16 March 1999
# Whom: Pavel Andreev
#
# $FreeBSD$
#
-DISTNAME= icqlib-0.1.3
+PORTNAME= icqlib
+PORTVERSION= 0.1.3
CATEGORIES= net
MASTER_SITES= http://download.sourceforge.net/icqlib/
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 669f47168647..8e6d1b548109 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libicq
-# Version required: 0.33
# Date Created: 31 Oct 1998
# Whom: Seiichirou Hiraoka
#
# $FreeBSD$
#
-DISTNAME= libicq-0.33
+PORTNAME= libicq
+PORTVERSION= 0.33
CATEGORIES= net
MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/ \
http://www.nectar.com/distfiles/
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index e15d82e516a5..925e5ac215e8 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: licq
-# Version required: 0.81
# Date created: 2 July 1998
# Whom: Brian Feldman & Matt Heckaman
#
# $FreeBSD$
#
-DISTNAME= licq-0.81
+PORTNAME= licq
+PORTVERSION= 0.81
CATEGORIES= net
MASTER_SITES= http://download.sourceforge.net/licq/ \
ftp://ftp.wibble.net/pub/licq/srcs/ \
diff --git a/net-im/micq/Makefile b/net-im/micq/Makefile
index 9e43fdd2914b..3ce86e375286 100644
--- a/net-im/micq/Makefile
+++ b/net-im/micq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: micq
-# Version required: 0.4.4
# Date created: 11 Oct 1998
# Whom: mph
#
# $FreeBSD$
#
-DISTNAME= micq-0.4.4
+PORTNAME= micq
+PORTVERSION= 0.4.4
CATEGORIES= net
MASTER_SITES= ftp://micq.chatzone.org/pub/micq/V0.4.4/
EXTRACT_SUFX= .tgz
diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile
index c93dd016029b..adbdcd9a78fb 100644
--- a/net-im/naim/Makefile
+++ b/net-im/naim/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: naim
-# Version required: 0.9.3
# Date created: 02 March 1999
# Whom: mharo@area51.fremont.ca.us
#
# $FreeBSD$
#
-DISTNAME= naim-0.9.5-nicer2
-PKGNAME= naim-0.9.5.2
+PORTNAME= naim
+PORTVERSION= 0.9.5.2
CATEGORIES= net
MASTER_SITES= http://dev.n.ml.org/ \
ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
+DISTNAME= naim-0.9.5-nicer2
MAINTAINER= mharo@FreeBSD.org
diff --git a/net-im/tik/Makefile b/net-im/tik/Makefile
index f0d6171d0c0b..cef10658b190 100644
--- a/net-im/tik/Makefile
+++ b/net-im/tik/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tik
-# Version required: 0.59
# Date created: 13 January 1999
# Whom: Eugene M. Kim <astralblue@usa.net>
#
# $FreeBSD$
#
-DISTNAME= tik-0.59
+PORTNAME= tik
+PORTVERSION= 0.59
CATEGORIES= net tk82
MASTER_SITES= http://www.aim.aol.com/tik/ \
http://www.nectar.com/distfiles/
diff --git a/net-im/xicq/Makefile b/net-im/xicq/Makefile
index dee8ff5b30a7..ab772c351d6b 100644
--- a/net-im/xicq/Makefile
+++ b/net-im/xicq/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xicq
-# Version required: 12 July 1998
# Date created: 29 June 1998
# Whom: scrappy
#
# $FreeBSD$
#
-DISTNAME= xicq-071298-snapshot.src
-PKGNAME= xicq-071298
+PORTNAME= xicq
+PORTVERSION= 19980712
CATEGORIES= net
MASTER_SITES= http://www.xtrophy.dk/xicq/
+DISTNAME= xicq-071298-snapshot.src
MAINTAINER= scrappy@FreeBSD.org
diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile
index 0e496409aefd..c96bbd99af37 100644
--- a/net-mgmt/argus/Makefile
+++ b/net-mgmt/argus/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: argus
-# Version required: 1.7.beta.1e
# Date created: 26 November 1998
# Whom: Jonathan Hanna <jhanna@home.com>
#
# $FreeBSD$
#
-DISTNAME= argus-1.7.beta.1e
-PKGNAME= argus-1.7.b.1e
+PORTNAME= argus
+PORTVERSION= 1.7.b1e
CATEGORIES= net security
MASTER_SITES= ftp://ftp.sei.cmu.edu/pub/argus/argus-1.7/
+DISTNAME= argus-1.7.beta.1e
MAINTAINER= jhanna@home.com
diff --git a/net-mgmt/arpwatch-devel/Makefile b/net-mgmt/arpwatch-devel/Makefile
index 23a550e3741e..9c7018f17512 100644
--- a/net-mgmt/arpwatch-devel/Makefile
+++ b/net-mgmt/arpwatch-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: arpwatch
-# Version required: 2.0.2a1
# Date created: March 24 1997
# Whom: Brian Somers <brian@Awfulhak.org>
#
# $FreeBSD$
#
-DISTNAME= arpwatch-2.1a4
+PORTNAME= arpwatch
+PORTVERSION= 2.1.a4
CATEGORIES= net
MASTER_SITES= http://www.Awfulhak.org/arpwatch/ \
ftp://ftp.ee.lbl.gov/ \
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 23a550e3741e..9c7018f17512 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: arpwatch
-# Version required: 2.0.2a1
# Date created: March 24 1997
# Whom: Brian Somers <brian@Awfulhak.org>
#
# $FreeBSD$
#
-DISTNAME= arpwatch-2.1a4
+PORTNAME= arpwatch
+PORTVERSION= 2.1.a4
CATEGORIES= net
MASTER_SITES= http://www.Awfulhak.org/arpwatch/ \
ftp://ftp.ee.lbl.gov/ \
diff --git a/net-mgmt/bpft/Makefile b/net-mgmt/bpft/Makefile
index daeabee4b92d..851e7c25ef5f 100644
--- a/net-mgmt/bpft/Makefile
+++ b/net-mgmt/bpft/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bpft
-# Version required: 2.0
# Date created: 17 March 1999
# Whom: oddbjorn@tricknology.org
#
# $FreeBSD$
#
-DISTNAME= bpft-2.0
+PORTNAME= bpft
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.nsk.su/pub/unix/
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/choparp/Makefile b/net-mgmt/choparp/Makefile
index 77021c5ed3ff..ba9e4d970977 100644
--- a/net-mgmt/choparp/Makefile
+++ b/net-mgmt/choparp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: choparp
-# Version required: 971007
# Date created: 7 October 1997
# Whom: itojun@itojun.org
#
# $FreeBSD$
#
-DISTNAME= choparp-971007
+PORTNAME= choparp
+PORTVERSION= 971007
CATEGORIES= net
MASTER_SITES= http://delegate.uec.ac.jp:8081/club/mma/~tree/soft/choparp/
diff --git a/net-mgmt/ciscoconf/Makefile b/net-mgmt/ciscoconf/Makefile
index 0bf451653b92..3e1996bd3b6a 100644
--- a/net-mgmt/ciscoconf/Makefile
+++ b/net-mgmt/ciscoconf/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ciscoconf
-# Version required: 1.0beta1
# Date created: 11 September 1998
# Whom: jabley@clear.co.nz
#
# $FreeBSD$
#
-DISTNAME= ciscoconf-1.0beta1
-PKGNAME= ciscoconf-1.0
+PORTNAME= ciscoconf
+PORTVERSION= 1.0.b1
CATEGORIES= net
MASTER_SITES= ftp://ftp.patho.gen.nz/pub/users/jabley/ \
http://people.FreeBSD.org/~billf/
+DISTNAME= ciscoconf-1.0beta1
MAINTAINER= jabley@clear.co.nz
diff --git a/net-mgmt/clog/Makefile b/net-mgmt/clog/Makefile
index f7725ca7c901..1153e03e57d9 100644
--- a/net-mgmt/clog/Makefile
+++ b/net-mgmt/clog/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: clog
-# Version required: 0.0
# Date created: Tue Nov 04, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= clog-1.6
+PORTNAME= clog
+PORTVERSION= 1.6
CATEGORIES= net security
MASTER_SITES= ftp://ftp.saturn.net/pub/users/brian/clog/ \
ftp://ftp.cso.uiuc.edu/pub/security/coast/unix/clog/ \
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index c6f6f94ee422..41f20be811d3 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Cricket
-# Version required: 0.72
# Date created: 20 November 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= cricket-0.72
+PORTNAME= cricket
+PORTVERSION= 0.72
CATEGORIES= net
MASTER_SITES= http://www.munitions.com/~jra/cricket/dists/
diff --git a/net-mgmt/dhcpconf/Makefile b/net-mgmt/dhcpconf/Makefile
index 39b430bdd76e..88a5525d6510 100644
--- a/net-mgmt/dhcpconf/Makefile
+++ b/net-mgmt/dhcpconf/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: dhcp-conf
-# Version required: 0.7.0
# Date created: 20 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
+PORTNAME= dhcpconf
+PORTVERSION= 0.7.0
DISTNAME= dhcp-conf
-PKGNAME= dhcpconf-${VERSION}
CATEGORIES= net sysutils
MASTER_SITES= http://members.xoom.com/vschade/dhcp-conf/
+DISTNAME= dhcp-conf
EXTRACT_SUFX= .tgz
MAINTAINER= will@FreeBSD.org
@@ -18,8 +19,7 @@ LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
newt.0:${PORTSDIR}/devel/newt
ALL_TARGET= ${DISTNAME}
-VERSION= 0.7.0
-WRKSRC= ${WRKDIR}/${DISTNAME}_${VERSION}
+WRKSRC= ${WRKDIR}/${DISTNAME}_${PORTVERSION}
MAKE_ENV+= PCFLAGS="${CFLAGS}"
do-install:
diff --git a/net-mgmt/icmpquery/Makefile b/net-mgmt/icmpquery/Makefile
index af8b3fa73f5f..00c195d2cff7 100644
--- a/net-mgmt/icmpquery/Makefile
+++ b/net-mgmt/icmpquery/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: icmpquery
-# Version required: 1.0.3
# Date created: Jan 7 1999
# Whom: dom@myrddin.demon.co.uk
#
# $FreeBSD$
#
-DISTNAME= icmpquery
-PKGNAME= icmpquery-1.0.3
+PORTNAME= icmpquery
+PORTVERSION= 1.0.3
CATEGORIES= net
MASTER_SITES= http://www.angio.net/security/
+DISTNAME= icmpquery
EXTRACT_SUFX= .c
MAINTAINER= dom@myrddin.demon.co.uk
diff --git a/net-mgmt/ipfm/Makefile b/net-mgmt/ipfm/Makefile
index 0acf21f0a79b..5f884fcc4d5f 100644
--- a/net-mgmt/ipfm/Makefile
+++ b/net-mgmt/ipfm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ipfm
-# Version required: 0.10.4
# Date Created: 4 Mar 2000
# Whom: Roman Shterenzon <roman@xpert.com>
#
# $FreeBSD$
#
-DISTNAME= ipfm-0.10.4
+PORTNAME= ipfm
+PORTVERSION= 0.10.4
CATEGORIES= net
MASTER_SITES= http://www.via.ecp.fr/~tibob/ipfm/archive/
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile
index 1bfae84e26f5..39592020fc2a 100644
--- a/net-mgmt/irrtoolset/Makefile
+++ b/net-mgmt/irrtoolset/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: RAToolSet
-# Version required: 3.5.8
# Date created: May 4th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= RAToolSet-3.5.8
-PKGNAME= ratoolset-3.5.8
+PORTNAME= ratoolset
+PORTVERSION= 3.5.8
CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
+DISTNAME= RAToolSet-3.5.8
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net-mgmt/isic/Makefile b/net-mgmt/isic/Makefile
index 25eab79242ca..ea030d38ee2f 100644
--- a/net-mgmt/isic/Makefile
+++ b/net-mgmt/isic/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: isic
-# Version required: 0.05
# Date created: 25 February 2000
# Whom: Brad Hendrickse <bradh@uunet.co.za>
#
# $FreeBSD$
#
-DISTNAME= isic-0.05
+PORTNAME= isic
+PORTVERSION= 0.05
CATEGORIES= net
MASTER_SITES= http://expert.cc.purdue.edu/~frantzen/
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/libsmi/Makefile b/net-mgmt/libsmi/Makefile
index 9cad04a4e193..c176ccf46e69 100644
--- a/net-mgmt/libsmi/Makefile
+++ b/net-mgmt/libsmi/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libsmi
-# Version required: 0.1.8
# Date created: Tue Jan 27 2000
# Whom: Marcin Cieslak <saper@system.pl>
#
# $FreeBSD$
#
-DISTNAME= libsmi-0.1.8
+PORTNAME= libsmi
+PORTVERSION= 0.1.8
CATEGORIES= net
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index ecc6d8e757ee..ea7c2d95b3ba 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: MRTG
-# Version required: 2.8.8
# Date created: April 18th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mrtg-2.8.12
+PORTNAME= mrtg
+PORTVERSION= 2.8.12
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 6d3f72a88edd..3dde6cad0d45 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ucd-snmp
-# Version required: 3.6.1
# Date created: 26 June 1996
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= ucd-snmp-4.0.1
+PORTNAME= ucd-snmp
+PORTVERSION= 4.0.1
CATEGORIES= net
MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 6d3f72a88edd..3dde6cad0d45 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ucd-snmp
-# Version required: 3.6.1
# Date created: 26 June 1996
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= ucd-snmp-4.0.1
+PORTNAME= ucd-snmp
+PORTVERSION= 4.0.1
CATEGORIES= net
MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 6d3f72a88edd..3dde6cad0d45 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ucd-snmp
-# Version required: 3.6.1
# Date created: 26 June 1996
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= ucd-snmp-4.0.1
+PORTNAME= ucd-snmp
+PORTVERSION= 4.0.1
CATEGORIES= net
MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 6d3f72a88edd..3dde6cad0d45 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ucd-snmp
-# Version required: 3.6.1
# Date created: 26 June 1996
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= ucd-snmp-4.0.1
+PORTNAME= ucd-snmp
+PORTVERSION= 4.0.1
CATEGORIES= net
MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
diff --git a/net-mgmt/nocol/Makefile b/net-mgmt/nocol/Makefile
index 7e0435ba2ba1..ad912950c4b8 100644
--- a/net-mgmt/nocol/Makefile
+++ b/net-mgmt/nocol/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: NOCOL
-# Version required: 4.3
# Date created: 21 Nov 1998
# Whom: bradh
#
# $FreeBSD$
#
-DISTNAME= nocol-4.3
+PORTNAME= nocol
+PORTVERSION= 4.3
CATEGORIES= net
MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/
diff --git a/net-mgmt/nstreams/Makefile b/net-mgmt/nstreams/Makefile
index 1dea2d201855..7fbcb464ab1c 100644
--- a/net-mgmt/nstreams/Makefile
+++ b/net-mgmt/nstreams/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nstreams
-# Version required: 1.0.0
# Date created: 22 September 1999
# Whom: darius@dons.net.au
#
# $FreeBSD$
#
-DISTNAME= nstreams-1.0.0
+PORTNAME= nstreams
+PORTVERSION= 1.0.0
CATEGORIES= net
MASTER_SITES= http://www.hsc.fr/cabinet/produits/nstreams/
diff --git a/net-mgmt/p5-Net-IPv4Addr/Makefile b/net-mgmt/p5-Net-IPv4Addr/Makefile
index 84681174a0c2..cfacd3bc4f23 100644
--- a/net-mgmt/p5-Net-IPv4Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv4Addr/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Net-IPv4Addr
-# Version required: 0.08
# Date created: 25 February 2000
# Whom: Brad Hendrickse <bradh@uunet.co.za>
#
# $FreeBSD$
#
-DISTNAME= Net-IPv4Addr-0.08
-PKGNAME= p5-Net-IPv4Addr-0.08
+PORTNAME= p5-Net-IPv4Addr
+PORTVERSION= 0.08
CATEGORIES= net perl5
# not using CPAN due to them messing up the filename and version numbers
MASTER_SITES= http://indev.insu.com/sources/
+DISTNAME= Net-IPv4Addr-${PORTVERSION}
MAINTAINER= bradh@uunet.co.za
diff --git a/net-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index f419852773ab..574159da0e78 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/p5-SNMP-Util/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-SNMP-Util
-# Version required: 1.6
# Date created: September 7 1999
# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= SNMP-Util-1.6
-PKGNAME= p5-SNMP-Util-1.6
+PORTNAME= p5-SNMP-Util
+PORTVERSION= 1.6
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SNMP
+DISTNAME= SNMP-Util-1.6
MAINTAINER= fenner@FreeBSD.org
diff --git a/net-mgmt/p5-SNMP/Makefile b/net-mgmt/p5-SNMP/Makefile
index 3bda0ecfa995..46c99fd7b433 100644
--- a/net-mgmt/p5-SNMP/Makefile
+++ b/net-mgmt/p5-SNMP/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-SNMP
-# Version required: 1.8b3
# Date created: May 5th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= SNMP-1.8.1
-PKGNAME= p5-SNMP-1.8.1
+PORTNAME= p5-SNMP
+PORTVERSION= 1.8.1
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SNMP
+DISTNAME= SNMP-${PORTVERSION}
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index 238a946e067d..2354f04df7f0 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/p5-SNMP_Session/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: p5-SNMP_Session
-# Version required: 0.72
# Date created: 13 June 1999
# Whom: Stephen J. Roznowski <sjr@home.net>
#
# $FreeBSD$
#
-DISTNAME= SNMP_Session-0.75
-PKGNAME= p5-SNMP_Session-0.75
+PORTNAME= p5-SNMP_Session
+PORTVERSION= 0.75
CATEGORIES= net perl5
MASTER_SITES= ftp://ftp.switch.ch/software/sources/network/snmp/perl/
+DISTNAME= SNMP_Session-0.75
MAINTAINER= ports@FreeBSD.org
diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index 83a647ca22b4..60cd6b80de16 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: scotty
-# Version required: 2.1.9
# Date created: 18 February 1995
# Whom: Gennady Sorokopud <gena@netvisions.net.il>
#
# $FreeBSD$
#
-DISTNAME= scotty-2.1.10
+PORTNAME= scotty
+PORTVERSION= 2.1.10
CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
diff --git a/net-mgmt/trafd/Makefile b/net-mgmt/trafd/Makefile
index 7ab4da2b16fd..f0742df96e68 100644
--- a/net-mgmt/trafd/Makefile
+++ b/net-mgmt/trafd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: trafd
-# Version required: 3.0
# Date created: 22 January 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= trafd-3.0
+PORTNAME= trafd
+PORTVERSION= 3.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.riss-telecom.ru/pub/dev/trafd/
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/wide-dhcp/Makefile b/net-mgmt/wide-dhcp/Makefile
index 875920fa8d95..d13ff9359826 100644
--- a/net-mgmt/wide-dhcp/Makefile
+++ b/net-mgmt/wide-dhcp/Makefile
@@ -1,19 +1,19 @@
# ex:ts=8
# Ports collection makefile for: dhcp
-# Version required: 0.0
# Date created: 21 November 1995
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= dhcp-1.4.0p6
-PKGNAME= wide-dhcp-1.4.0p6
+PORTNAME= wide-dhcp
+PORTVERSION= 1.4.0.p6
CATEGORIES= net
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/wide-dhcp/ \
ftp://ftp.st.ryukoku.ac.jp/pub/network/dhcp/wide/ \
ftp://ftp.sage-au.org.au/pub/network/boot/wide-dhcp/
+DISTNAME= dhcp-1.4.0p6
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/SSLtelnet/Makefile b/net/SSLtelnet/Makefile
index c1d90a53e919..ebee85a0588a 100644
--- a/net/SSLtelnet/Makefile
+++ b/net/SSLtelnet/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: SSLtelnet
-# Version required: 0.13
# Date created: Mar 29, 1998
# Whom: issei@jp.FreeBSD.org
#
# $FreeBSD$
-DISTNAME= SSLtelnet-0.13
+PORTNAME= SSLtelnet
+PORTVERSION= 0.13
CATEGORIES= net security
MASTER_SITES= ftp://ftp.psy.uq.oz.au/pub/Crypto/SSLapps/
diff --git a/net/adns/Makefile b/net/adns/Makefile
index f0ea2209d6bd..09fb109d31cd 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: adns
-# Version required: 0.7
# Date created: Mon Mar 3, 2000
# Whom: Kostya Lukin <lukin@okbmei.msk.su>
#
# $FreeBSD$
#
-DISTNAME= adns-0.7
+PORTNAME= adns
+PORTVERSION= 0.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.chiark.greenend.org.uk/users/ian/adns/
diff --git a/net/archie.el/Makefile b/net/archie.el/Makefile
index b2a3580c7192..8fbbcf54ab4c 100644
--- a/net/archie.el/Makefile
+++ b/net/archie.el/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: archie.el
-# Version required: 3.0.2
# Date created: 99/10/6
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= archie.el
-PKGNAME= archie.el-3.0.2
+PORTNAME= archie.el
+PORTVERSION= 3.0.2
CATEGORIES= net elisp
# I don't know the master site
MASTER_SITES= ftp://ftp.cis.ohio-state.edu/pub/elisp-lisp/interfaces/ \
ftp://ftp.kddlabs.co.jp/.2/gnu-attic/ohio-elisp/interfaces/
+DISTNAME= archie.el
EXTRACT_SUFX= .Z
MAINTAINER= taoka@FreeBSD.org
diff --git a/net/archie/Makefile b/net/archie/Makefile
index fe8df2fc1fb1..1c7e2dc30048 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: archie
-# Version required: 1.4.1
# Date created: 20 Oct 1994
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= c-archie-1.4.1-FIXED
-PKGNAME= archie-1.4.1
+PORTNAME= archie
+PORTVERSION= 1.4.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.uu.net/networking/info-service/archie/clients/
+DISTNAME= c-archie-1.4.1-FIXED
EXTRACT_SUFX= .tar.Z
MAINTAINER= torstenb@FreeBSD.org
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 0e496409aefd..c96bbd99af37 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: argus
-# Version required: 1.7.beta.1e
# Date created: 26 November 1998
# Whom: Jonathan Hanna <jhanna@home.com>
#
# $FreeBSD$
#
-DISTNAME= argus-1.7.beta.1e
-PKGNAME= argus-1.7.b.1e
+PORTNAME= argus
+PORTVERSION= 1.7.b1e
CATEGORIES= net security
MASTER_SITES= ftp://ftp.sei.cmu.edu/pub/argus/argus-1.7/
+DISTNAME= argus-1.7.beta.1e
MAINTAINER= jhanna@home.com
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 6535633113b3..fb5152798093 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: arla
-# Version required: 0.31
# Date created: 09 Sep 1998
# Whom: Peter Hawkins <thepish@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= arla-0.31
+PORTNAME= arla
+PORTVERSION= 0.31
CATEGORIES= net
MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/
diff --git a/net/arpwatch-devel/Makefile b/net/arpwatch-devel/Makefile
index 23a550e3741e..9c7018f17512 100644
--- a/net/arpwatch-devel/Makefile
+++ b/net/arpwatch-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: arpwatch
-# Version required: 2.0.2a1
# Date created: March 24 1997
# Whom: Brian Somers <brian@Awfulhak.org>
#
# $FreeBSD$
#
-DISTNAME= arpwatch-2.1a4
+PORTNAME= arpwatch
+PORTVERSION= 2.1.a4
CATEGORIES= net
MASTER_SITES= http://www.Awfulhak.org/arpwatch/ \
ftp://ftp.ee.lbl.gov/ \
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 23a550e3741e..9c7018f17512 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: arpwatch
-# Version required: 2.0.2a1
# Date created: March 24 1997
# Whom: Brian Somers <brian@Awfulhak.org>
#
# $FreeBSD$
#
-DISTNAME= arpwatch-2.1a4
+PORTNAME= arpwatch
+PORTVERSION= 2.1.a4
CATEGORIES= net
MASTER_SITES= http://www.Awfulhak.org/arpwatch/ \
ftp://ftp.ee.lbl.gov/ \
diff --git a/net/ascend-radius/Makefile b/net/ascend-radius/Makefile
index 1f8c1358b93d..8ddde6730660 100644
--- a/net/ascend-radius/Makefile
+++ b/net/ascend-radius/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: ascend-radius
-# Version required: 980618 (v1.16)
# Date created: August 28th 96
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-#DISTNAME= radius-980618
-PKGNAME= ascend-radius-980618
+PORTNAME= ascend-radius
+PORTVERSION= 980618
CATEGORIES= net
MASTER_SITES= ftp://ftp.ascend.com/pub/Software-Releases/Radius/Current/ \
ftp://ftp.ascend.com/pub/Software-Releases/Radius/Current/doc/ \
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index 077b8cede0dd..2f47186196a1 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: everybuddy
-# Version required: 0.1.1
# Date created: 1 Mar 2000
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= everybuddy-0.1.1
+PORTNAME= everybuddy
+PORTVERSION= 0.1.1
CATEGORIES= net
MASTER_SITES= http://www.everybuddy.com/files/
diff --git a/net/bb/Makefile b/net/bb/Makefile
index 5b120b4a035a..bbf3b5b44a90 100644
--- a/net/bb/Makefile
+++ b/net/bb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bb
-# Version required: 1.04H
# Date created: So 17 Nov 1996 16:59:23 MET
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= bb-1.2a
+PORTNAME= bb
+PORTVERSION= 1.2a
CATEGORIES= net
MASTER_SITES= http://maclawran.ca/~sean/bb-dnld/ \
http://freefall.freebsd.org/~andreas/download/
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 136af25adf71..decc947babe1 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bind
-# Version required: 8.2.2-P5
# Date created: 18 July 1997
# Whom: jseger@scds.com
#
# $FreeBSD$
#
-DISTNAME= bind-8.2.2.p5
+PORTNAME= bind
+PORTVERSION= 8.2.2.p5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind/src/8.2.2-P5/
DISTFILES= bind-src.tar.gz bind-doc.tar.gz
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 136af25adf71..decc947babe1 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bind
-# Version required: 8.2.2-P5
# Date created: 18 July 1997
# Whom: jseger@scds.com
#
# $FreeBSD$
#
-DISTNAME= bind-8.2.2.p5
+PORTNAME= bind
+PORTVERSION= 8.2.2.p5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind/src/8.2.2-P5/
DISTFILES= bind-src.tar.gz bind-doc.tar.gz
diff --git a/net/bing/Makefile b/net/bing/Makefile
index 3b1ff44a94e9..d991d7a96de1 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bing
-# Version required: 1.0.4
# Date created: 28 December 1996
# Whom: jseger@scds.com
#
# $FreeBSD$
#
-DISTNAME= bing-1.0.4
+PORTNAME= bing
+PORTVERSION= 1.0.4
CATEGORIES= net
MASTER_SITES= ftp://ftp.lip6.fr/pub/networking/
diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index 029daace96c6..3abf2e098fae 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: binkd
-# Version required: 0.9.3
# Date created: 19 August 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= binkd093
-PKGNAME= binkd-0.9.3
+PORTNAME= binkd
+PORTVERSION= 0.9.3
CATEGORIES= net
MASTER_SITES= ftp://happy.kiev.ua/pub/fidosoft/mailer/binkd/
+DISTNAME= binkd093
MAINTAINER= dsh@vlink.ru
diff --git a/net/boclient/Makefile b/net/boclient/Makefile
index 3e6098d6bc8d..e8595fabea8b 100644
--- a/net/boclient/Makefile
+++ b/net/boclient/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: boclient
-# Version required: 1.21
# Date created: 12 August 1998
# Whom: darius@dons.net.au
#
# $FreeBSD$
#
-DISTNAME= bo121unix
-PKGNAME= boclient-1.21
+PORTNAME= boclient
+PORTVERSION= 1.2.1
CATEGORIES= net security
MASTER_SITES= http://www.ennui.net/~crioux/ \
http://orifice.rotten.com/cDc/ \
http://www.cultdeadcow.com/tools/
+DISTNAME= bo121unix
MAINTAINER= darius@dons.net.au
diff --git a/net/bounce/Makefile b/net/bounce/Makefile
index fbf2a47b0e1b..c1051d1d13f1 100644
--- a/net/bounce/Makefile
+++ b/net/bounce/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: bounce
-# Version required: 0.0
# Date created: Mon Dec 23, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= bounce
-PKGNAME= bounce-1.0
+PORTNAME= bounce
+PORTVERSION= 1.0
CATEGORIES= net security
MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/ \
http://people.FreeBSD.org/~obrien/Distfiles/
+DISTNAME= bounce
EXTRACT_SUFX= .c
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/bpft/Makefile b/net/bpft/Makefile
index daeabee4b92d..851e7c25ef5f 100644
--- a/net/bpft/Makefile
+++ b/net/bpft/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bpft
-# Version required: 2.0
# Date created: 17 March 1999
# Whom: oddbjorn@tricknology.org
#
# $FreeBSD$
#
-DISTNAME= bpft-2.0
+PORTNAME= bpft
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.nsk.su/pub/unix/
EXTRACT_SUFX= .tgz
diff --git a/net/brouted/Makefile b/net/brouted/Makefile
index 7d850bf65e9f..1a360f6070db 100644
--- a/net/brouted/Makefile
+++ b/net/brouted/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: brouted
-# Version required: 1.2b
# Date created: 5 May 1999
# Whom: swjeong
#
# $FreeBSD$
#
-DISTNAME= brouted-1.2b
+PORTNAME= brouted
+PORTVERSION= 1.2b
CATEGORIES= net
MASTER_SITES= ftp://www.kitel.co.kr/pub/
diff --git a/net/cap/Makefile b/net/cap/Makefile
index f4dbf2a869bb..5c61144dabde 100644
--- a/net/cap/Makefile
+++ b/net/cap/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: cap
-# Version required: 6.0PL198
# Date created: 09 Nov 1996
# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= cap60.pl100
-PKGNAME= cap-6.0.198
+PORTNAME= cap
+PORTVERSION= 6.0.198
CATEGORIES= net
MASTER_SITES= ftp://ftp-ns.rutgers.edu/pub/cap/ \
ftp://ftp-ns.rutgers.edu/pub/cap/cap.patches/ \
@@ -15,7 +14,7 @@ MASTER_SITES= ftp://ftp-ns.rutgers.edu/pub/cap/ \
ftp://munnari.OZ.AU/mac/cap.patches/ \
ftp://ftp.kuis.kyoto-u.ac.jp/net/cap/ \
ftp://ftp.kuis.kyoto-u.ac.jp/net/cap/cap60.patches/
-DISTFILES= ${DISTNAME}.tar.Z patches.101-126.tar.Z patches.127-143.tar.Z \
+DISTFILES= cap60.pl100.tar.Z patches.101-126.tar.Z patches.127-143.tar.Z \
patches.144-154.tar.Z patches.155-162.tar.Z \
patches.163-182.tar.Z patches.183-192.tar.Z
diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index 91de95d7894e..bc8bd79e94af 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: centericq
-# Version required: 2.0.0
# Date created: 25 December 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= center-2.0.0
+PORTNAME= centericq
+PORTVERSION= 2.0.0
CATEGORIES= net
MASTER_SITES= http://konst.org.ua/download/
+DISTNAME= center-${PORTVERSION}
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/net/choparp/Makefile b/net/choparp/Makefile
index 77021c5ed3ff..ba9e4d970977 100644
--- a/net/choparp/Makefile
+++ b/net/choparp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: choparp
-# Version required: 971007
# Date created: 7 October 1997
# Whom: itojun@itojun.org
#
# $FreeBSD$
#
-DISTNAME= choparp-971007
+PORTNAME= choparp
+PORTVERSION= 971007
CATEGORIES= net
MASTER_SITES= http://delegate.uec.ac.jp:8081/club/mma/~tree/soft/choparp/
diff --git a/net/ciscoconf/Makefile b/net/ciscoconf/Makefile
index 0bf451653b92..3e1996bd3b6a 100644
--- a/net/ciscoconf/Makefile
+++ b/net/ciscoconf/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ciscoconf
-# Version required: 1.0beta1
# Date created: 11 September 1998
# Whom: jabley@clear.co.nz
#
# $FreeBSD$
#
-DISTNAME= ciscoconf-1.0beta1
-PKGNAME= ciscoconf-1.0
+PORTNAME= ciscoconf
+PORTVERSION= 1.0.b1
CATEGORIES= net
MASTER_SITES= ftp://ftp.patho.gen.nz/pub/users/jabley/ \
http://people.FreeBSD.org/~billf/
+DISTNAME= ciscoconf-1.0beta1
MAINTAINER= jabley@clear.co.nz
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 4ede48fd89b5..0672f4a708b8 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Citrix(R) ICA(R) Client
-# Version required: 3.0.15
# Date created: 20 Sep 1998
# Whom: msmith
#
# $FreeBSD$
#
-DISTNAME= linux
-PKGNAME= citrix_ica-3.0.15
+PORTNAME= citrix_ica
+PORTVERSION= 3.0.15
CATEGORIES= comms linux
-MASTER_SITES=
+MASTER_SITES=
+DISTNAME= linux
EXTRACT_SUFX= .tar.Z
MAINTAINER= msmith@FreeBSD.org
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index 4ede48fd89b5..0672f4a708b8 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Citrix(R) ICA(R) Client
-# Version required: 3.0.15
# Date created: 20 Sep 1998
# Whom: msmith
#
# $FreeBSD$
#
-DISTNAME= linux
-PKGNAME= citrix_ica-3.0.15
+PORTNAME= citrix_ica
+PORTVERSION= 3.0.15
CATEGORIES= comms linux
-MASTER_SITES=
+MASTER_SITES=
+DISTNAME= linux
EXTRACT_SUFX= .tar.Z
MAINTAINER= msmith@FreeBSD.org
diff --git a/net/clog/Makefile b/net/clog/Makefile
index f7725ca7c901..1153e03e57d9 100644
--- a/net/clog/Makefile
+++ b/net/clog/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: clog
-# Version required: 0.0
# Date created: Tue Nov 04, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= clog-1.6
+PORTNAME= clog
+PORTVERSION= 1.6
CATEGORIES= net security
MASTER_SITES= ftp://ftp.saturn.net/pub/users/brian/clog/ \
ftp://ftp.cso.uiuc.edu/pub/security/coast/unix/clog/ \
diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile
index 9ac3cc3636f7..82ac165c07fd 100644
--- a/net/clusterit/Makefile
+++ b/net/clusterit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: clusterit
-# Version required: 1.3
# Date created: 4 February 1999
# Whom: Dima Sivachenko
#
# $FreeBSD$
#
-DISTNAME= clusterit-1.3
+PORTNAME= clusterit
+PORTVERSION= 1.3
CATEGORIES= net devel
MASTER_SITES= http://www.inficad.com/~garbled/ \
ftp://ftp.chg.ru/pub/prog/parallel/tools/clusterit/
diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index b0854b14e425..a0864022890c 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: cnet
-# Version required: 1.5p2
# Date created: Feb 8th, 1988
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= cnet-1.5-2
-PKGNAME= cnet-1.5p2
+PORTNAME= cnet
+PORTVERSION= 1.5.p2
CATEGORIES= net tk82
MASTER_SITES= http://www.cs.uwa.edu.au/cnet/
+DISTNAME= cnet-1.5-2
MAINTAINER= ports@FreeBSD.org
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 636228a24f5b..2ddcdb49f0e1 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: coda-client
-# Version required: 5.3.2
# Date created: Mon Oct 18 12:01:27 EDT 1999
# Whom: ???
# $FreeBSD$
#
-DISTNAME= coda-5.3.2
-PKGNAME= coda-client-5.3.2
+PORTNAME= coda-client
+PORTVERSION= 5.3.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
+DISTNAME= coda-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= rvb@cs.cmu.edu
diff --git a/net/coda5_doc/Makefile b/net/coda5_doc/Makefile
index c4995c3b35a1..007e5caf0f37 100644
--- a/net/coda5_doc/Makefile
+++ b/net/coda5_doc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: coda
-# Version required: 5.2.0
# Date created: 11 May 1999
# Whom: Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= coda-doc-5.2.0-1
-PKGNAME= coda-doc-5.2.0.1
+PORTNAME= coda-doc
+PORTVERSION= 5.2.0.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/doc/
+DISTNAME= coda-doc-5.2.0-1
EXTRACT_SUFX= .tgz
MAINTAINER= ijliao@csie.nctu.edu.tw
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 4e9c62ad5571..245ed6e477d3 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: coda-server
-# Version required: 5.3.2
# Date created: Mon Oct 18 12:01:28 EDT 1999
# Whom: ???#
# $FreeBSD$
#
-DISTNAME= coda-5.3.2
-PKGNAME= coda-server-5.3.2
+PORTNAME= coda-server
+PORTVERSION= 5.3.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
+DISTNAME= coda-5.3.2
EXTRACT_SUFX= .tgz
MAINTAINER= rvb@cs.cmu.edu
diff --git a/net/coda_client/Makefile b/net/coda_client/Makefile
index 76802cf416e2..0cdd5f755857 100644
--- a/net/coda_client/Makefile
+++ b/net/coda_client/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: coda
-# Version required: 4.6.5
# Date created: 19 June 1998
# Whom: hmpierce <hmpierce@cs.cmu.edu>
#
# $FreeBSD$
#
-DISTNAME= coda-4.6.6
-PKGNAME= coda-client-4.6.6.1
+PORTNAME= coda-client
+PORTVERSION= 4.6.6.1
CATEGORIES= net
#MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
MASTER_SITES= ${MASTER_SITE_LOCAL}
+DISTNAME= coda-4.6.6
EXTRACT_SUFX= .tgz
MAINTAINER= rvb@cs.cmu.edu
diff --git a/net/coda_doc/Makefile b/net/coda_doc/Makefile
index a307adfd9d4d..3a90f2cf4a9f 100644
--- a/net/coda_doc/Makefile
+++ b/net/coda_doc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: coda
-# Version required: 4.6.5
# Date created: 19 June 1998
# Whom: Robert V. Baron <rvb@cs.cmu.edu>
#
# $FreeBSD$
#
-DISTNAME= coda-doc-4.6.5-3
-PKGNAME= coda-doc-4.6.5.3
+PORTNAME=u coda-doc
+PORTVERSION= 4.6.5.3
CATEGORIES= net
MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/doc/
+DISTNAME= coda-doc-4.6.5-3
EXTRACT_SUFX= .tgz
MAINTAINER= rvb@cs.cmu.edu
diff --git a/net/coda_intro/Makefile b/net/coda_intro/Makefile
index 4c9f3fa4fc91..1546f9e8fdd4 100644
--- a/net/coda_intro/Makefile
+++ b/net/coda_intro/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: coda
-# Version required: 4.6.5
# Date created: 19 June 1998
# Whom: Robert V. Baron <rvb@cs.cmu.edu>
#
# $FreeBSD$
#
-DISTNAME= coda-intro-4.6.6
-PKGNAME= coda-intro-4.6.6.1
+PORTNAME= coda-intro
+PORTVERSION= 4.6.6.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/doc/
+DISTNAME= coda-intro-4.6.6
EXTRACT_SUFX= .tgz
MAINTAINER= rvb@cs.cmu.edu
diff --git a/net/coda_server/Makefile b/net/coda_server/Makefile
index 2bbc0df5fa09..1a2e666bbc51 100644
--- a/net/coda_server/Makefile
+++ b/net/coda_server/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: coda
-# Version required: 4.6.5
# Date created: 19 June 1998
# Whom: hmpierce <hmpierce@cs.cmu.edu>
#
# $FreeBSD$
#
-DISTNAME= coda-4.6.6
-PKGNAME= coda-server-4.6.6.1
+PORTNAME= coda-server
+PORTVERSION= 4.6.6.1
CATEGORIES= net
#MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
MASTER_SITES= ${MASTER_SITE_LOCAL}
+DISTNAME= coda-4.6.6
EXTRACT_SUFX= .tgz
MAINTAINER= rvb@cs.cmu.edu
diff --git a/net/cricket/Makefile b/net/cricket/Makefile
index c6f6f94ee422..41f20be811d3 100644
--- a/net/cricket/Makefile
+++ b/net/cricket/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Cricket
-# Version required: 0.72
# Date created: 20 November 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= cricket-0.72
+PORTNAME= cricket
+PORTVERSION= 0.72
CATEGORIES= net
MASTER_SITES= http://www.munitions.com/~jra/cricket/dists/
diff --git a/net/cvsup-bin/Makefile b/net/cvsup-bin/Makefile
index edb6a7628145..6e0c6c79036b 100644
--- a/net/cvsup-bin/Makefile
+++ b/net/cvsup-bin/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cvsup-bin
-# Version required: 16.1
# Date created: 12 November 1997
# Whom: Sheldon Hearn <axl@iafrica.com>
#
# $FreeBSD$
#
-DISTNAME= cvsup-bin-16.1
+PORTNAME= cvsup-bin
+PORTVERSION= 16.1
CATEGORIES= devel net
MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/binaries/
diff --git a/net/cvsup-mirror/Makefile b/net/cvsup-mirror/Makefile
index e897c121ae79..9871d8b7c8ed 100644
--- a/net/cvsup-mirror/Makefile
+++ b/net/cvsup-mirror/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cvsup-mirror
-# Version required: none
# Date created: 01 February 1997
# Whom: jdp
#
# $FreeBSD$
#
-DISTNAME= cvsup-mirror-1.1
+PORTNAME= cvsup-mirror
+PORTVERSION= 1.1
CATEGORIES= net
DISTFILES=
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index aabe22ee6720..16dad6f63c35 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cvsup
-# Version required: 16.1
# Date created: 7 August 1996
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= cvsup-16.1
+PORTNAME= cvsup
+PORTVERSION= 16.1
CATEGORIES= devel net
MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/sources/ \
ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/sources/
diff --git a/net/cvsupd-bin/Makefile b/net/cvsupd-bin/Makefile
index 5d16141c7952..626084e1a1aa 100644
--- a/net/cvsupd-bin/Makefile
+++ b/net/cvsupd-bin/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cvsupd-bin
-# Version required: 16.1
# Date created: 17 August 1998
# Whom: Sheldon Hearn <axl@iafrica.com>
#
# $FreeBSD$
#
-DISTNAME= cvsupd-bin-16.1
+PORTNAME= cvsupd-bin
+PORTVERSION= 16.1
CATEGORIES= devel net
MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/binaries/
diff --git a/net/dante/Makefile b/net/dante/Makefile
index 6eb0e87e6326..622e9a17dbfe 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: Dante
-# Version required: 1.1.1
# Date created: 20 October 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= dante-1.1.1
+PORTNAME= dante
+PORTVERSION= 1.1.1
CATEGORIES= security net
MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \
http://www.freenix.no/~anders/ \
diff --git a/net/datapipe/Makefile b/net/datapipe/Makefile
index df43eda765b7..9901d33c859d 100644
--- a/net/datapipe/Makefile
+++ b/net/datapipe/Makefile
@@ -1,18 +1,16 @@
# New ports collection makefile for: datapipe
-# Version required: 1.0
# Date created: 04 January 2000
# Whom: Daniel Baker <dbaker@FreeBSD.org> <dbaker@cuckoo.com>
#
# $FreeBSD$
#
-DISTNAME= datapipe-1.0
+PORTNAME= datapipe
+PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.distributed.net/pub/dcti/unsupported/ \
http://http.distributed.net/pub/dcti/unsupported/
-DISTFILE= datapipe-1.0.tar.gz
-
MAINTAINER= dbaker@FreeBSD.org
do-build:
diff --git a/net/ddup/Makefile b/net/ddup/Makefile
index 684c8b4b74e3..c7f82db72767 100644
--- a/net/ddup/Makefile
+++ b/net/ddup/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ddup
-# Version required: 2.0.4
# Date created: 30 September 1999
# Whom: cjm2
#
# $FreeBSD$
#
-DISTNAME= ddup-2.2Dm
-PKGNAME= ddup-2.2
+PORTNAME= ddup
+PORTVERSION= 2.2
CATEGORIES= net
MASTER_SITES= ftp://ddup.sourceforge.net/pub/ddup/
+DISTNAME= ddup-2.2Dm
MAINTAINER= cjm2@altavista.net
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index ee996ccade54..b11aa2e669cc 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: DeleGate
-# Version required: 5.9.13
# Date created: 26 Jan 1997
# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= delegate5.9.13
-PKGNAME= delegate-5.9.13
+PORTNAME= delegate
+PORTVERSION= 5.9.13
CATEGORIES= net www japanese
MASTER_SITES= ftp://etlport.etl.go.jp/pub/DeleGate/
+DISTNAME= delegate5.9.13
MAINTAINER= max@FreeBSD.org
NO_PACKAGE= "Insecure program."
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index 7542f025ffbb..d79f6e964387 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: dgd-lpmud
-# Version required: 2.4.5
# Date created: 10 November 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= dgd-lpmud
-PKGNAME= dgd-lpmud-2.4.5
+PORTNAME= dgd-lpmud
+PORTVERSION= 2.4.5
CATEGORIES= net devel games
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/lpc/ \
ftp://ftp.veda.is/pub/mud/dgd/ \
diff --git a/net/dgd-net/Makefile b/net/dgd-net/Makefile
index 6782606f7f5b..6840fcaef750 100644
--- a/net/dgd-net/Makefile
+++ b/net/dgd-net/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: dgd-net
-# Version required: 1.1
# Date created: 17 June 1996
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= dgd-net-1.1p6
-DISTFILES= dgd-1.1.tar.gz
+PORTNAME= dgd-net
+PORTVERSION= 1.1.p6
CATEGORIES= net lang
MASTER_SITES= ftp://ftp.imaginary.com/pub/LPC/servers/DGD/ \
ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/ \
ftp://ftp.veda.is/pub/mud/dgd/ \
ftp://ftp.dreamlabs.com/pub/mud/dgd/
+DISTFILES= dgd-1.1.tar.gz
PATCH_SITES= ftp://ftp.imaginary.com/pub/LPC/servers/DGD/patches/ \
ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/patches/ \
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index faa4c018b0fe..9ff95f9d8fb3 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: dgd
-# Version required: 1.1
# Date created: 23 August 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= dgd-1.1
-PKGNAME= dgd-1.1p6
+PORTNAME= dgd
+PORTVERSION= 1.1.p6
CATEGORIES= net lang
MASTER_SITES= ftp://ftp.imaginary.com/pub/LPC/servers/DGD/ \
ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/ \
ftp://ftp.veda.is/pub/mud/dgd/ \
ftp://ftp.dreamlabs.com/pub/mud/dgd/
+DISTNAME= dgd-1.1
PATCH_SITES= ftp://ftp.imaginary.com/pub/LPC/servers/DGD/patches/ \
ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/patches/ \
diff --git a/net/dhcpconf/Makefile b/net/dhcpconf/Makefile
index 39b430bdd76e..88a5525d6510 100644
--- a/net/dhcpconf/Makefile
+++ b/net/dhcpconf/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: dhcp-conf
-# Version required: 0.7.0
# Date created: 20 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
+PORTNAME= dhcpconf
+PORTVERSION= 0.7.0
DISTNAME= dhcp-conf
-PKGNAME= dhcpconf-${VERSION}
CATEGORIES= net sysutils
MASTER_SITES= http://members.xoom.com/vschade/dhcp-conf/
+DISTNAME= dhcp-conf
EXTRACT_SUFX= .tgz
MAINTAINER= will@FreeBSD.org
@@ -18,8 +19,7 @@ LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
newt.0:${PORTSDIR}/devel/newt
ALL_TARGET= ${DISTNAME}
-VERSION= 0.7.0
-WRKSRC= ${WRKDIR}/${DISTNAME}_${VERSION}
+WRKSRC= ${WRKDIR}/${DISTNAME}_${PORTVERSION}
MAKE_ENV+= PCFLAGS="${CFLAGS}"
do-install:
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index f2ed00222c1d..b3cac1562db8 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dhid
-# Version required: 3.1
# Date created: Sat Aug 21 06:13:59 EDT 1999
# Whom: Oryx Gazella <oryx@ungulate.net>
#
# $FreeBSD$
#
-DISTNAME= dhid-3.1
+PORTNAME= dhid
+PORTVERSION= 3.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.dhis.org/pub/dhis/
diff --git a/net/dlint/Makefile b/net/dlint/Makefile
index 5fa28cb88c57..1054528bc062 100644
--- a/net/dlint/Makefile
+++ b/net/dlint/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: dlint
-# Version required: 0.0
# Date created: Wed Dec 23, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= dlint1.3.3
-PKGNAME= dlint-1.3.3
+PORTNAME= dlint
+PORTVERSION= 1.3.3
CATEGORIES= net
MASTER_SITES= http://www.domtools.com/pub/
+DISTFILES= dlint-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/dnsutl/Makefile b/net/dnsutl/Makefile
index 71c2c57171fd..fd88845dcb6e 100644
--- a/net/dnsutl/Makefile
+++ b/net/dnsutl/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: dnsutl
-# Version required: 1.5
# Date created: Nov 05, 1998
# Whom: Karl Dietz (Karl.Dietz@frankfurt.netsurf.de)
#
# $FreeBSD$
#
-DISTNAME= dnsutl-1.5
+PORTNAME= dnsutl
+PORTVERSION= 1.5
CATEGORIES= net
MASTER_SITES= http://www.canb.auug.org.au/~millerp/dnsutl/ \
http://www.tip.net.au/~millerp/dnsutl/ \
diff --git a/net/dnswalk/Makefile b/net/dnswalk/Makefile
index 03d60abbd235..97e01c49fd46 100644
--- a/net/dnswalk/Makefile
+++ b/net/dnswalk/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: dnswalk
-# Version required: 2.0.2
# Date created: 17 January 1998
# Whom: Matthew Hunt <mph@pobox.com>
#
# $FreeBSD$
+#
-DISTNAME= dnswalk-2.0.2
+PORTNAME= dnswalk
+PORTVERSION= 2.0.2
CATEGORIES= net
MASTER_SITES= http://www.visi.com/~barr/dnswalk/
diff --git a/net/doc/Makefile b/net/doc/Makefile
index d94a90584d8d..fe4391879372 100644
--- a/net/doc/Makefile
+++ b/net/doc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: doc
-# Version required: 2.1.4
# Date created: 28 November 1999
# Whom: MIHIRA Yoshiro <sanpei@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= doc-2.1.4
+PORTNAME= doc
+PORTVERSION= 2.1.4
CATEGORIES= net
MASTER_SITES= ftp://ftp.his.com/pub/brad/dns/
diff --git a/net/domtools/Makefile b/net/domtools/Makefile
index cd919a2005ca..13e8e64b9fc8 100644
--- a/net/domtools/Makefile
+++ b/net/domtools/Makefile
@@ -1,23 +1,22 @@
# New ports collection makefile for: domtools
-# Version required: 1.4.0
# Date created: 12 Jun 1999
# Whom: alexp
#
# $FreeBSD$
#
-DISTNAME= domtools${VERSION}
-PKGNAME= domtools-${VERSION}
+PORTNAME= domtools
+PORTVERSION= 1.4.0
CATEGORIES= net
MASTER_SITES= http://www.domtools.com/pub/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= veers@disturbed.net
USE_PERL5= YES
NO_BUILD= YES
-WRKSRC= ${WRKDIR}/domtools${VERSION}/
-VERSION= 1.4.0
+WRKSRC= ${WRKDIR}/domtools${PORTVERSION}/
# XXX - patches/patch-aa modifies Makefile
# and so does the post-patch target
diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index 63af4e3ce848..c171d565add5 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: echoping
-# Version required: 2.2.0
# Date created: 13 April 1997
# Whom: peter
#
# $FreeBSD$
#
-DISTNAME= echoping-2.2.0
+PORTNAME= echoping
+PORTVERSION= 2.2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.internatif.org/pub/unix/echoping/
diff --git a/net/etherboot/Makefile b/net/etherboot/Makefile
index 55db0423e4ef..62823887c621 100644
--- a/net/etherboot/Makefile
+++ b/net/etherboot/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: etherboot
-# Version required: 4.2.11
# Date created: 16 April 1999
# Whom: Doug Ambrisko <ambrisko@whistle.com>
#
# $FreeBSD$
#
-DISTNAME= etherboot-4.5.5
-PKGNAME= etherboot-4.5
+PORTNAME= etherboot
+PORTVERSION= 4.5.5
CATEGORIES= net
MASTER_SITES= http://www.slug.org.au/etherboot/ \
http://www.us.kernel.org/pub/linux/devel/gcc/ \
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 32871e7b903e..9a3a8d069f3f 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ethereal
-# Version required: 0.8.6
# Date created: 10 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= ethereal-0.8.6
+PORTNAME= ethereal
+PORTVERSION= 0.8.6
CATEGORIES= net ipv6
MASTER_SITES= http://alpha1.linuxberg.com/files/x11/network/ \
http://www.linuxberg.com/files/x11/network/ \
diff --git a/net/everybuddy/Makefile b/net/everybuddy/Makefile
index 077b8cede0dd..2f47186196a1 100644
--- a/net/everybuddy/Makefile
+++ b/net/everybuddy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: everybuddy
-# Version required: 0.1.1
# Date created: 1 Mar 2000
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= everybuddy-0.1.1
+PORTNAME= everybuddy
+PORTVERSION= 0.1.1
CATEGORIES= net
MASTER_SITES= http://www.everybuddy.com/files/
diff --git a/net/fping/Makefile b/net/fping/Makefile
index 0bf2dfd19ba6..00458c449726 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,19 +1,20 @@
# ex:ts=8
# Ports collection makefile for: fping
-# Version required: 0.0
# Date created: Tue Mar 25, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
+PORTNAME= fping
+PORTVERSION= 1.20
DISTNAME= part01
-PKGNAME= fping-1.20
CATEGORIES= net
MASTER_SITES= ftp://ftp.uu.net/usenet/comp.sources.unix/volume26/fping/ \
ftp://ftp.digital.com/pub/usenet/comp.sources.unix/volume26/fping/ \
ftp://ftp.wustl.edu/usenet/comp.sources.unix/volume26/fping/ \
ftp://ftp.isnet.is/pub/Usenet/Usenet.src/comp.sources.unix/v26/fping/
+DISTNAME= part01
EXTRACT_SUFX= .Z
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 7c770eb0d59e..5085ac6b6265 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: FreeWAIS-sf
-# Version required: 2.2.13
# Date created: 19 November 1996
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= freeWAIS-sf-2.2.13
-PKGNAME= freewais-sf-2.2.13
+PORTNAME= freewais-sf
+PORTVERSION= 2.2.13
CATEGORIES= net databases
MASTER_SITES= ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/freeWAIS-sf/
+DISTNAME= freeWAIS-sf-2.2.13
MAINTAINER= ports@FreeBSD.org
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index cc30b6b87371..b6915b002d3f 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: fspclient
-# Version required: 0.0-h+
# Date created: 7 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= fspclient
-PKGNAME= fspclient-0.0.h
+PORTNAME= fspclient
+PORTVERSION= 0.0.h
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/network/file-transfer
+DISTNAME= fspclient
MAINTAINER= ports@FreeBSD.org
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index 527c39d58a4c..3b49a1e46af4 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gaim
-# Version required: 0.9.13
# Date created: 26 Mar 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gaim-0.9.13
+PORTNAME= gaim
+PORTVERSION= 0.9.13
CATEGORIES= net
MASTER_SITES= ftp://ftp.marko.net/pub/gaim/
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 527c39d58a4c..3b49a1e46af4 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gaim
-# Version required: 0.9.13
# Date created: 26 Mar 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gaim-0.9.13
+PORTNAME= gaim
+PORTVERSION= 0.9.13
CATEGORIES= net
MASTER_SITES= ftp://ftp.marko.net/pub/gaim/
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 587e48a8d1d1..45cbffc0a4b5 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: gated
-# Version required: 3.5.11
# Date created: 29 October 1994
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= gated-3-5-11
-PKGNAME= gated-3.5.11
+PORTNAME= gated
+PORTVERSION= 3.5.11
CATEGORIES= net
MASTER_SITES= ftp://ftp.gated.merit.edu/net-research/gated/
+DISTNAME= gated-3-5-11
MAINTAINER= ports@FreeBSD.org
diff --git a/net/generic-nqs/Makefile b/net/generic-nqs/Makefile
index 0c9a79f5c341..6d89954867b5 100644
--- a/net/generic-nqs/Makefile
+++ b/net/generic-nqs/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: nqs (Generic NQS)
-# Version required: 3.50.6
# Date created: 01 May 1998
# Whom: tonym
#
@@ -8,13 +7,14 @@
# View this file with tabstop=4
#
-DISTNAME= Generic-NQS-3.50.6
+PORTNAME= Generic-NQS
+PORTVERSION= 3.50.6
CATEGORIES= net
MASTER_SITES= http://ftp.gnqs.org/pub/gnqs/source/by-version-number/v3.50/
MAINTAINER= tony.maher@ebioinformatics.com
-FORBIDDEN= "Local root compromise"
+FORBIDDEN= "Local root compromise"
Y2K= http://www.gnqs.org/Year2000.htm
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile
index dd68d281803f..a2d8ebf8868b 100644
--- a/net/ggsd/Makefile
+++ b/net/ggsd/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ggsd
-# Version required: 0.1
# Date created: 14 February 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= ggsd
-PKGNAME= ggsd-0.1
+PORTNAME= ggsd
+PORTVERSION= 0.1
CATEGORIES= net
MASTER_SITES= http://people.FreeBSD.org/~billf/distfiles/ \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
+DISTNAME= ggsd
EXTRACT_SUFX= .tar
MAINTAINER= dima@chg.ru
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index 2fe0b9425991..f273a0935cab 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gicq
-# Version required: 0.33
# Date Created: 31 Oct 1998
# Whom: Seiichirou Hiraoka
#
# $FreeBSD$
#
-DISTNAME= gicq-0.33
+PORTNAME= gicq
+PORTVERSION= 0.33
CATEGORIES= net
MASTER_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
ftp://ftp.korsoft.com/pub/gicq/
diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
index e5dfb4067864..af8fcc79ba7b 100644
--- a/net/gnet-glib2/Makefile
+++ b/net/gnet-glib2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnet
-# Version required: 1.0.1
# Date created: 16 February 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnet-1.0.1
+PORTNAME= gnet
+PORTVERSION= 1.0.1
CATEGORIES= net
MASTER_SITES= http://www.eecs.umich.edu/~dhelder/misc/gnet/src/
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index e5dfb4067864..af8fcc79ba7b 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnet
-# Version required: 1.0.1
# Date created: 16 February 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnet-1.0.1
+PORTNAME= gnet
+PORTVERSION= 1.0.1
CATEGORIES= net
MASTER_SITES= http://www.eecs.umich.edu/~dhelder/misc/gnet/src/
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index e5dfb4067864..af8fcc79ba7b 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnet
-# Version required: 1.0.1
# Date created: 16 February 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnet-1.0.1
+PORTNAME= gnet
+PORTVERSION= 1.0.1
CATEGORIES= net
MASTER_SITES= http://www.eecs.umich.edu/~dhelder/misc/gnet/src/
diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile
index e9519bba437f..d38be017e6dd 100644
--- a/net/gnomba/Makefile
+++ b/net/gnomba/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnomba
-# Version required: 0.5.1
# Date created: 10 January 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= gnomba-0.5.1
+PORTNAME= gnomba
+PORTVERSION= 0.5.1
CATEGORIES= net gnome
MASTER_SITES= http://gnomba.darkcorner.net/tars/ \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
diff --git a/net/gnome-vnc/Makefile b/net/gnome-vnc/Makefile
index 2863c44fd9a4..ff1932de5df0 100644
--- a/net/gnome-vnc/Makefile
+++ b/net/gnome-vnc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnome-vnc
-# Version required: 0.1
# Date created: Sun Jul 18 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= gnome-vnc-0.1
+PORTNAME= gnome-vnc
+PORTVERSION= 0.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.daa.com.au/pub/james/gnome/
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index 68b9e4934e95..b0dd8c209478 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: GnomeICU
-# Version required: 0.90b
# Date created: 03/16/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnomeicu-0.90b
+PORTNAME= gnomeicu
+PORTVERSION= 0.90.b
CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index 68b9e4934e95..b0dd8c209478 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: GnomeICU
-# Version required: 0.90b
# Date created: 03/16/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnomeicu-0.90b
+PORTNAME= gnomeicu
+PORTVERSION= 0.90.b
CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index 68b9e4934e95..b0dd8c209478 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: GnomeICU
-# Version required: 0.90b
# Date created: 03/16/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnomeicu-0.90b
+PORTNAME= gnomeicu
+PORTVERSION= 0.90.b
CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile
index df6b499ce1d3..b3652eab8d47 100644
--- a/net/gnosamba/Makefile
+++ b/net/gnosamba/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtksamba
-# Version required: 0.3.1
# Date created: 4 November 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= gtksamba-0.3.2pl1
+PORTNAME= gtksamba
+PORTVERSION= 0.3.2.p1
CATEGORIES= net
MASTER_SITES= http://www.open-systems.com/gtksamba/
diff --git a/net/gnu-finger/Makefile b/net/gnu-finger/Makefile
index ab96821c9f1c..eb041d248db0 100644
--- a/net/gnu-finger/Makefile
+++ b/net/gnu-finger/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: GNU finger
-# Version required: 1.37
# Date created: 20 June 1996
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= finger-1.37
-PKGNAME= gnu-finger-1.37
+PORTNAME= gnu-finger
+PORTVERSION= 1.37
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= finger
+DISTNAME= finger-1.37
MAINTAINER= sanpei@yy.cs.keio.ac.jp
diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index 88d555042702..75425f87c08c 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: gopher
-# Version required: 2.3
# Date created: 11 Dec 1994
# Whom: ats (original)
#
# $FreeBSD$
#
-DISTNAME= gopher2_3
-PKGNAME= gopher-2.3
+PORTNAME= gopher
+PORTVERSION= 2.3
CATEGORIES= net
MASTER_SITES= ftp://boombox.micro.umn.edu/pub/gopher/Unix/
+DISTNAME= gopher2.3
MAINTAINER= ports@FreeBSD.org
diff --git a/net/gtic/Makefile b/net/gtic/Makefile
index 32d2f7f6124f..9ef371f1b8ca 100644
--- a/net/gtic/Makefile
+++ b/net/gtic/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtic
-# Version required: 1.3b
# Date created: 22 August 1999
# Whom: Denis Shaposhnikov <dsh@vlink.ru>
#
# $FreeBSD$
#
-DISTNAME= gtic-1.3b
+PORTNAME= gtic
+PORTVERSION= 1.3.b
CATEGORIES= net
MASTER_SITES= ftp://ftp.cracksoft.kiev.ua/pub/linux/gtic/ \
${MASTER_SITE_SUNSITE}
diff --git a/net/gtkyahoo/Makefile b/net/gtkyahoo/Makefile
index 9b7f63b36973..af38ea9e1a62 100644
--- a/net/gtkyahoo/Makefile
+++ b/net/gtkyahoo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkyahoo
-# Version required: 0.16
# Date created: 18 August 1999
# Whom: dannyman@dannyland.org
#
# $FreeBSD$
#
-DISTNAME= gtkyahoo-0.16
+PORTNAME= gtkyahoo
+PORTVERSION= 0.16
CATEGORIES= net
MASTER_SITES= http://www.unixtools.org/gtkyahoo/dist/tars/
diff --git a/net/h2n/Makefile b/net/h2n/Makefile
index 2e5e4f4164a7..de8bb03f9e8e 100644
--- a/net/h2n/Makefile
+++ b/net/h2n/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: h2n
-# Version required: 1.29
# Date created: 27 Nov 1997
# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= dns
-PKGNAME= h2n-1.29
+PORTNAME= h2n
+PORTVERSION= 1.29
CATEGORIES= net
MASTER_SITES= ftp://ftp.iij.ad.jp/pub/published/oreilly/nutshell/dnsbind/ \
ftp://ftp.uu.net/published/oreilly/nutshell/dnsbind/
+DISTNAME= dns
EXTRACT_SUFX= .tar.Z
MAINTAINER= sada@FreeBSD.org
diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile
index e5432e412be9..66662a58e717 100644
--- a/net/hesiod/Makefile
+++ b/net/hesiod/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: Hesiod
-# Version required: 3.0.2
# Date created: 6/11/1998
# Whom: n@nectar.com
#
# $FreeBSD$
#
-DISTNAME= hesiod-3.0.2
+PORTNAME= hesiod
+PORTVERSION= 3.0.2
CATEGORIES= net
MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/ \
http://www.nectar.cc/distfiles/
diff --git a/net/icb/Makefile b/net/icb/Makefile
index e506dbbff5c0..4ac82816c650 100644
--- a/net/icb/Makefile
+++ b/net/icb/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: icb
-# Version required: 0.0
# Date created: Tue Feb 03, 1998
# Whom: David O'Brien (obrien@NUXI.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= icb-5.0.9
+PORTNAME= icb
+PORTVERSION= 5.0.9
CATEGORIES= net
MASTER_SITES= ftp://ftp.swcp.com/pub/icb/clients/unix/ \
ftp://ftp.empire.net/pub/icb/clients/ \
diff --git a/net/icmpinfo/Makefile b/net/icmpinfo/Makefile
index 9dbf0793d1f9..ca7024c1875c 100644
--- a/net/icmpinfo/Makefile
+++ b/net/icmpinfo/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: icmpinfo
-# Version required: 0.0
# Date created: Mon June 23, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= icmpinfo-1.11
+PORTNAME= icmpinfo
+PORTVERSION= 1.11
CATEGORIES= net sysutils
MASTER_SITES= ftp://hplyot.obspm.fr/net/ \
${MASTER_SITE_SUNSITE}
diff --git a/net/icmpquery/Makefile b/net/icmpquery/Makefile
index af8b3fa73f5f..00c195d2cff7 100644
--- a/net/icmpquery/Makefile
+++ b/net/icmpquery/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: icmpquery
-# Version required: 1.0.3
# Date created: Jan 7 1999
# Whom: dom@myrddin.demon.co.uk
#
# $FreeBSD$
#
-DISTNAME= icmpquery
-PKGNAME= icmpquery-1.0.3
+PORTNAME= icmpquery
+PORTVERSION= 1.0.3
CATEGORIES= net
MASTER_SITES= http://www.angio.net/security/
+DISTNAME= icmpquery
EXTRACT_SUFX= .c
MAINTAINER= dom@myrddin.demon.co.uk
diff --git a/net/icqlib/Makefile b/net/icqlib/Makefile
index 6d5e43ea264d..41ace90baf34 100644
--- a/net/icqlib/Makefile
+++ b/net/icqlib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: icqlib
-# Version required: 0.1.3
# Date created: 16 March 1999
# Whom: Pavel Andreev
#
# $FreeBSD$
#
-DISTNAME= icqlib-0.1.3
+PORTNAME= icqlib
+PORTVERSION= 0.1.3
CATEGORIES= net
MASTER_SITES= http://download.sourceforge.net/icqlib/
diff --git a/net/icqlib0/Makefile b/net/icqlib0/Makefile
index 6d5e43ea264d..41ace90baf34 100644
--- a/net/icqlib0/Makefile
+++ b/net/icqlib0/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: icqlib
-# Version required: 0.1.3
# Date created: 16 March 1999
# Whom: Pavel Andreev
#
# $FreeBSD$
#
-DISTNAME= icqlib-0.1.3
+PORTNAME= icqlib
+PORTVERSION= 0.1.3
CATEGORIES= net
MASTER_SITES= http://download.sourceforge.net/icqlib/
diff --git a/net/icqnix/Makefile b/net/icqnix/Makefile
index ad31d04db505..af06c58d4a28 100644
--- a/net/icqnix/Makefile
+++ b/net/icqnix/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: icqnix
-# Version required: b1
# Date created: 27 Aug 1999
# Whom: Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= icqnix-beta1
-PKGNAME= icqnix-b1
+PORTNAME= icqnix
+PORTVERSION= b1
CATEGORIES= net
MASTER_SITES= http://icqnix.linuxbox.com/
+DISTNAME= icqnix-beta1
MAINTAINER= yinjieh@csie.nctu.edu.tw
diff --git a/net/ipfm/Makefile b/net/ipfm/Makefile
index 0acf21f0a79b..5f884fcc4d5f 100644
--- a/net/ipfm/Makefile
+++ b/net/ipfm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ipfm
-# Version required: 0.10.4
# Date Created: 4 Mar 2000
# Whom: Roman Shterenzon <roman@xpert.com>
#
# $FreeBSD$
#
-DISTNAME= ipfm-0.10.4
+PORTNAME= ipfm
+PORTVERSION= 0.10.4
CATEGORIES= net
MASTER_SITES= http://www.via.ecp.fr/~tibob/ipfm/archive/
EXTRACT_SUFX= .tgz
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index c5f0db099c53..9621a1b29ebd 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: iplog
-# Version required: 2.1.1
# Date created: 4 Oct 1999
# Whom: Dominik Rothert <dr@domix.de>
#
# $FreeBSD$
#
-DISTNAME= iplog-2.1.1
+PORTNAME= iplog
+PORTVERSION= 2.1.1
CATEGORIES= security
MASTER_SITES= http://download.sourceforge.net/ojnk/ \
ftp://ftp.karlsbakk.net/pub/ojnk/iplog/
diff --git a/net/ipw/Makefile b/net/ipw/Makefile
index 4e14a190adb0..8b0641cc785c 100644
--- a/net/ipw/Makefile
+++ b/net/ipw/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ipw
-# Version required: 3.3a
# Date created: 29 January 1999
# Whom: mph
#
# $FreeBSD$
#
-DISTNAME= ipw
-PKGNAME= ipw-3.3a
+PORTNAME= ipw
+PORTVERSION= 3.3.a
CATEGORIES= net
MASTER_SITES= http://mjhb.marina-del-rey.ca.us/ipw/
+DISTNAME= ipw
MAINTAINER= mph@freebsd.org
diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile
index 1bfae84e26f5..39592020fc2a 100644
--- a/net/irrtoolset/Makefile
+++ b/net/irrtoolset/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: RAToolSet
-# Version required: 3.5.8
# Date created: May 4th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= RAToolSet-3.5.8
-PKGNAME= ratoolset-3.5.8
+PORTNAME= ratoolset
+PORTVERSION= 3.5.8
CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
+DISTNAME= RAToolSet-3.5.8
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net/isc-dhcp2/Makefile b/net/isc-dhcp2/Makefile
index d0096beec5f5..d9f92558eff6 100644
--- a/net/isc-dhcp2/Makefile
+++ b/net/isc-dhcp2/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: dhcp
-# Version required: 2.0
# Date created: 7 Mar 1996
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= dhcp-2.0
-PKGNAME= isc-${DISTNAME}
+PORTNAME= isc-dhcp
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
+DISTNAME= dhcp-${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index d0096beec5f5..d9f92558eff6 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: dhcp
-# Version required: 2.0
# Date created: 7 Mar 1996
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= dhcp-2.0
-PKGNAME= isc-${DISTNAME}
+PORTNAME= isc-dhcp
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
+DISTNAME= dhcp-${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index d0096beec5f5..d9f92558eff6 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: dhcp
-# Version required: 2.0
# Date created: 7 Mar 1996
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= dhcp-2.0
-PKGNAME= isc-${DISTNAME}
+PORTNAME= isc-dhcp
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
+DISTNAME= dhcp-${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index d0096beec5f5..d9f92558eff6 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: dhcp
-# Version required: 2.0
# Date created: 7 Mar 1996
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= dhcp-2.0
-PKGNAME= isc-${DISTNAME}
+PORTNAME= isc-dhcp
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
+DISTNAME= dhcp-${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index d0096beec5f5..d9f92558eff6 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: dhcp
-# Version required: 2.0
# Date created: 7 Mar 1996
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= dhcp-2.0
-PKGNAME= isc-${DISTNAME}
+PORTNAME= isc-dhcp
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
+DISTNAME= dhcp-${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index d0096beec5f5..d9f92558eff6 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: dhcp
-# Version required: 2.0
# Date created: 7 Mar 1996
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= dhcp-2.0
-PKGNAME= isc-${DISTNAME}
+PORTNAME= isc-dhcp
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
+DISTNAME= dhcp-${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/net/isic/Makefile b/net/isic/Makefile
index 25eab79242ca..ea030d38ee2f 100644
--- a/net/isic/Makefile
+++ b/net/isic/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: isic
-# Version required: 0.05
# Date created: 25 February 2000
# Whom: Brad Hendrickse <bradh@uunet.co.za>
#
# $FreeBSD$
#
-DISTNAME= isic-0.05
+PORTNAME= isic
+PORTVERSION= 0.05
CATEGORIES= net
MASTER_SITES= http://expert.cc.purdue.edu/~frantzen/
EXTRACT_SUFX= .tgz
diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index 39e0fe31aa37..51e1b90a952b 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdenetwork
-# Version required: Beta4
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdenetwork-1.1.2
+PORTNAME= kdenetwork
+PORTVERSION= 1.1.2
CATEGORIES= net news kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 39e0fe31aa37..51e1b90a952b 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdenetwork
-# Version required: Beta4
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdenetwork-1.1.2
+PORTNAME= kdenetwork
+PORTVERSION= 1.1.2
CATEGORIES= net news kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 39e0fe31aa37..51e1b90a952b 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdenetwork
-# Version required: Beta4
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdenetwork-1.1.2
+PORTNAME= kdenetwork
+PORTVERSION= 1.1.2
CATEGORIES= net news kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 39e0fe31aa37..51e1b90a952b 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdenetwork
-# Version required: Beta4
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdenetwork-1.1.2
+PORTNAME= kdenetwork
+PORTVERSION= 1.1.2
CATEGORIES= net news kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile
index a7f87d373a00..d9502aeb2a98 100644
--- a/net/kdetelnet/Makefile
+++ b/net/kdetelnet/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ktelnet
-# Version required: 0.61
# Date created: 14 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
# $FreeBSD$
#
-DISTNAME= ktelnet-0.61
+PORTNAME= ktelnet
+PORTVERSION= 0.61
CATEGORIES= net kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/1.1/apps/network
diff --git a/net/kicq/Makefile b/net/kicq/Makefile
index 449e2a738eaf..fcd6b1de1162 100644
--- a/net/kicq/Makefile
+++ b/net/kicq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kicq
-# Version required: 0.3.0
# Date created: 16 March 1999
# Whom: Pavel Andreev
#
# $FreeBSD$
#
-DISTNAME= kicq-0.3.0
+PORTNAME= kicq
+PORTVERSION= 0.3.0
CATEGORIES= net kde
MASTER_SITES= http://download.sourceforge.net/kicq/
diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile
index ee38b9d082b7..37fed3e48591 100644
--- a/net/ksamba/Makefile
+++ b/net/ksamba/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ksamba
-# Version required: Beta4
# Date created: 18 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
# $FreeBSD$
#
-DISTNAME= ksamba-0.3.3
+PORTNAME= ksamba
+PORTVERSION= 0.3.3
CATEGORIES= kde net
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= unstable/apps/network
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index dcabb6242322..974126a21ebe 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: LambdaMOO
-# Version required: 1.8.0r8
# Date created: Jul 3 1999
# Whom: Seiichirou Hiraoka
#
# $FreeBSD$
#
-DISTNAME= LambdaMOO-1.8.0r8
-PKGNAME= lambdamoo-1.8.0r8
+PORTNAME= lambdamoo
+PORTVERSION= 1.8.0.r8
CATEGORIES= net
MASTER_SITES= ftp://ftp.place.org/pub/moo/unofficial/
+DISTNAME= LambdaMOO-1.8.0r8
MAINTAINER= flathill@FreeBSD.ORG
diff --git a/net/ldapsdk/Makefile b/net/ldapsdk/Makefile
index 8656c2db5999..7e8f6297052b 100644
--- a/net/ldapsdk/Makefile
+++ b/net/ldapsdk/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: perldap
-# Version required: 1.1b
# Date created: 17 May 1999
# Whom: paul@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= ldapsdk_12311998
-PKGNAME= ldapsdk-1998.12.31
+PORTNAME= ldapsdk
+PORTVERSION= 1998.12.31
CATEGORIES= net
MASTER_SITES= ftp://ftp.mozilla.org/pub/directory/c-sdk/ldap/
+DISTNAME= ldapsdk_12311998
MAINTAINER= paul@FreeBSD.org
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index 669f47168647..8e6d1b548109 100644
--- a/net/libicq/Makefile
+++ b/net/libicq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libicq
-# Version required: 0.33
# Date Created: 31 Oct 1998
# Whom: Seiichirou Hiraoka
#
# $FreeBSD$
#
-DISTNAME= libicq-0.33
+PORTNAME= libicq
+PORTVERSION= 0.33
CATEGORIES= net
MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/ \
http://www.nectar.com/distfiles/
diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index 6fdeef13f47b..86cfab0186ad 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: libnet
-# Version required: 0.99g
# Date created: Sun Feb 3, 1999
# Whom: shipley@dis.org
#
# $FreeBSD$
#
-DISTNAME= libnet-0.99g
+PORTNAME= libnet
+PORTVERSION= 0.99g
CATEGORIES= net
MASTER_SITES= http://www.packetfactory.net/libnet/dist/
EXTRACT_SUFX= .tgz
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 6fdeef13f47b..86cfab0186ad 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: libnet
-# Version required: 0.99g
# Date created: Sun Feb 3, 1999
# Whom: shipley@dis.org
#
# $FreeBSD$
#
-DISTNAME= libnet-0.99g
+PORTNAME= libnet
+PORTVERSION= 0.99g
CATEGORIES= net
MASTER_SITES= http://www.packetfactory.net/libnet/dist/
EXTRACT_SUFX= .tgz
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index dcbd8f8abe40..4098505ac0db 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: libnids
-# Version required: 1.13
# Date created: 08 Jan 2000
# Whom: kris@FreeBSD.org
#
# $FreeBSD$
+#
-DISTNAME= libnids-1.13
+PORTNAME= libnids
+PORTVERSION= 1.13
CATEGORIES= net
MASTER_SITES= http://www.packetfactory.net/libnids/dist/
diff --git a/net/libsmi/Makefile b/net/libsmi/Makefile
index 9cad04a4e193..c176ccf46e69 100644
--- a/net/libsmi/Makefile
+++ b/net/libsmi/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libsmi
-# Version required: 0.1.8
# Date created: Tue Jan 27 2000
# Whom: Marcin Cieslak <saper@system.pl>
#
# $FreeBSD$
#
-DISTNAME= libsmi-0.1.8
+PORTNAME= libsmi
+PORTVERSION= 0.1.8
CATEGORIES= net
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 4b8576ceeb5f..ae4c748fffc2 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -1,6 +1,5 @@
# ex:ts=8
# Ports collection makefile for: libsocket++
-# Version required: 1.10
# Date created: Sun Jan 19, 1997
# Whom: Narvi <narvi@haldjas.folklore.ee>
# David O'Brien (obrien@FreeBSD.org)
@@ -8,12 +7,13 @@
# $FreeBSD$
#
-DISTNAME= socket++-1.10
-PKGNAME= libsocket++-1.10
+PORTNAME= libsocket++
+PORTVERSION= 1.10
CATEGORIES= net
MASTER_SITES= ftp://ftp.umsicht.fhg.de/pub/unix/language/C++/class-libraries/ \
ftp://ftp.par.univie.ac.at/pub/unix/c++/ \
ftp://jungfrau.ptf.hro.nl/pub/socket/
+DISTNAME= socket++-1.10
MAINTAINER= narvi@haldjas.folklore.ee
diff --git a/net/libunp/Makefile b/net/libunp/Makefile
index 3bd94cf4f889..27cb359483e9 100644
--- a/net/libunp/Makefile
+++ b/net/libunp/Makefile
@@ -1,16 +1,16 @@
# Ports collection makefile for: libunp
-# Version required: 1.0
# Date created: Sept 28, 1999
# Whom: james@targetnet.com
#
# $FreeBSD$
#
-DISTNAME= unpv12e
-PKGNAME= libunp-1.0
+PORTNAME= libunp
+PORTVERSION= 1.0
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.kohala.com/pub/rstevens/ \
http://www.cs.columbia.edu/networks98/stevens/
+DISTNAME= unpv12e
MAINTAINER= james@targetnet.com
diff --git a/net/libunpipc/Makefile b/net/libunpipc/Makefile
index 024ca5b74992..497d6dc616a8 100644
--- a/net/libunpipc/Makefile
+++ b/net/libunpipc/Makefile
@@ -1,16 +1,16 @@
# Ports collection makefile for: libunpipc
-# Version required: 1.0
# Date created: Sept 28, 1999
# Whom: james@targetnet.com
#
# $FreeBSD$
#
-DISTNAME= unpv22e
-PKGNAME= libunpipc-1.0
+PORTNAME= libunpipc
+PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.kohala.com/pub/rstevens/ \
http://compass.net.edu.cn:8000/programming/
+DISTNAME= unpv22e
MAINTAINER= james@targetnet.com
diff --git a/net/licq-devel/Makefile b/net/licq-devel/Makefile
index e15d82e516a5..925e5ac215e8 100644
--- a/net/licq-devel/Makefile
+++ b/net/licq-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: licq
-# Version required: 0.81
# Date created: 2 July 1998
# Whom: Brian Feldman & Matt Heckaman
#
# $FreeBSD$
#
-DISTNAME= licq-0.81
+PORTNAME= licq
+PORTVERSION= 0.81
CATEGORIES= net
MASTER_SITES= http://download.sourceforge.net/licq/ \
ftp://ftp.wibble.net/pub/licq/srcs/ \
diff --git a/net/licq/Makefile b/net/licq/Makefile
index e15d82e516a5..925e5ac215e8 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: licq
-# Version required: 0.81
# Date created: 2 July 1998
# Whom: Brian Feldman & Matt Heckaman
#
# $FreeBSD$
#
-DISTNAME= licq-0.81
+PORTNAME= licq
+PORTVERSION= 0.81
CATEGORIES= net
MASTER_SITES= http://download.sourceforge.net/licq/ \
ftp://ftp.wibble.net/pub/licq/srcs/ \
diff --git a/net/macipgw/Makefile b/net/macipgw/Makefile
index 64918aea5fcb..160fed3deea7 100644
--- a/net/macipgw/Makefile
+++ b/net/macipgw/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: macipgw
-# Version required: macipgw-1.0
# Date created: 25 Nov 1997
# Whom: stb
#
# $FreeBSD$
#
-DISTNAME= macipgw-1.0
+PORTNAME= macipgw
+PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.hanse.de/sites/transit/netatalk/ \
http://people.FreeBSD.org/~stb/netatalk/
diff --git a/net/mars_nwe/Makefile b/net/mars_nwe/Makefile
index 3398bc7d2820..4783e24f92de 100644
--- a/net/mars_nwe/Makefile
+++ b/net/mars_nwe/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: mars_nwe
-# Version required: 0.99.pl17
# Date created: 29 Dec 1998
# Whom: Boris Popov <bp@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mars_nwe-0.99.pl17
-PKGNAME= mars_nwe-0.99b17
+PORTNAME= mars_nwe
+PORTVERSION= 0.99.b17
CATEGORIES= net
MASTER_SITES= http://www.compu-art.de/download/ \
ftp://ftp.gwdg.de/pub/linux/misc/ncpfs/mars_nwe/ \
ftp://ftp.butya.kz/pub/mars_nwe/
+DISTNAME= mars_nwe-0.99.pl17
EXTRACT_SUFX= .tgz
MAINTAINER= bp@FreeBSD.org
diff --git a/net/merlinmon/Makefile b/net/merlinmon/Makefile
index f398067dc386..e7c6ec7ca71b 100644
--- a/net/merlinmon/Makefile
+++ b/net/merlinmon/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: merlin
-# Version required: 1.0
# Date created: 13 Dec 1999
# Whom: Nick Sayer <nsayer@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= merlin-1.0
-PKGNAME= merlinmon-1.0
+PORTNAME= merlinmon
+PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.kfu.com/pub/
+DISTNAME= merlin-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nsayer@freebsd.org
diff --git a/net/micq/Makefile b/net/micq/Makefile
index 9e43fdd2914b..3ce86e375286 100644
--- a/net/micq/Makefile
+++ b/net/micq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: micq
-# Version required: 0.4.4
# Date created: 11 Oct 1998
# Whom: mph
#
# $FreeBSD$
#
-DISTNAME= micq-0.4.4
+PORTNAME= micq
+PORTVERSION= 0.4.4
CATEGORIES= net
MASTER_SITES= ftp://micq.chatzone.org/pub/micq/V0.4.4/
EXTRACT_SUFX= .tgz
diff --git a/net/mopd/Makefile b/net/mopd/Makefile
index 7436fbf55546..d349bec70a8b 100644
--- a/net/mopd/Makefile
+++ b/net/mopd/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: mopd
-# Version required: 0.0
# Date created: Sun Nov 14, 1999
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= mopd-2.5.3
+PORTNAME= mopd
+PORTVERSION= 2.5.3
CATEGORIES= net
MASTER_SITES= ftp://ftp.stacken.kth.se/pub/OS/NetBSD/mopd/ \
http://world.std.com/~bdc/projects/vaxen/netboot/ \
diff --git a/net/mpd-netgraph/Makefile b/net/mpd-netgraph/Makefile
index f6dec2cecbec..bac9348897d5 100644
--- a/net/mpd-netgraph/Makefile
+++ b/net/mpd-netgraph/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpd
-# Version required: 3.0b4
# Date created: 31 Jan 2000
# Whom: Archie Cobbs
#
# $FreeBSD$
#
-DISTNAME= mpd-3.0b5
+PORTNAME= mpd
+PORTVERSION= 3.0.b5
CATEGORIES= net
MASTER_SITES= ftp://ftp.whistle.com/pub/archie/mpd/
diff --git a/net/mpd/Makefile b/net/mpd/Makefile
index f5f0d3cbdcd5..5868e653533c 100644
--- a/net/mpd/Makefile
+++ b/net/mpd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpd
-# Version required: 2.0b1
# Date created: 25 Feb 1999
# Whom: Archie Cobbs
#
# $FreeBSD$
#
-DISTNAME= mpd-2.0b2
+PORTNAME= mpd
+PORTVERSION= 2.0.b2
CATEGORIES= net
MASTER_SITES= ftp://ftp.whistle.com/pub/archie/mpd/
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index ccf88df7c6d5..1bfff6fa1a44 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpich (portable mpi standard imp.)
-# Version required: 1.2.0
# Date created: 2 May 1998
# Whom: dbader@eece.unm.edu
#
# $FreeBSD$
#
-DISTNAME= mpich-1.2.0
+PORTNAME= mpich
+PORTVERSION= 1.2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index ccf88df7c6d5..1bfff6fa1a44 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpich (portable mpi standard imp.)
-# Version required: 1.2.0
# Date created: 2 May 1998
# Whom: dbader@eece.unm.edu
#
# $FreeBSD$
#
-DISTNAME= mpich-1.2.0
+PORTNAME= mpich
+PORTVERSION= 1.2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/
diff --git a/net/mrt/Makefile b/net/mrt/Makefile
index 4e89ea61df52..f721b3e1d03d 100644
--- a/net/mrt/Makefile
+++ b/net/mrt/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mrt
-# Version required: 1.5.1a
# Date created: Sat Jun 6 00:09:52 JST 1998
# Whom: Jun-ichiro itojun Hagino <itojun@itojun.org>
#
# $FreeBSD$
#
-DISTNAME= mrt-${VERBASE}-src
-PKGNAME= mrt-${VERBASE}
+PORTNAME= mrt
+PORTVERSION= 2.1.2a
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.merit.edu/net-research/mrt/
+DISTNAME= mrt-${PORTVERSION}-src
MAINTAINER= itojun@itojun.org
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index ecc6d8e757ee..ea7c2d95b3ba 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: MRTG
-# Version required: 2.8.8
# Date created: April 18th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mrtg-2.8.12
+PORTNAME= mrtg
+PORTVERSION= 2.8.12
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index d5312388bd30..cd7dd20a3c1e 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mtr
-# Version required: 0.42
# Date created: 12 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= mtr-0.42
+PORTNAME= mtr
+PORTVERSION= 0.42
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
http://www.giovannelli.it/~gmarco/files/
diff --git a/net/naim/Makefile b/net/naim/Makefile
index c93dd016029b..adbdcd9a78fb 100644
--- a/net/naim/Makefile
+++ b/net/naim/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: naim
-# Version required: 0.9.3
# Date created: 02 March 1999
# Whom: mharo@area51.fremont.ca.us
#
# $FreeBSD$
#
-DISTNAME= naim-0.9.5-nicer2
-PKGNAME= naim-0.9.5.2
+PORTNAME= naim
+PORTVERSION= 0.9.5.2
CATEGORIES= net
MASTER_SITES= http://dev.n.ml.org/ \
ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
+DISTNAME= naim-0.9.5-nicer2
MAINTAINER= mharo@FreeBSD.org
diff --git a/net/nam/Makefile b/net/nam/Makefile
index ac44646a1e3a..16fb5f1ca566 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: nam
-# Version required: 1.0a7
# Date created: 26 April 1999
# Whom: obonilla
#
# $FreeBSD$
#
-DISTNAME= nam-src-1.0a7
-PKGNAME= nam-1.0a7
+PORTNAME= nam
+PORTVERSION= 1.0.a7
CATEGORIES= net
MASTER_SITES= http://www-mash.cs.berkeley.edu/dist/vint/
+DISTNAME= nam-src-1.0a7
MAINTAINER= obonilla@fisicc-ufm.edu
diff --git a/net/ncplib/Makefile b/net/ncplib/Makefile
index a09c84adfb61..59b293333275 100644
--- a/net/ncplib/Makefile
+++ b/net/ncplib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ncplib
-# Version required: 1.3.4
# Date created: 9 Dec 1999
# Whom: Boris Popov <bp@butya.kz>
#
# $FreeBSD$
#
-DISTNAME= ncplib-1.3.4
+PORTNAME= ncplib
+PORTVERSION= 1.3.4
CATEGORIES= net
MASTER_SITES= ftp://ftp.butya.kz/pub/nwlib/ \
http://www.chat.ru/~rbp/pub/nwlib/
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 6d3f72a88edd..3dde6cad0d45 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ucd-snmp
-# Version required: 3.6.1
# Date created: 26 June 1996
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= ucd-snmp-4.0.1
+PORTNAME= ucd-snmp
+PORTVERSION= 4.0.1
CATEGORIES= net
MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index 6d3f72a88edd..3dde6cad0d45 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ucd-snmp
-# Version required: 3.6.1
# Date created: 26 June 1996
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= ucd-snmp-4.0.1
+PORTNAME= ucd-snmp
+PORTVERSION= 4.0.1
CATEGORIES= net
MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index 8e9a5de34797..a1aae501854e 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -1,13 +1,12 @@
# Ports collection makefile for: netatalk-asun
-# Version required: netatalk-1.4b2-asun-2.0
# Date created: 07 Sep 1998
# Whom: stb@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= netatalk-1.4b2+asun2.1.3
-PKGNAME= netatalk-1.4b2+asun2.1.3
+PORTNAME= netatalk
+PORTVERSION= 1.4b2+asun2.1.3
CATEGORIES= net print
MASTER_SITES= ftp://ftp.u.washington.edu/public/asun/ \
http://people.FreeBSD.org/~stb/mirror/ftp.u.washington.edu/public/asun/ \
diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 7da873333cca..e75a50095f90 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: netatalk
-# Version required: netatalk-1.4b2
# Date created: 23 Jul 1997
# Whom: stb
#
# $FreeBSD$
#
-DISTNAME= netatalk-1.4b2
+PORTNAME= netatalk
+PORTVERSION= 1.4b2
CATEGORIES= net print
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
http://people.FreeBSD.org/~stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk/ \
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 7da873333cca..e75a50095f90 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: netatalk
-# Version required: netatalk-1.4b2
# Date created: 23 Jul 1997
# Whom: stb
#
# $FreeBSD$
#
-DISTNAME= netatalk-1.4b2
+PORTNAME= netatalk
+PORTVERSION= 1.4b2
CATEGORIES= net print
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
http://people.FreeBSD.org/~stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk/ \
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 051cbd9b8341..f81b89b443c4 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: netcat
-# Version required: 0.0
# Date created: Thur Nov 21, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= nc110
-PKGNAME= netcat-1.10
+PORTNAME= netcat
+PORTVERSION= 1.10
CATEGORIES= net
MASTER_SITES= ftp://avian.org/src/hacks/ \
ftp://coast.cs.purdue.edu/pub/mirrors/avian.org/netcat/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://avian.org/src/hacks/ \
ftp://ftp.sterling.com/mirrors/avian.org/src/hacks/ \
ftp://ftp.rge.com/pub/security/coast/mirrors/avian.org/netcat/
EXTRACT_SUFX= .tgz
+DISTNAME= nc110
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile
index c572525e965a..af998149ef47 100644
--- a/net/netpipes/Makefile
+++ b/net/netpipes/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for: netpipes4.0
-# Version required: 4.0
+# New ports collection makefile for: netpipes
# Date created: 12th April 1997
# Whom: doconnor@gsoft.com.au
#
# $FreeBSD$
#
-DISTNAME= netpipes-4.2-export
-PKGNAME= netpipes-4.2
+PORTNAME= netpipes
+PORTVERSION= 4.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.purplefrog.com/pub/netpipes/
+DISTNAME= netpipes-4.2-export
MAINTAINER= doconnor@gsoft.com.au
diff --git a/net/nettest/Makefile b/net/nettest/Makefile
index 86f9fa6c99e1..c202bd96875d 100644
--- a/net/nettest/Makefile
+++ b/net/nettest/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: nettest
-# Version required: 92/11/09
# Date created: Mon Oct 20 14:30:06 CDT 1997
# Whom: proot@iaces.com
#
# $FreeBSD$
#
-DISTNAME= nettest.92.11.09
-PKGNAME= nettest-92.11.09
+PORTNAME= nettest
+PORTVERSION= 92.11.09
CATEGORIES= net
MASTER_SITES= ftp://ftp.cray.com/src/nettest/
+DISTNAME= nettest.92.11.09
EXTRACT_SUFX= .tar.Z
MAINTAINER= proot@iaces.com
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index 07392ee8e18e..276101f485d3 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: ngrep
-# Version required: 0.0
# Date created: Sat Jan 01, 2000
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= ngrep-1.35
+PORTNAME= ngrep
+PORTVERSION= 1.35
CATEGORIES= net security
MASTER_SITES= http://www.packetfactory.net/ngrep/
diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 7e0435ba2ba1..ad912950c4b8 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: NOCOL
-# Version required: 4.3
# Date created: 21 Nov 1998
# Whom: bradh
#
# $FreeBSD$
#
-DISTNAME= nocol-4.3
+PORTNAME= nocol
+PORTVERSION= 4.3
CATEGORIES= net
MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 849d511a1008..c89e355b02b0 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ns-2
-# Version required: 2.1b5
# Date created: 26 April 1999
# Whom: obonilla
#
# $FreeBSD$
#
-DISTNAME= ns-src-2.1b5
-PKGNAME= ns-2.1b5
+PORTNAME= ns
+PORTVERSION= 2.1.b5
CATEGORIES= net
MASTER_SITES= http://www-mash.cs.berkeley.edu/dist/vint/
+DISTNAME= ns-src-2.1b5
MAINTAINER= obonilla@fisicc-ufm.edu
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index 849d511a1008..c89e355b02b0 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ns-2
-# Version required: 2.1b5
# Date created: 26 April 1999
# Whom: obonilla
#
# $FreeBSD$
#
-DISTNAME= ns-src-2.1b5
-PKGNAME= ns-2.1b5
+PORTNAME= ns
+PORTVERSION= 2.1.b5
CATEGORIES= net
MASTER_SITES= http://www-mash.cs.berkeley.edu/dist/vint/
+DISTNAME= ns-src-2.1b5
MAINTAINER= obonilla@fisicc-ufm.edu
diff --git a/net/nslint/Makefile b/net/nslint/Makefile
index 5554a255a9ad..40da8bb97609 100644
--- a/net/nslint/Makefile
+++ b/net/nslint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nslint
-# Version required: 2.0.1
# Date created: 27 October 1997
# Whom: dglo@ssec.wisc.edu
#
# $FreeBSD$
#
-DISTNAME= nslint-2.0.1
+PORTNAME= nslint
+PORTVERSION= 2.0.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.ee.lbl.gov/
EXTRACT_SUFX= .tar.Z
diff --git a/net/nsping/Makefile b/net/nsping/Makefile
index 797cb44f4349..1a7ec01cb6bb 100644
--- a/net/nsping/Makefile
+++ b/net/nsping/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: nsping
-# Version required: 0.8
# Date created: 04 March 2000
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= nsping
-PKGNAME= nsping-0.8
+PORTNAME= nsping
+PORTVERSION= 0.8
CATEGORIES= net
MASTER_SITES= http://www.enteract.com/~tqbf/
+DISTNAME= nsping
MAINTAINER= kris@FreeBSD.org
diff --git a/net/nstreams/Makefile b/net/nstreams/Makefile
index 1dea2d201855..7fbcb464ab1c 100644
--- a/net/nstreams/Makefile
+++ b/net/nstreams/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nstreams
-# Version required: 1.0.0
# Date created: 22 September 1999
# Whom: darius@dons.net.au
#
# $FreeBSD$
#
-DISTNAME= nstreams-1.0.0
+PORTNAME= nstreams
+PORTVERSION= 1.0.0
CATEGORIES= net
MASTER_SITES= http://www.hsc.fr/cabinet/produits/nstreams/
diff --git a/net/ntimelord/Makefile b/net/ntimelord/Makefile
index ee61b73096a8..03342d9c20e0 100644
--- a/net/ntimelord/Makefile
+++ b/net/ntimelord/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ntimelord
-# Version required: 1.0
# Date created: 29 Oct 1997
# Whom: Takeru NAIKI <naiki@bfd.es.hokudai.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= ntimelord-1.0
+PORTNAME= ntimelord
+PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/
EXTRACT_SUFX= .tar.Z
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index f45a757b1688..a35788ab15ac 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: ntop
-# Version required: 1.1
# Date created: 10 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= ntop-1.1-src
-PKGNAME= ntop-1.1
+PORTNAME= ntop
+PORTVERSION= 1.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.unipi.it/pub/local/ntop/source/ \
http://www.freenix.no/~anders/ \
ftp://totem.fix.no/pub/mirrors/misc/
+DISTNAME= ntop-1.1-src
MAINTAINER= billf@FreeBSD.org
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index d900519bfbca..2b26226dd761 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ntp
-# Version required: 4.0.99g
# Date created: Di 5 Mai 1998 21:31:03 CEST
# Whom: andreas
#
# $FreeBSD$
#
-DISTNAME= ntp-4.0.99g
+PORTNAME= ntp
+PORTVERSION= 4.0.99g
CATEGORIES= net
MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/
diff --git a/net/ntp-stable/Makefile b/net/ntp-stable/Makefile
index d900519bfbca..2b26226dd761 100644
--- a/net/ntp-stable/Makefile
+++ b/net/ntp-stable/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ntp
-# Version required: 4.0.99g
# Date created: Di 5 Mai 1998 21:31:03 CEST
# Whom: andreas
#
# $FreeBSD$
#
-DISTNAME= ntp-4.0.99g
+PORTNAME= ntp
+PORTVERSION= 4.0.99g
CATEGORIES= net
MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index d900519bfbca..2b26226dd761 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ntp
-# Version required: 4.0.99g
# Date created: Di 5 Mai 1998 21:31:03 CEST
# Whom: andreas
#
# $FreeBSD$
#
-DISTNAME= ntp-4.0.99g
+PORTNAME= ntp
+PORTVERSION= 4.0.99g
CATEGORIES= net
MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/
diff --git a/net/nttcp/Makefile b/net/nttcp/Makefile
index ddb37b804cdd..82552f3665f9 100644
--- a/net/nttcp/Makefile
+++ b/net/nttcp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nttcp
-# Version required: 1.45
# Date created: 11 Nov 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= nttcp-1.45
+PORTNAME= nttcp
+PORTVERSION= 1.45
CATEGORIES= net benchmarks
MASTER_SITES= http://users.leo.org/~bartel/nttcp/ \
http://people.FreeBSD.org/~billf/
diff --git a/net/opal/Makefile b/net/opal/Makefile
index 1bec4b123bbd..647b1ae481ef 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -1,18 +1,17 @@
# New ports collection makefile for: openh323
-# Version required: 1.1alpha1
# Date created: Thu Feb 17 15:00:48 GMT 2000
# Whom: Roger Hardiman <roger@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= openh323_1.1alpha1
-PKGNAME= openh323-1.1.a1
+PORTNAME= openh323
+PORTVERSION= 1.1.a1
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
http://www.ru.openh323.org/bin/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+DISTFILES= openh323_1.1alpha1${EXTRACT_SUFX} \
pwlib_min_1.14.tar.gz
MAINTAINER= roger@freebsd.org
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 1bec4b123bbd..647b1ae481ef 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -1,18 +1,17 @@
# New ports collection makefile for: openh323
-# Version required: 1.1alpha1
# Date created: Thu Feb 17 15:00:48 GMT 2000
# Whom: Roger Hardiman <roger@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= openh323_1.1alpha1
-PKGNAME= openh323-1.1.a1
+PORTNAME= openh323
+PORTVERSION= 1.1.a1
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
http://www.ru.openh323.org/bin/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+DISTFILES= openh323_1.1alpha1${EXTRACT_SUFX} \
pwlib_min_1.14.tar.gz
MAINTAINER= roger@freebsd.org
diff --git a/net/opengatekeeper/Makefile b/net/opengatekeeper/Makefile
index 19327beedcb2..7e786c9b39e1 100644
--- a/net/opengatekeeper/Makefile
+++ b/net/opengatekeeper/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: opengatekeeper
-# Version required: 0.44
# Date created: Wed Apr 5 11:00:00 GMT 2000
# Whom: Roger Hardiman <roger@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= opengate_alpha0.44
-PKGNAME= opengate-0.44
+PORTNAME= opengate
+PORTVERSION= 0.44
CATEGORIES= net
MASTER_SITES= http://download.sourceforge.net/OpenGatekeeper/
+DISTNAME= opengate_alpha0.44
MAINTAINER= roger@freebsd.org
diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile
index 1bec4b123bbd..647b1ae481ef 100644
--- a/net/openh323-112/Makefile
+++ b/net/openh323-112/Makefile
@@ -1,18 +1,17 @@
# New ports collection makefile for: openh323
-# Version required: 1.1alpha1
# Date created: Thu Feb 17 15:00:48 GMT 2000
# Whom: Roger Hardiman <roger@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= openh323_1.1alpha1
-PKGNAME= openh323-1.1.a1
+PORTNAME= openh323
+PORTVERSION= 1.1.a1
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
http://www.ru.openh323.org/bin/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+DISTFILES= openh323_1.1alpha1${EXTRACT_SUFX} \
pwlib_min_1.14.tar.gz
MAINTAINER= roger@freebsd.org
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 1bec4b123bbd..647b1ae481ef 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,18 +1,17 @@
# New ports collection makefile for: openh323
-# Version required: 1.1alpha1
# Date created: Thu Feb 17 15:00:48 GMT 2000
# Whom: Roger Hardiman <roger@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= openh323_1.1alpha1
-PKGNAME= openh323-1.1.a1
+PORTNAME= openh323
+PORTVERSION= 1.1.a1
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
http://www.ru.openh323.org/bin/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+DISTFILES= openh323_1.1alpha1${EXTRACT_SUFX} \
pwlib_min_1.14.tar.gz
MAINTAINER= roger@freebsd.org
diff --git a/net/openldap/Makefile b/net/openldap/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap/Makefile
+++ b/net/openldap/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap12/Makefile
+++ b/net/openldap12/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index b1b97ceddecd..aa4b894860d0 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: openldap
-# Version required: 1.2.9
# Date created: 20 Sep 1998
# Whom: Lachlan O'Dea
#
# $FreeBSD$
#
-DISTNAME= openldap-1.2.9
+PORTNAME= openldap
+PORTVERSION= 1.2.9
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/p5-Archie/Makefile b/net/p5-Archie/Makefile
index 46497726dcbd..b7fb7abd0217 100644
--- a/net/p5-Archie/Makefile
+++ b/net/p5-Archie/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Archie
-# Version required: 1.5
# Date created: October 19th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= perl_archie.1.5
-PKGNAME= p5-Archie-1.5
+PORTNAME= p5-Archie
+PORTVERSION= 1.5
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Archie
+DISTNAME= perl_archie.1.5
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index db02e38e52b6..11365bcbb706 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Net-DNS
-# Version required: 0.12
# Date created: April 5th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Net-DNS-0.12
-PKGNAME= p5-Net-DNS-0.12
+PORTNAME= p5-Net-DNS
+PORTVERSION= 0.12
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
+DISTNAME= Net-DNS-0.12
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index d7ead2385f92..704d322dc529 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Net-Daemon
-# Version required: 0.29
# Date created: 27 Feb 2000
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
# $FreeBSD$
#
-DISTNAME= Net-Daemon-0.29
-PKGNAME= p5-Net-Daemon-0.29
+PORTNAME= p5-Net-Daemon
+PORTVERSION= 0.29
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
+DISTNAME= Net-Daemon-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.ORG
diff --git a/net/p5-Net-IPv4Addr/Makefile b/net/p5-Net-IPv4Addr/Makefile
index 84681174a0c2..cfacd3bc4f23 100644
--- a/net/p5-Net-IPv4Addr/Makefile
+++ b/net/p5-Net-IPv4Addr/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Net-IPv4Addr
-# Version required: 0.08
# Date created: 25 February 2000
# Whom: Brad Hendrickse <bradh@uunet.co.za>
#
# $FreeBSD$
#
-DISTNAME= Net-IPv4Addr-0.08
-PKGNAME= p5-Net-IPv4Addr-0.08
+PORTNAME= p5-Net-IPv4Addr
+PORTVERSION= 0.08
CATEGORIES= net perl5
# not using CPAN due to them messing up the filename and version numbers
MASTER_SITES= http://indev.insu.com/sources/
+DISTNAME= Net-IPv4Addr-${PORTVERSION}
MAINTAINER= bradh@uunet.co.za
diff --git a/net/p5-Net-RawIP/Makefile b/net/p5-Net-RawIP/Makefile
index 49c9ec322827..f12d9a47fcdb 100644
--- a/net/p5-Net-RawIP/Makefile
+++ b/net/p5-Net-RawIP/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: p5-Net-RawIP
-# Version required: 0.09
# Date created: 18 February 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= Net-RawIP-0.09
-PKGNAME= p5-Net-RawIP-0.09
+PORTNAME= p5-Net-RawIP
+PORTVERSION= 0.09
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
http://quake.skif.net/RawIP/files/ \
http://www.ic.al.lg.ua/~ksv/
MASTER_SITE_SUBDIR= Net
+DISTNAME= Net-RawIP-${PORTVERSION}
MAINTAINER= dima@chg.ru
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index ce457b831606..86bef1b4a48b 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Net-Telnet
-# Version required: 3.01
# Date created: March 3 1998
# Whom: Jun Kuriyama <kuriyama@opt.phys.waseda.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= Net-Telnet-3.01
-PKGNAME= p5-Net-Telnet-3.01
+PORTNAME= p5-Net-Telnet
+PORTVERSION= 3.01
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
+DISTNAME= Net-Telnet-3.01
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index c38db64eb2cf..5ab851726d54 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Net-Whois
-# Version required: 0.22
# Date created: June 7th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Net-Whois-0.22
-PKGNAME= p5-Net-Whois-0.22
+PORTNAME= p5-Net-Whois
+PORTVERSION= 0.22
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
+DISTNAME= Net-Whois-${PORTVERSION}
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 3459a719a77f..182d50bcbbd6 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Net
-# Version required: 1.*
# Date created: September 30th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libnet-1.0607
-PKGNAME= p5-Net-1.0607
+PORTNAME= p5-Net
+PORTVERSION= 1.0607
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
+DISTNAME= libnet-${PORTVERSION}
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index c9ec88a11617..18957f1cadd1 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-PlRPC
-# Version required: 0.2012
# Date Created: 27 Feb 2000
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= PlRPC-0.2012
-PKGNAME= p5-PlRPC-0.2012
+PORTNAME= p5-PlRPC
+PORTVERSION= 0.2012
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= RPC
+DISTNAME= PlRPC-0.2012
MAINTAINER= vanilla@FreeBSD.org
diff --git a/net/p5-SNMP-Util/Makefile b/net/p5-SNMP-Util/Makefile
index f419852773ab..574159da0e78 100644
--- a/net/p5-SNMP-Util/Makefile
+++ b/net/p5-SNMP-Util/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-SNMP-Util
-# Version required: 1.6
# Date created: September 7 1999
# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= SNMP-Util-1.6
-PKGNAME= p5-SNMP-Util-1.6
+PORTNAME= p5-SNMP-Util
+PORTVERSION= 1.6
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SNMP
+DISTNAME= SNMP-Util-1.6
MAINTAINER= fenner@FreeBSD.org
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 3bda0ecfa995..46c99fd7b433 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-SNMP
-# Version required: 1.8b3
# Date created: May 5th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= SNMP-1.8.1
-PKGNAME= p5-SNMP-1.8.1
+PORTNAME= p5-SNMP
+PORTVERSION= 1.8.1
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SNMP
+DISTNAME= SNMP-${PORTVERSION}
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net/p5-SNMP_Session/Makefile b/net/p5-SNMP_Session/Makefile
index 238a946e067d..2354f04df7f0 100644
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: p5-SNMP_Session
-# Version required: 0.72
# Date created: 13 June 1999
# Whom: Stephen J. Roznowski <sjr@home.net>
#
# $FreeBSD$
#
-DISTNAME= SNMP_Session-0.75
-PKGNAME= p5-SNMP_Session-0.75
+PORTNAME= p5-SNMP_Session
+PORTVERSION= 0.75
CATEGORIES= net perl5
MASTER_SITES= ftp://ftp.switch.ch/software/sources/network/snmp/perl/
+DISTNAME= SNMP_Session-0.75
MAINTAINER= ports@FreeBSD.org
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 81f878312709..643f24e95383 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Socks
-# Version required: 0.03
# Date created: 22 January 1999
# Whom: Yukihiro Nakai <Nacai@iname.com>
#
# $FreeBSD$
#
-DISTNAME= SOCKS-0.03
-PKGNAME= p5-Socks-0.03
+PORTNAME= p5-Socks
+PORTVERSION= 0.03
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
+DISTNAME= SOCKS-0.03
MAINTAINER= nakai@FreeBSD.org
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index 16119e9f635c..2940a961049f 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-URI
-# Version required: 1.*
# Date created: 1999/04/07
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= URI-1.04
-PKGNAME= p5-URI-1.04
+PORTNAME= p5-URI
+PORTVERSION= 1.04
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= URI
+DISTNAME= URI-1.04
MAINTAINER= ache@FreeBSD.org
diff --git a/net/p5-pRPC/Makefile b/net/p5-pRPC/Makefile
index 188fecacd27d..2a11262e4e3c 100644
--- a/net/p5-pRPC/Makefile
+++ b/net/p5-pRPC/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-pRPC
-# Version required: 0.1005
# Date Created: Aug 18 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= pRPC-modules-0.1005
-PKGNAME= p5-pRPC-modules-0.1005
+PORTNAME= p5-pRPC-modules
+PORTVERSION= 0.1005
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= RPC
+DISTNAME= pRPC-modules-0.1005
MAINTAINER= vanilla@FreeBSD.org
diff --git a/net/pathchar/Makefile b/net/pathchar/Makefile
index e60a04cff326..9ec534b704c4 100644
--- a/net/pathchar/Makefile
+++ b/net/pathchar/Makefile
@@ -1,20 +1,20 @@
# ex:ts=8
# Ports collection makefile for: pathchar
-# Version required: 0.0
# Date created: 7 November 1998
# Whom: Josh Gilliam <josh@quick.net>
#
# $FreeBSD$
#
-DISTNAME= pathchar-a1-freebsd-3.0
-PKGNAME= pathchar-a1
+PORTNAME= pathchar
+PORTVERSION= a1
CATEGORIES= net
MASTER_SITES= ftp://ftp.ee.lbl.gov/pathchar/ \
http://www.caida.org/Tools/Pathchar/ \
http://www.fips.de/Computer/woman/ \
http://sitka.triumf.ca/net/ \
http://people.FreeBSD.org/~obrien/Distfiles/
+DISTNAME= pathchar-a1-freebsd-3.0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pathcharnotes.html pathchar.8 \
pathchar.mantxt
diff --git a/net/pchar/Makefile b/net/pchar/Makefile
index 0d265fd5f73d..199433967f5f 100644
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: pchar
-# Version required: 0.0
# Date created: Wed Nov 03, 1999
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= pchar-1.1.1
+PORTNAME= pchar
+PORTVERSION= 1.1.1
CATEGORIES= net ipv6
MASTER_SITES= http://www.ca.sandia.gov/~bmah/Software/pchar/
diff --git a/net/pcnfsd/Makefile b/net/pcnfsd/Makefile
index 582f94101cad..eb7e7ef67ee2 100644
--- a/net/pcnfsd/Makefile
+++ b/net/pcnfsd/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pcnfsd
-# Version required: 93.02.16
# Date created: Oct 6, 1994
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= pcnfsd.93.02.16
-PKGNAME= pcnfsd-93.02.16
+PORTNAME= pcnfsd
+PORTVERSION= 93.02.16
CATEGORIES= net
MASTER_SITES= ftp://bcm.tmc.edu/pcnfs/
+DISTNAME= pcnfsd.93.02.16
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/net/perldap/Makefile b/net/perldap/Makefile
index ff54d5c325ff..8b6331dbcc43 100644
--- a/net/perldap/Makefile
+++ b/net/perldap/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: perldap
-# Version required: 1.1b
# Date created: 17 May 1999
# Whom: paul@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= perldap-1.2.2
+PORTNAME= perldap
+PORTVERSION= 1.2.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.mozilla.org/pub/directory/perldap/
EXTRACT_SUFX= .tgz
diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
index 43f054d67acf..134298d70af9 100644
--- a/net/pipsecd/Makefile
+++ b/net/pipsecd/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: pipsecd
-# Version required: 19991014
# Date created: 16 Aug 1999
# Whom: Patrick Bihan-Faou <patrick@mindstep.com>
#
# $FreeBSD$
#
-DISTNAME= pipsec-19991014
-PKGNAME= pipsecd-19991014
+PORTNAME= pipsecd
+PORTVERSION= 19991014
CATEGORIES= net security
MASTER_SITES= http://www.enst.fr/~beyssac/pipsec/ \
http://www.mindstep.com/pipsec/
+DISTNAME= pipsec-19991014
MAINTAINER= patrick@mindstep.com
diff --git a/net/pmf/Makefile b/net/pmf/Makefile
index 9039c79004f3..c66cbf969b0a 100644
--- a/net/pmf/Makefile
+++ b/net/pmf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pmf
-# Version required: 1.13.1
# Date created: 24 Sep 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= pmf-1.13.1
+PORTNAME= pmf
+PORTVERSION= 1.13.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/lpmud/clients/pmf/
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index 026a0f8934d2..d8059b7e5bbf 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: poptop
-# Version required: 1.0.0
# Date created: 04 October 1999
# Whom: Nick Sayer <nsayer@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= pptpd-1.0.0
-PKGNAME= poptop-1.0.0
+PORTNAME= pptpd
+PORTVERSION= 1.0.0
CATEGORIES= net
MASTER_SITES= http://www.moretonbay.com/vpn/releases/
+DISTNAME= pptpd-1.0.0
EXTRACT_SUFX= .tgz
MAINTAINER= nsayer@freebsd.org
diff --git a/net/ppp-nt/Makefile b/net/ppp-nt/Makefile
index 5a236fbbe285..04a33f65a621 100644
--- a/net/ppp-nt/Makefile
+++ b/net/ppp-nt/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ppp + nat + time schedule
-# Version required: 2.2.7
# Date created: 10 August 1998
# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ppp-2.2.7
-PKGNAME= ppp-nt-2.2.7
+PORTNAME= ppp-nt
+PORTVERSION= 2.2.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
http://people.FreeBSD.org/~sada/distfiles/
+DISTNAME= ppp-2.2.7
PATCH_SITES= http://www.rr.iij4u.or.jp/~sada/patches/ \
http://people.FreeBSD.org/~sada/distfiles/
diff --git a/net/pppload/Makefile b/net/pppload/Makefile
index 89d27579f335..78ffd44a02c6 100644
--- a/net/pppload/Makefile
+++ b/net/pppload/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pppload
-# Version required: 1.0
# Date created: 30 January 1998
# Whom: Sean Cole <scole@aracnet.com>
#
# $FreeBSD$
#
-DISTNAME= pppload-1.0
+PORTNAME= pppload
+PORTVERSION= 1.0
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/network/serial/ppp
diff --git a/net/ppptraf/Makefile b/net/ppptraf/Makefile
index 895e653cdec0..c202ca9b639f 100644
--- a/net/ppptraf/Makefile
+++ b/net/ppptraf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ppptraf
-# Version required: 1.0
# Date created: 9 February 2000
# Whom: diskiller@cnbinc.com
#
# $FreeBSD$
#
-DISTNAME= ppptraf-1.0
+PORTNAME= ppptraf
+PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.borg-cube.com/users/diskiller/distfiles/
diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile
index 25a55ddaf8b9..bcb6186c740d 100644
--- a/net/pptpclient/Makefile
+++ b/net/pptpclient/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: pptpclient
-# Version required: 1.0.2
# Date created: 19 June 1999
# Whom: John Polstra <jdp@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= pptp-linux-1.0.2
-PKGNAME= pptpclient-1.0.2
+PORTNAME= pptpclient
+PORTVERSION= 1.0.2
CATEGORIES= net
MASTER_SITES= http://www.pdos.lcs.mit.edu/~cananian/Projects/PPTP/release/ \
ftp://ftp.kddlabs.co.jp/pub/inet/vpn/pptp-linux/ \
ftp://ftp.iks-jena.de/pub/software/linux/net/
+DISTNAME= pptp-linux-1.0.2
MAINTAINER= jdp@freebsd.org
diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile
index 0478b1e8b9c4..6ef4e8935cb6 100644
--- a/net/ppxp/Makefile
+++ b/net/ppxp/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: ppxp
-# Version required: 0.99120923
# Date created: 24 Dec 1999
# Whom: Norio Suzuki <nosuzuki@e-mail.ne.jp>
# KUNISHIMA Takeo <kunishi@c.oka-pu.ac.jp>
@@ -8,7 +7,8 @@
# $FreeBSD$
#
-DISTNAME= ppxp-0.99120923
+PORTNAME= ppxp
+PORTVERSION= 0.99120923
CATEGORIES= net tk82
.if defined(USE_TCLJP)
CATEGORIES+= japanese
diff --git a/net/priss/Makefile b/net/priss/Makefile
index fc2e9c923ef2..81bd892d4484 100644
--- a/net/priss/Makefile
+++ b/net/priss/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: priss
-# Version required: 1.0.2
# Date created: 13 September 1999
# Whom: Richard Kiss <richard@homemail.com>
#
# $FreeBSD$
#
-DISTNAME= SS1.0.2
-PKGNAME= priss-1.0
+PORTNAME= priss
+PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= http://www.streamingserver.org/priss/
+DISTNAME= SS1.0.2
EXTRACT_SUFX= .tgz
MAINTAINER= richard@homemail.com
diff --git a/net/pvm/Makefile b/net/pvm/Makefile
index d3fc3a887d13..6adffa3f5895 100644
--- a/net/pvm/Makefile
+++ b/net/pvm/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: pvm3
-# Version required: 3.4.3
# Date created: 11 March 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= pvm3.4.3
-PKGNAME= pvm-3.4.3
+PORTNAME= pvm
+PORTVERSION= 3.4.3
CATEGORIES= net
MASTER_SITES= http://www.netlib.org/pvm3/ \
ftp://ftp.chg.ru/pub/prog/parallel/pvm/pvm3/
+DISTNAME= pvm3.4.3
EXTRACT_SUFX= .tgz
MAINTAINER= dima@Chg.RU
diff --git a/net/queso/Makefile b/net/queso/Makefile
index efe5ee21c59a..abd62becbc1f 100644
--- a/net/queso/Makefile
+++ b/net/queso/Makefile
@@ -1,6 +1,5 @@
# ex:ts=8
# Ports collection makefile for: Queso
-# Version required: 0.0
# Date created: 13 Oct 1998
# Whom: Wu Ching-hong <woju@freebsd.ee.ntu.edu.tw>
# and David O'Brien (obrien@NUXI.com)
@@ -8,7 +7,8 @@
# $FreeBSD$
#
-DISTNAME= queso-980922
+PORTNAME= queso
+PORTVERSION= 980922
CATEGORIES= net security
MASTER_SITES= ftp://ftp.ee.lbl.gov/ \
${MASTER_SITE_SUNSITE} \
diff --git a/net/radius/Makefile b/net/radius/Makefile
index 9400ee1d9d5c..cdccdc8fb907 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: radius
-# Version required: merit radius 2.4.23
# Date created: 4. July 1996
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= radius.3.6B.basic
-PKGNAME= radius-basic-3.6B
+PORTNAME= radius-basic
+PORTVERSION= 3.6B
CATEGORIES= net
MASTER_SITES= ftp://ftp.merit.edu/radius/releases/
+DISTNAME= radius.3.6B.basic
MAINTAINER= ports@FreeBSD.org
diff --git a/net/radiusclient/Makefile b/net/radiusclient/Makefile
index db7688303a73..b22d80217030 100644
--- a/net/radiusclient/Makefile
+++ b/net/radiusclient/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: radiusclient
-# Version required: 0.3.1
# Date created: Wed Nov 4 08:48:08 EST 1998
# Whom: maurice
#
# $FreeBSD$
#
-DISTNAME= radiusclient-0.3.1
+PORTNAME= radiusclient
+PORTVERSION= 0.3.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.hamburg.cityline.net/pub/radiusclient/ \
ftp://ftp.ecrc.net/pub/netsw/Network/IP/Management/RADIUS/
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 96a3576af3e7..766e251e0707 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: radiusd-cistron
-# Version required: cistron radiusd 1.6.2 (stable)
# Date created: 15 Jan 1999
# Whom: john@nlc.net.au
#
# $FreeBSD$
#
-DISTNAME= radiusd-cistron-1.6.2-stable
-PKGNAME= radiusd-cistron-1.6.2
+PORTNAME= radiusd-cistron
+PORTVERSION= 1.6.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/radius/
+DISTNAME= radiusd-cistron-1.6.2-stable
MAINTAINER= john@nlc.net.au
diff --git a/net/radreport/Makefile b/net/radreport/Makefile
index c34d8ceec331..fb04b6ca36ac 100644
--- a/net/radreport/Makefile
+++ b/net/radreport/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: radreport
-# Version required: 1.3
# Date created: 10/22/1999
# Whom: Kelly Yancey <kbyanc@posi.net>
#
# $FreeBSD$
#
-DISTNAME= radreport
-PKGNAME= radreport-1.3
+PORTNAME= radreport
+PORTVERSION= 1.3
CATEGORIES= net
MASTER_SITES= ftp://ftp.livingston.com/pub/le/contrib/radius/
+DISTNAME= radreport
EXTRACT_SUFX=
MAINTAINER= kbyanc@posi.net
diff --git a/net/ratoolset/Makefile b/net/ratoolset/Makefile
index 1bfae84e26f5..39592020fc2a 100644
--- a/net/ratoolset/Makefile
+++ b/net/ratoolset/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: RAToolSet
-# Version required: 3.5.8
# Date created: May 4th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= RAToolSet-3.5.8
-PKGNAME= ratoolset-3.5.8
+PORTNAME= ratoolset
+PORTVERSION= 3.5.8
CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
+DISTNAME= RAToolSet-3.5.8
MAINTAINER= jfitz@FreeBSD.org
diff --git a/net/rboot/Makefile b/net/rboot/Makefile
index 88f5d23bdf8f..f778883616b1 100644
--- a/net/rboot/Makefile
+++ b/net/rboot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rboot
-# Version required: 3.0
# Date created: 25 Jun 1999
# Whom: m.butkus@tu-bs.de
#
# $FreeBSD$
#
-DISTNAME= rboot-3.0.1
+PORTNAME= rboot
+PORTVERSION= 3.0.1
CATEGORIES= net
MASTER_SITES= http://www.bs.ni.schule.de/support/rboot/download/
diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index 5140d33309ab..fb9ff9bb073f 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rdist
-# Version required: rdist-6.1.5
# Date created: 19 August 1995
# Whom: peter
#
# $FreeBSD$
#
-DISTNAME= rdist-6.1.5
+PORTNAME= rdist
+PORTVERSION= 6.1.5
CATEGORIES= net
MASTER_SITES= http://www.magnicomp.com/download/rdist/ \
ftp://ftp.rge.com/pub/admin/rdist/ \
diff --git a/net/relay/Makefile b/net/relay/Makefile
index 54665bb09273..facc11538857 100644
--- a/net/relay/Makefile
+++ b/net/relay/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: relay
-# Version required: 0.0
# Date created: Mon Dec 23, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= relay
-PKGNAME= relay-1.10
+PORTNAME= relay
+PORTVERSION= 1.10
CATEGORIES= net security
MASTER_SITES= http://www.iagora.com/~espel/ \
http://people.FreeBSD.org/~obrien/Distfiles/
+DISTNAME= relay
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index f9bb13d75157..09be0e252f02 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rinetd
-# Version required: 0.61
# Date created: 23 Dec 1997
# Whom: alexp
#
# $FreeBSD$
#
-DISTNAME= rinetd
-PKGNAME= rinetd-0.61
+PORTNAME= rinetd
+PORTVERSION= 0.61
CATEGORIES= net
MASTER_SITES= ftp://ftp.boutell.com/pub/boutell/rinetd/
+DISTNAME= rinetd
MAINTAINER= veers@disturbed.net
diff --git a/net/ripetools/Makefile b/net/ripetools/Makefile
index 68e74e3b1d3c..dcb4cc59c709 100644
--- a/net/ripetools/Makefile
+++ b/net/ripetools/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ripe-whois
-# Version required: 2.4
# Date created: 5th June 1997
# Whom: joe@uk.freebsd.org
#
# $FreeBSD$
#
-DISTNAME= ripe-whois-tools-2.4
-PKGNAME= ripetools-2.4
+PORTNAME= ripetools
+PORTVERSION= 2.4
CATEGORIES= net
MASTER_SITES= ftp://ftp.ripe.net/tools/
+DISTNAME= ripe-whois-tools-2.4
MAINTAINER= joe@uk.freebsd.org
diff --git a/net/rmsg/Makefile b/net/rmsg/Makefile
index 69954e1c2eb6..44b3096bb9af 100644
--- a/net/rmsg/Makefile
+++ b/net/rmsg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rmsg
-# Version required: 1.64
# Date created: 9 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= rmsg-1.64
+PORTNAME= rmsg
+PORTVERSION= 1.64
CATEGORIES= net
MASTER_SITES= ftp://ftp.funet.fi/pub/unix/tcpip/ \
ftp://proton.elka.pw.edu.pl/pub/unix/network/
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index 122e84b51340..eddfece77d14 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rrdtool
-# Version required: 1.0.13
# Date created: 20 July 1999
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= rrdtool-1.0.13
+PORTNAME= rrdtool
+PORTVERSION= 1.0.13
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
index 122e84b51340..eddfece77d14 100644
--- a/net/rrdtool10/Makefile
+++ b/net/rrdtool10/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rrdtool
-# Version required: 1.0.13
# Date created: 20 July 1999
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= rrdtool-1.0.13
+PORTNAME= rrdtool
+PORTVERSION= 1.0.13
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
diff --git a/net/rshell/Makefile b/net/rshell/Makefile
index f8fdfd1839bf..802f1919bcd5 100644
--- a/net/rshell/Makefile
+++ b/net/rshell/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: rshell
-# Version required: 1.0
# Date created: 1997/06/09
# Whom: wosch
#
# $FreeBSD$
#
+PORTNAME= rshell
+PORTVERSION= 1.0
DISTNAME= rshell-1.0
CATEGORIES= net
MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 077a20c5ffda..a0357e9b894f 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: rsync
-# Version required: 0.0
# Date created: Sat Aug 3, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= rsync-2.4.1
+PORTNAME= rsync
+PORTVERSION= 2.4.1
CATEGORIES= net ipv6
MASTER_SITES= ftp://samba.anu.edu.au/pub/rsync/ \
ftp://sunsite.auc.dk/pub/unix/rsync/ \
diff --git a/net/rtsp_proxy/Makefile b/net/rtsp_proxy/Makefile
index ce907c3c4231..a956c2b3b1b0 100644
--- a/net/rtsp_proxy/Makefile
+++ b/net/rtsp_proxy/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rtsp_proxy
-# Version required: 1.0
# Date created: 8 June 1999
# Whom: Richard Kiss <richard@homemail.com>
#
# $FreeBSD$
#
-DISTNAME= SS1.0.1
-PKGNAME= rtsp_proxy-1.0
+PORTNAME= rtsp_proxy
+PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= http://www.streamingserver.org/priss/
+DISTNAME= SS1.0.1
EXTRACT_SUFX= .tgz
MAINTAINER= richard@homemail.com
diff --git a/net/rwhois/Makefile b/net/rwhois/Makefile
index b018063852e6..8af4dc9c363b 100644
--- a/net/rwhois/Makefile
+++ b/net/rwhois/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rwhois
-# Version required: 1.0b9.2
# Date created: May 9th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rwhois-1.0B9.2
-PKGNAME= rwhois-1.0b9.2
+PORTNAME= rwhois
+PORTVERSION= 1.0.b9.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.rwhois.net/pub/
+DISTNAME= rwhois-1.0B9.2
MAINTAINER= jfitz@FreeBSD.org
@@ -43,7 +43,7 @@ post-install:
@ ${ECHO} "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
@ ${ECHO} "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
@ ${ECHO} "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
- @ ${ECHO} "${ECHO} \"rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+ @ ${ECHO} "${ECHO} \"rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
@ ${ECHO} "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && ${ECHO} -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
${CHMOD} 751 ${PREFIX}/etc/rc.d/rwhoisd.sh
diff --git a/net/rwhoisd/Makefile b/net/rwhoisd/Makefile
index b018063852e6..8af4dc9c363b 100644
--- a/net/rwhoisd/Makefile
+++ b/net/rwhoisd/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rwhois
-# Version required: 1.0b9.2
# Date created: May 9th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rwhois-1.0B9.2
-PKGNAME= rwhois-1.0b9.2
+PORTNAME= rwhois
+PORTVERSION= 1.0.b9.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.rwhois.net/pub/
+DISTNAME= rwhois-1.0B9.2
MAINTAINER= jfitz@FreeBSD.org
@@ -43,7 +43,7 @@ post-install:
@ ${ECHO} "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
@ ${ECHO} "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
@ ${ECHO} "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
- @ ${ECHO} "${ECHO} \"rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+ @ ${ECHO} "${ECHO} \"rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
@ ${ECHO} "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && ${ECHO} -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
${CHMOD} 751 ${PREFIX}/etc/rc.d/rwhoisd.sh
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 045c2c13495f..c70a7a372206 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: samba
-# Version required: 2.0.5a
# Date created: 11th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= samba-2.0.6
-#PKGNAME= samba-2.0.5
+PORTNAME= samba
+PORTVERSION= 2.0.6
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 045c2c13495f..c70a7a372206 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: samba
-# Version required: 2.0.5a
# Date created: 11th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= samba-2.0.6
-#PKGNAME= samba-2.0.5
+PORTNAME= samba
+PORTVERSION= 2.0.6
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 045c2c13495f..c70a7a372206 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: samba
-# Version required: 2.0.5a
# Date created: 11th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= samba-2.0.6
-#PKGNAME= samba-2.0.5
+PORTNAME= samba
+PORTVERSION= 2.0.6
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index 83a647ca22b4..60cd6b80de16 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: scotty
-# Version required: 2.1.9
# Date created: 18 February 1995
# Whom: Gennady Sorokopud <gena@netvisions.net.il>
#
# $FreeBSD$
#
-DISTNAME= scotty-2.1.10
+PORTNAME= scotty
+PORTVERSION= 2.1.10
CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index 83a647ca22b4..60cd6b80de16 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: scotty
-# Version required: 2.1.9
# Date created: 18 February 1995
# Whom: Gennady Sorokopud <gena@netvisions.net.il>
#
# $FreeBSD$
#
-DISTNAME= scotty-2.1.10
+PORTNAME= scotty
+PORTVERSION= 2.1.10
CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index 74bb8034187b..f8cd6247f69a 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sendfile
-# Version required: 2.1
# Date created: 30 Oct 1997
# Whom: sec@42.org
#
# $FreeBSD$
#
-DISTNAME= sendfile-20000102
-PKGNAME= sendfile-2.1
+PORTNAME= sendfile
+PORTVERSION= 2.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.belwue.de/pub/unix/sendfile/current/
+DISTNAME= sendfile-20000102
MAINTAINER= sec@42.org
diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index ae988ca0b795..9f76e513fc39 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: sharity-light
-# Version required: 1.0
# Date created: 14 June 1997
# Whom: Dmitrij Tejblum <dima@tejblum.dnttm.rssi.ru>
#
# $FreeBSD$
#
-DISTNAME= Sharity-Light.1.2
-PKGNAME= sharity-light-1.2
+PORTNAME= sharity-light
+PORTVERSION= 1.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.obdev.at/pub/Products/Sharity-Light/ \
ftp://ftp.warpnet.ro/mirrors/ftp.obdev.at/pub/Products/Sharity-Light/ \
http://people.FreeBSD.org/~dt/distfiles/
+DISTNAME= Sharity-Light.1.2
MAINTAINER= dt@FreeBSD.org
diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index 6f05b6563851..eec3b8b4464d 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: slirp
-# Version required: 1.0c
# Date created: 25 Aug 1995
# Whom: Alain Kalker <A.C.P.M.Kalker@student.utwente.nl>
#
# $FreeBSD$
#
-DISTNAME= slirp-1.0c
+PORTNAME= slirp
+PORTVERSION= 1.0c
CATEGORIES= net
MASTER_SITES= ftp://blitzen.canberra.edu.au/pub/slirp/
diff --git a/net/smbtcpdump/Makefile b/net/smbtcpdump/Makefile
index 20e6e336a938..984c3895b74f 100644
--- a/net/smbtcpdump/Makefile
+++ b/net/smbtcpdump/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: smbtcpdump
-# Version required: 0.0
# Date created: 2 Jun 1998
# Whom: obrien
#
# $FreeBSD$
#
-DISTNAME= tcpdump-3.4
-PKGNAME= smbtcpdump-3.4
+PORTNAME= smbtcpdump
+PORTVERSION= 3.4
CATEGORIES= net security
MASTER_SITES= ftp://ftp.ee.lbl.gov/ \
ftp://ftp.uu.net/networking/ip/trace/tcpdump/
+DISTNAME= tcpdump-3.4
EXTRACT_SUFX= .tar.Z
PATCH_SITES= ftp://ftp.samba.org/pub/samba/tcpdump-smb/
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index f84aa6cf719e..be4adce19e59 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: sniffit
-# Version required: 0.0
# Date created: 28 Mar 1998
# Whom: bsdx
#
# $FreeBSD$
#
-DISTNAME= sniffit.0.3.7.beta
-PKGNAME= sniffit-0.3.7b
+PORTNAME= sniffit
+PORTVERSION= 0.3.7b
CATEGORIES= net security
MASTER_SITES= http://reptile.rug.ac.be/~coder/sniffit/files/ \
http://people.FreeBSD.org/~obrien/Distfiles/
+DISTNAME= sniffit.0.3.7.beta
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 4c9179ac1018..1e7809273fd9 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: socks5
-# Version required: v1.0r10
# Date created: 24 Apr 1996
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= socks5-v1.0r10
-PKGNAME= socks5-1.0.10
+PORTNAME= socks5
+PORTVERSION= 1.0.10
CATEGORIES= net security
+DISTNAME= socks5-v1.0r10
EXTRACT_SUFX= .tar.gz
MAINTAINER= imp@freebsd.org
diff --git a/net/sup/Makefile b/net/sup/Makefile
index 13d17661e32e..607b1045a280 100644
--- a/net/sup/Makefile
+++ b/net/sup/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sup
-# Version required: <own lineage>
# Date created: 21 August 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= sup
-PKGNAME= sup-2.0
+PORTNAME= sup
+PORTVERSION= 2.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_LOCAL}
+DISTNAME= sup
MAINTAINER= ports@FreeBSD.org
diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index e9db8f5aa430..491b88a89b9a 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tac_plus
-# Version required: 2.1
# Date created: 4 Mar 1997
# Whom: Igor Vinokurov <igor@zynaps.ru>
#
# $FreeBSD$
#
-DISTNAME= tac_plus.F4.0.3.alpha
-PKGNAME= tac_plus-F4.0.3
+PORTNAME= tac_plus
+PORTVERSION= F4.0.3
CATEGORIES= net
MASTER_SITES= ftp://ftp-eng.cisco.com/pub/tacacs/
+DISTNAME= tac_plus.F4.0.3.alpha
EXTRACT_SUFX= .tar.Z
MAINTAINER= tasic@lucky.net
diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile
index 0ac435d7efc0..a184d2394d48 100644
--- a/net/tcpflow/Makefile
+++ b/net/tcpflow/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tcpflow
-# Version required: 0.12
# Date created: 20 August 1999
# Whom: Jose M. Alcaide <jose@we.lc.ehu.es>
#
# $FreeBSD$
#
-DISTNAME= tcpflow-0.12
+PORTNAME= tcpflow
+PORTVERSION= 0.12
CATEGORIES= net
MASTER_SITES= ftp://ftp.circlemud.org/pub/jelson/tcpflow/
diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile
index c2b4eaa6e19c..9312da12b100 100644
--- a/net/tcpshow/Makefile
+++ b/net/tcpshow/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: tcpshow
-# Version required: 0.0
# Date created: Tue Nov 04, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= tcpshow-1.74
+PORTNAME= tcpshow
+PORTVERSION= 1.74
CATEGORIES= net security
MASTER_SITES= http://people.FreeBSD.org/~obrien/Distfiles/
# http://www.cs.berkeley.edu/~daw/mike/
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index d4cfb369024b..248aa6518d4d 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tcptrace
-# Version required: 5.2.1
# Date created: 3 March 1997
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= tcptrace.5.2.1
-PKGNAME= tcptrace-5.2.1
+PORTNAME= tcptrace
+PORTVERSION= 5.2.1
CATEGORIES= net ipv6
MASTER_SITES= http://jarok.cs.ohiou.edu/software/tcptrace/files/5.2.1/
+DISTNAME= tcptrace.5.2.1
MAINTAINER= fenner@FreeBSD.org
diff --git a/net/tcserver/Makefile b/net/tcserver/Makefile
index 064c681acbce..6bb631c0bf3d 100644
--- a/net/tcserver/Makefile
+++ b/net/tcserver/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: elsa
-# Version required: 1.0b-018
# Date created: 06 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= elsa-freebsd_x86
-PKGNAME= elsa-1.0b-018
+PORTNAME= elsa
+PORTVERSION= 1.0.b018
CATEGORIES= net
-MASTER_SITES= ""
+MASTER_SITES=
+DISTNAME= elsa-freebsd_x86
MAINTAINER= jedgar@FreeBSD.org
diff --git a/net/tdetect/Makefile b/net/tdetect/Makefile
index f414b326c967..9793bc94e3ae 100644
--- a/net/tdetect/Makefile
+++ b/net/tdetect/Makefile
@@ -1,14 +1,12 @@
# New ports collection makefile for: tdetect
-# Ports collection makefile for: tdetect
-# Version required: 0.2
# Date created: Sun Jan 31, 1997
# Whom: shipley@dis.org
#
# $FreeBSD$
#
-DISTNAME= tdetect-0.2
-PKGNAME= tdetect-0.2.1
+PORTNAME= tdetect
+PORTVERSION= 0.2
CATEGORIES= net
MASTER_SITES= http://sb.123.org/ \
http://www.genocide2600.com/~tattooman/unix-loggers/ \
diff --git a/net/telnetx/Makefile b/net/telnetx/Makefile
index f7c5250ccf3d..70d70feb13dc 100644
--- a/net/telnetx/Makefile
+++ b/net/telnetx/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: telnetx
-# Version required: ?
# Date created: 22 Sep 1996
# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= telnetx+transit.src.940401
-PKGNAME= telnetx-940401
+PORTNAME= telnetx
+PORTVERSION= 940401
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/
+DISTNAME= telnetx+transit.src.940401
MAINTAINER= max@FreeBSD.org
diff --git a/net/telserv/Makefile b/net/telserv/Makefile
index e215a12e1418..baa121a5bbdf 100644
--- a/net/telserv/Makefile
+++ b/net/telserv/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: telserv
-# Version required: 0.0
# Date created: Mon Feb 03, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= telserv
-PKGNAME= telserv-1.0
+PORTNAME= telserv
+PORTVERSION= 1.0
CATEGORIES= net security
MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/ \
http://people.FreeBSD.org/~obrien/Distfiles/
+DISTNAME= telserv
EXTRACT_SUFX= .c
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/tik/Makefile b/net/tik/Makefile
index f0d6171d0c0b..cef10658b190 100644
--- a/net/tik/Makefile
+++ b/net/tik/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tik
-# Version required: 0.59
# Date created: 13 January 1999
# Whom: Eugene M. Kim <astralblue@usa.net>
#
# $FreeBSD$
#
-DISTNAME= tik-0.59
+PORTNAME= tik
+PORTVERSION= 0.59
CATEGORIES= net tk82
MASTER_SITES= http://www.aim.aol.com/tik/ \
http://www.nectar.com/distfiles/
diff --git a/net/tintin++-devel/Makefile b/net/tintin++-devel/Makefile
index ab98f7555498..5fb1499bc12d 100644
--- a/net/tintin++-devel/Makefile
+++ b/net/tintin++-devel/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: tintin++
-# Version required: 1.5pl6
# Date created: 15 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= tintin++v1.5pl6
-PKGNAME= tintin-1.5.6
+PORTNAME= tintin
+PORTVERSION= 1.5.6
CATEGORIES= net games
MASTER_SITES= ftp://ftp.walrus.com/pub/avatar/clients/ \
ftp://ftp.cctpu.edu.ru/pub/comp/networking/mud/ \
ftp://iclub.nsu.ru/pub/mud/clients/tintin++/
+DISTNAME= tintin++v1.5pl6
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@FreeBSD.org
diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index ab98f7555498..5fb1499bc12d 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: tintin++
-# Version required: 1.5pl6
# Date created: 15 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= tintin++v1.5pl6
-PKGNAME= tintin-1.5.6
+PORTNAME= tintin
+PORTVERSION= 1.5.6
CATEGORIES= net games
MASTER_SITES= ftp://ftp.walrus.com/pub/avatar/clients/ \
ftp://ftp.cctpu.edu.ru/pub/comp/networking/mud/ \
ftp://iclub.nsu.ru/pub/mud/clients/tintin++/
+DISTNAME= tintin++v1.5pl6
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@FreeBSD.org
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 4ebfc6336fbd..a922f15b8ac0 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: tinyfugue
-# Version required: 4.0s1
# Date created: 4 January 1997
# Whom: mike@binghamton.edu
#
# $FreeBSD$
#
-DISTNAME= tf-40s1
-PKGNAME= tf-4.0s1
+PORTNAME= tf
+PORTVERSION= 4.0s1
CATEGORIES= net games
MASTER_SITES= ftp://tf.tcp.com/pub/tinyfugue/ \
ftp://laurel.actlab.utexas.edu/pub/tinyfugue/ \
ftp://ftp.ci.uminho.pt/pub/mirrors/tinyfugue/
+DISTNAME= tf-40s1
MAINTAINER= jseger@FreeBSD.org
diff --git a/net/tn3270/Makefile b/net/tn3270/Makefile
index 380b8be81aae..5e3d01d9ba14 100644
--- a/net/tn3270/Makefile
+++ b/net/tn3270/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: tn3270
-# Version required: 4.4BSD-Lite
# Date created: 30 August 1999
# Whom: markm
#
# $FreeBSD$
#
-DISTNAME= tn3270
-PKGNAME= tn3270-4.4
+PORTNAME= tn3270
+PORTVERSION= 4.4
CATEGORIES= net
MASTER_SITES= http://freefall.freebsd.org/~markm/ \
ftp://ftp.za.freebsd.org/pub/FreeBSD/distfiles/ \
ftp://ftp3.za.freebsd.org/pub/FreeBSD/distfiles/
+DISTNAME= tn3270
MAINTAINER= markm@FreeBSD.ORG
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index 89d256c3225c..e5a76fb51f5b 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tn5250
-# Version required: 0.15.7
# Date created: 20 January 2000
# Whom: Elias Mandouvalos <ocean@compulink.gr>
#
# $FreeBSD$
#
-DISTNAME= tn5250-0.15.7
+PORTNAME= tn5250
+PORTVERSION= 0.15.7
CATEGORIES= net
MASTER_SITES= ftp://cvs.cleveland.lug.net/pub/tn5250/
diff --git a/net/traceroute/Makefile b/net/traceroute/Makefile
index 41f962b62642..ebe2b5448eca 100644
--- a/net/traceroute/Makefile
+++ b/net/traceroute/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: traceroute
-# Version required: 980831
# Date created: 20 February 1997
# Whom: chris@vader.org
#
# $FreeBSD$
#
-DISTNAME= traceroute_${RELEASEDATE}
-PKGNAME= traceroute-${RELEASEDATE}
+PORTNAME= traceroute
+PORTVERSION= ${RELEASEDATE}
CATEGORIES= net
MASTER_SITES= ftp://ftp.nikhef.nl/pub/network/ \
http://www.chg.ru/~dima/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= dima@Chg.RU
diff --git a/net/trafd/Makefile b/net/trafd/Makefile
index 7ab4da2b16fd..f0742df96e68 100644
--- a/net/trafd/Makefile
+++ b/net/trafd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: trafd
-# Version required: 3.0
# Date created: 22 January 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= trafd-3.0
+PORTNAME= trafd
+PORTVERSION= 3.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.riss-telecom.ru/pub/dev/trafd/
EXTRACT_SUFX= .tgz
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 2da6c6d97c8c..6a7c59b2d218 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: trafshow
-# Version required: 3.1
# Date created: 25 September 1996
# Whom: igor@zynaps.ru
#
# $FreeBSD$
#
-DISTNAME= trafshow-3.1
+PORTNAME= trafshow
+PORTVERSION= 3.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.nsk.su/pub/RinetSoftware/
EXTRACT_SUFX= .tgz
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
index 2da6c6d97c8c..6a7c59b2d218 100644
--- a/net/trafshow3/Makefile
+++ b/net/trafshow3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: trafshow
-# Version required: 3.1
# Date created: 25 September 1996
# Whom: igor@zynaps.ru
#
# $FreeBSD$
#
-DISTNAME= trafshow-3.1
+PORTNAME= trafshow
+PORTVERSION= 3.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.nsk.su/pub/RinetSoftware/
EXTRACT_SUFX= .tgz
diff --git a/net/trafshow4/Makefile b/net/trafshow4/Makefile
index 2da6c6d97c8c..6a7c59b2d218 100644
--- a/net/trafshow4/Makefile
+++ b/net/trafshow4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: trafshow
-# Version required: 3.1
# Date created: 25 September 1996
# Whom: igor@zynaps.ru
#
# $FreeBSD$
#
-DISTNAME= trafshow-3.1
+PORTNAME= trafshow
+PORTVERSION= 3.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.nsk.su/pub/RinetSoftware/
EXTRACT_SUFX= .tgz
diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile
index 8b531fa1beb9..9557a832240e 100644
--- a/net/ttcp/Makefile
+++ b/net/ttcp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ttcp
-# Version required: 1.12
# Date created: Tue Jun 1 22:58:13 PDT 1999
# Whom: mharo@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= ttcp-1.12
+PORTNAME= ttcp
+PORTVERSION= 1.12
CATEGORIES= net
MASTER_SITES= ftp://ftp.sgi.com/sgi/src/ttcp/
DISTFILES= ttcp.c ttcp.1 README
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index 9e5c21dc45a8..d3da0acbbef8 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ttt
-# Version required: 1.3
# Date created: 22 September 1998
# Whom: Kenjiro Cho <kjc@csl.sony.co.jp>
#
# $FreeBSD$
#
-DISTNAME= ttt-1.4
+PORTNAME= ttt
+PORTVERSION= 1.4
CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.csl.sony.co.jp/pub/kjc/
diff --git a/net/tund/Makefile b/net/tund/Makefile
index 44295acaed1a..7e3c72a870dc 100644
--- a/net/tund/Makefile
+++ b/net/tund/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tund
-# Version required: 0.11
# Date created: 20 July 1999
# Whom: Sergey Kosyakov <ks@itp.ac.ru>
#
# $FreeBSD$
#
-DISTNAME= tund-0.20
+PORTNAME= tund
+PORTVERSION= 0.20
CATEGORIES= net
MASTER_SITES= ftp://ftp.chg.ru/pub/networking/freebsd/
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 6d3f72a88edd..3dde6cad0d45 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ucd-snmp
-# Version required: 3.6.1
# Date created: 26 June 1996
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= ucd-snmp-4.0.1
+PORTNAME= ucd-snmp
+PORTVERSION= 4.0.1
CATEGORIES= net
MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 2c212b19f842..17f0334799a2 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: vnc
-# Version required: 3.3.3r1
# Date created: 24 February 1998
# Whom: msmith
#
# $FreeBSD$
#
-DISTNAME= vnc-3.3.3r1_unixsrc
-PKGNAME= vnc-3.3.3r1
+PORTNAME= vnc
+PORTVERSION= 3.3.3r1
CATEGORIES= net
MASTER_SITES= http://www.uk.research.att.com/vnc/dist/
DISTFILES= vnc-3.3.3r1_unixsrc.tgz \
diff --git a/net/wais/Makefile b/net/wais/Makefile
index 4ba2b7ea136f..c9d6fd756ddc 100644
--- a/net/wais/Makefile
+++ b/net/wais/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wais
-# Version required: 0.5
# Date created: 20 Sep 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= freeWAIS-0.5
+PORTNAME= freeWAIS
+PORTVERSION= 0.5
CATEGORIES= net
MASTER_SITES= ftp://ftp.cnidr.org/pub/NIDR.tools/freewais/
diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile
index 875920fa8d95..d13ff9359826 100644
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@@ -1,19 +1,19 @@
# ex:ts=8
# Ports collection makefile for: dhcp
-# Version required: 0.0
# Date created: 21 November 1995
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= dhcp-1.4.0p6
-PKGNAME= wide-dhcp-1.4.0p6
+PORTNAME= wide-dhcp
+PORTVERSION= 1.4.0.p6
CATEGORIES= net
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/wide-dhcp/ \
ftp://ftp.st.ryukoku.ac.jp/pub/network/dhcp/wide/ \
ftp://ftp.sage-au.org.au/pub/network/boot/wide-dhcp/
+DISTNAME= dhcp-1.4.0p6
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 32871e7b903e..9a3a8d069f3f 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ethereal
-# Version required: 0.8.6
# Date created: 10 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= ethereal-0.8.6
+PORTNAME= ethereal
+PORTVERSION= 0.8.6
CATEGORIES= net ipv6
MASTER_SITES= http://alpha1.linuxberg.com/files/x11/network/ \
http://www.linuxberg.com/files/x11/network/ \
diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile
index 2b807833731a..8b0bd5f8fc29 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmnet
-# Version required: 1.2
# Date created: 24 November 1998
# Whom: Rich Neswold <rneswold@mcs.net>
#
# $FreeBSD$
#
-DISTNAME= wmnet-1.2
+PORTNAME= wmnet
+PORTVERSION= 1.2
CATEGORIES= net windowmaker
MASTER_SITES= ftp://ftp.enteract.com/users/rneswold/
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
index 30ef9cdb540d..5f13c6b699c8 100644
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xarchie
-# Version required: 2.0.10
# Date created: 24 September 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= xarchie-2.0.10
+PORTNAME= xarchie
+PORTVERSION= 2.0.10
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/net/xferstats/Makefile b/net/xferstats/Makefile
index e47f4e31ac71..18aac8b45017 100644
--- a/net/xferstats/Makefile
+++ b/net/xferstats/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xferstats
-# Version required: 2.13
# Date created: 19 February 1999
# Whom: Dima Sivachenko
#
# $FreeBSD$
#
-DISTNAME= xferstats-2.14
+PORTNAME= xferstats
+PORTVERSION= 2.14
CATEGORIES= net
MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/support/ \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
diff --git a/net/xicq/Makefile b/net/xicq/Makefile
index dee8ff5b30a7..ab772c351d6b 100644
--- a/net/xicq/Makefile
+++ b/net/xicq/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xicq
-# Version required: 12 July 1998
# Date created: 29 June 1998
# Whom: scrappy
#
# $FreeBSD$
#
-DISTNAME= xicq-071298-snapshot.src
-PKGNAME= xicq-071298
+PORTNAME= xicq
+PORTVERSION= 19980712
CATEGORIES= net
MASTER_SITES= http://www.xtrophy.dk/xicq/
+DISTNAME= xicq-071298-snapshot.src
MAINTAINER= scrappy@FreeBSD.org
diff --git a/net/xipmsg/Makefile b/net/xipmsg/Makefile
index 78a49b68d6b6..3b38c9503c32 100644
--- a/net/xipmsg/Makefile
+++ b/net/xipmsg/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xipmsg
-# Version required: 0.8087
# Date created: 29 May 1997
# Whom: candy@fct.kgc.co.jp
#
# $FreeBSD$
#
-DISTNAME= xipmsg-8087
-PKGNAME= xipmsg-0.8087
+PORTNAME= xipmsg
+PORTVERSION= 0.8087
CATEGORIES= net
MASTER_SITES= http://hp.vector.co.jp/authors/VA004959/xipmsg/
+DISTNAME= xipmsg-8087
MAINTAINER= candy@kgc.co.jp
diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index 4d6996b22376..19e06858c331 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: xisp
-# Version required: 2.6
# Date created: June 24, 1999
# Whom: morishim@cig.mot.com
#
# $FreeBSD$
+#
-DISTNAME= xisp-2.6
+PORTNAME= xisp
+PORTVERSION= 2.6
CATEGORIES= net
MASTER_SITES= http://www.ml-search.com/xisp/distfiles/
DISTFILES= xisp-2.6-noufc.tar.gz \
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 645cf86104e5..3758a8f19e29 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xtraceroute
-# Version required: 0.8.14
# Date created: 17 February 2000
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= xtraceroute-0.8.14
+PORTNAME= xtraceroute
+PORTVERSION= 0.8.14
CATEGORIES= net
MASTER_SITES= http://www.dtek.chalmers.se/~d3august/xt/dl/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index 07a19fe051b1..d5cf7a048c63 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xwhois
-# Version required: 0.4.0
# Date created: 31 December 1998
# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
#
# $FreeBSD$
#
-DISTNAME= xwhois-0.4.0
+PORTNAME= xwhois
+PORTVERSION= 0.4.0
CATEGORIES= net
MASTER_SITES= http://c64.org/~nr/ \
http://www.goatnet.ml.org/ \
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index 86fe56628b58..3ca10a5c78ad 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ytalk
-# Version required: 3.1.1
# Date created: 18 March 1995
# Whom: dom@myrddin.demon.co.uk
#
# $FreeBSD$
#
-DISTNAME= ytalk-3.1.1
+PORTNAME= ytalk
+PORTVERSION= 3.1.1
CATEGORIES= net
# This site is very slow, so we use sunsite instead.
#MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/ytalk/
diff --git a/net/zebra-devel/Makefile b/net/zebra-devel/Makefile
index 77c1621fa671..e4a9c0305843 100644
--- a/net/zebra-devel/Makefile
+++ b/net/zebra-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zebra
-# Version required: 0.84b
# Date created: So 31 Mai 1998 11:00:30 CEST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= zebra-0.84b
+PORTNAME= zebra
+PORTVERSION= 0.84b
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/
# you might need debugging, it's a developer release !
diff --git a/net/zebra-pj/Makefile b/net/zebra-pj/Makefile
index 77c1621fa671..e4a9c0305843 100644
--- a/net/zebra-pj/Makefile
+++ b/net/zebra-pj/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zebra
-# Version required: 0.84b
# Date created: So 31 Mai 1998 11:00:30 CEST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= zebra-0.84b
+PORTNAME= zebra
+PORTVERSION= 0.84b
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/
# you might need debugging, it's a developer release !
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 77c1621fa671..e4a9c0305843 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zebra
-# Version required: 0.84b
# Date created: So 31 Mai 1998 11:00:30 CEST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= zebra-0.84b
+PORTNAME= zebra
+PORTVERSION= 0.84b
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/
# you might need debugging, it's a developer release !
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 3a1ea17f4a6b..6dc374329415 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zephry
-# Version required: 2.0.4
# Date created: 1-Aug-1995
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= zephyr-2.0.4
+PORTNAME= zephyr
+PORTVERSION= 2.0.4
CATEGORIES= net
MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/dist/
diff --git a/net/ztelnet/Makefile b/net/ztelnet/Makefile
index c1febcb9628d..4e52f474371b 100644
--- a/net/ztelnet/Makefile
+++ b/net/ztelnet/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: ztelnet
-# Version required: 1.0p3
# Date created: 15 Mar 1998
# Whom: CHOI Junho <junker@jazz.snu.ac.kr>
#
@@ -12,8 +11,8 @@
# Thanks to Carl Mascott <cmascott@world.std.com>
# NOTE: in first post-patch, we can ignore warnings.
-DISTNAME= ztelnet2
-PKGNAME= ztelnet-1.0p3
+PORTNAME= ztelnet
+PORTVERSION= 1.0.p3
CATEGORIES= net
MASTER_SITES= ftp://jazz.snu.ac.kr/pub/unix/util/net/ztelnet/ \
ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/