summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--benchmarks/httperf/Makefile4
-rw-r--r--www/Mosaic/Makefile6
-rw-r--r--www/WebMagick/Makefile5
-rw-r--r--www/adzapper/Makefile4
-rw-r--r--www/amaya/Makefile6
-rw-r--r--www/analog/Makefile5
-rw-r--r--www/aolserver/Makefile6
-rw-r--r--www/apache-jserv/Makefile7
-rw-r--r--www/apache13+ipv6/Makefile6
-rw-r--r--www/apache13-fp/Makefile9
-rw-r--r--www/apache13-modssl/Makefile6
-rw-r--r--www/apache13-ssl/Makefile7
-rw-r--r--www/apache13/Makefile6
-rw-r--r--www/apache2/Makefile6
-rw-r--r--www/apache20/Makefile6
-rw-r--r--www/apache21/Makefile6
-rw-r--r--www/apache22/Makefile6
-rw-r--r--www/arena/Makefile6
-rw-r--r--www/ashe/Makefile4
-rw-r--r--www/aswedit/Makefile6
-rw-r--r--www/bacon/Makefile12
-rw-r--r--www/bkmrkconv/Makefile6
-rw-r--r--www/bluefish/Makefile4
-rw-r--r--www/boa/Makefile4
-rw-r--r--www/bsdi-netscape47-communicator/Makefile1
-rw-r--r--www/bsdi-netscape47-navigator/Makefile1
-rw-r--r--www/cadaver/Makefile4
-rw-r--r--www/calamaris/Makefile4
-rw-r--r--www/cgi-lib/Makefile6
-rw-r--r--www/cgic/Makefile6
-rw-r--r--www/cgihtml/Makefile4
-rw-r--r--www/cgiparse/Makefile4
-rw-r--r--www/cgiwrap/Makefile4
-rw-r--r--www/checkbot/Makefile4
-rw-r--r--www/chimera/Makefile4
-rw-r--r--www/chimera2/Makefile4
-rw-r--r--www/comline/Makefile5
-rw-r--r--www/css-mode.el/Makefile6
-rw-r--r--www/decss/Makefile6
-rw-r--r--www/demoroniser/Makefile6
-rw-r--r--www/djvuplugin/Makefile6
-rw-r--r--www/elinks-devel/Makefile4
-rw-r--r--www/elinks/Makefile4
-rw-r--r--www/erwn/Makefile6
-rw-r--r--www/evg/Makefile5
-rw-r--r--www/fcgi/Makefile4
-rw-r--r--www/fhttpd/Makefile4
-rw-r--r--www/flashplugin/Makefile6
-rw-r--r--www/fxhtml/Makefile6
-rw-r--r--www/g-gcl/Makefile4
-rw-r--r--www/gn/Makefile4
-rw-r--r--www/gnuinfo/Makefile4
-rw-r--r--www/gnujsp/Makefile4
-rw-r--r--www/grail/Makefile6
-rw-r--r--www/harvest/Makefile4
-rw-r--r--www/hotjava/Makefile6
-rw-r--r--www/htmlpp/Makefile6
-rw-r--r--www/http-analyze/Makefile6
-rw-r--r--www/httperf/Makefile4
-rw-r--r--www/httptunnel/Makefile4
-rw-r--r--www/hypermail/Makefile6
-rw-r--r--www/indexme/Makefile6
-rw-r--r--www/jesred/Makefile6
-rw-r--r--www/junkbuster-zlib/Makefile6
-rw-r--r--www/junkbuster/Makefile6
-rw-r--r--www/kdreamsite/Makefile4
-rw-r--r--www/kwebsearch/Makefile4
-rw-r--r--www/libghttp/Makefile4
-rw-r--r--www/libwww/Makefile6
-rw-r--r--www/libxpg4-ns/Makefile6
-rw-r--r--www/linbot/Makefile4
-rw-r--r--www/linemode/Makefile1
-rw-r--r--www/links/Makefile4
-rw-r--r--www/linux-flashplugin/Makefile6
-rw-r--r--www/linux-netscape4/Makefile6
-rw-r--r--www/linux-netscape47-communicator/Makefile4
-rw-r--r--www/linux-netscape47-navigator/Makefile1
-rw-r--r--www/linux-netscape6/Makefile4
-rw-r--r--www/lynx-current/Makefile6
-rw-r--r--www/lynx-ssl/Makefile6
-rw-r--r--www/lynx/Makefile6
-rw-r--r--www/mapedit/Makefile6
-rw-r--r--www/marc-search/Makefile6
-rw-r--r--www/mathopd/Makefile4
-rw-r--r--www/mhonarc/Makefile6
-rw-r--r--www/mod_dav/Makefile8
-rw-r--r--www/mod_dtcl/Makefile6
-rw-r--r--www/mod_perl/Makefile4
-rw-r--r--www/mod_perl2/Makefile4
-rw-r--r--www/mod_php3/Makefile5
-rw-r--r--www/mod_php4/Makefile5
-rw-r--r--www/mod_php5/Makefile5
-rw-r--r--www/momspider/Makefile6
-rw-r--r--www/mozilla+ipv6/Makefile6
-rw-r--r--www/mozilla-devel/Makefile6
-rw-r--r--www/mozilla-vendor/Makefile6
-rw-r--r--www/mozilla/Makefile6
-rw-r--r--www/netscape-remote/Makefile5
-rw-r--r--www/netscape3-gold/Makefile4
-rw-r--r--www/netscape3/Makefile4
-rw-r--r--www/netscape4-communicator.us/Makefile6
-rw-r--r--www/netscape4-communicator/Makefile4
-rw-r--r--www/netscape4-navigator/Makefile1
-rw-r--r--www/netscape47-communicator/Makefile1
-rw-r--r--www/netscape47-navigator/Makefile1
-rw-r--r--www/netscape48-communicator/Makefile4
-rw-r--r--www/netscape7/Makefile4
-rw-r--r--www/npc/Makefile4
-rw-r--r--www/nscache/Makefile7
-rw-r--r--www/p5-Apache-ASP/Makefile6
-rw-r--r--www/p5-Apache-DBI/Makefile6
-rw-r--r--www/p5-Apache-Radius/Makefile6
-rw-r--r--www/p5-Apache-Session/Makefile6
-rw-r--r--www/p5-Apache/Makefile6
-rw-r--r--www/p5-CGI-FastTemplate/Makefile6
-rw-r--r--www/p5-CGI-modules/Makefile6
-rw-r--r--www/p5-CGI/Makefile6
-rw-r--r--www/p5-CGI_Lite/Makefile6
-rw-r--r--www/p5-FastCGI/Makefile6
-rw-r--r--www/p5-HTML-Embperl/Makefile6
-rw-r--r--www/p5-HTML-Parser/Makefile6
-rw-r--r--www/p5-HTML-QuickCheck/Makefile6
-rw-r--r--www/p5-HTML-Stream/Makefile6
-rw-r--r--www/p5-HTML-Summary/Makefile6
-rw-r--r--www/p5-HTML-TableLayout/Makefile6
-rw-r--r--www/p5-HTML-Tree/Makefile6
-rw-r--r--www/p5-HTML/Makefile6
-rw-r--r--www/p5-HTTPD-Tools/Makefile6
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile6
-rw-r--r--www/p5-ParallelUA/Makefile7
-rw-r--r--www/p5-WWW-Search/Makefile6
-rw-r--r--www/p5-libapreq/Makefile6
-rw-r--r--www/p5-libwww/Makefile7
-rw-r--r--www/plugger/Makefile4
-rw-r--r--www/publicfile/Makefile4
-rw-r--r--www/py-HTMLgen/Makefile6
-rw-r--r--www/qdecoder/Makefile4
-rw-r--r--www/roxen/Makefile6
-rw-r--r--www/ruboard/Makefile8
-rw-r--r--www/screem-devel/Makefile4
-rw-r--r--www/screem/Makefile4
-rw-r--r--www/seamonkey/Makefile6
-rw-r--r--www/seamonkey2/Makefile6
-rw-r--r--www/sitecopy/Makefile4
-rw-r--r--www/smb_auth/Makefile4
-rw-r--r--www/snarf/Makefile4
-rw-r--r--www/squid/Makefile8
-rw-r--r--www/squid22/Makefile7
-rw-r--r--www/squid23/Makefile8
-rw-r--r--www/squid24/Makefile8
-rw-r--r--www/squid25/Makefile8
-rw-r--r--www/squid26/Makefile8
-rw-r--r--www/squid27/Makefile8
-rw-r--r--www/squid30/Makefile8
-rw-r--r--www/squid31/Makefile8
-rw-r--r--www/squidclients/Makefile6
-rw-r--r--www/squidtimes/Makefile6
-rw-r--r--www/squirm/Makefile6
-rw-r--r--www/swish-e/Makefile6
-rw-r--r--www/thttpd/Makefile4
-rw-r--r--www/tidy-devel/Makefile6
-rw-r--r--www/tidy/Makefile6
-rw-r--r--www/tinyproxy/Makefile4
-rw-r--r--www/transproxy/Makefile4
-rw-r--r--www/udmsearch/Makefile4
-rw-r--r--www/vrweb/Makefile4
-rw-r--r--www/w3-4/Makefile8
-rw-r--r--www/w3/Makefile8
-rw-r--r--www/w3c-httpd/Makefile4
-rw-r--r--www/w3m-ssl/Makefile6
-rw-r--r--www/w3m/Makefile4
-rw-r--r--www/w3mir/Makefile4
-rw-r--r--www/wcol/Makefile6
-rw-r--r--www/web500gw/Makefile4
-rw-r--r--www/webalizer-2/Makefile7
-rw-r--r--www/webalizer/Makefile7
-rw-r--r--www/webcheck/Makefile4
-rw-r--r--www/webcopy/Makefile7
-rw-r--r--www/webcrawl/Makefile4
-rw-r--r--www/webfs/Makefile4
-rw-r--r--www/webglimpse/Makefile7
-rw-r--r--www/weblint/Makefile4
-rw-r--r--www/webstone/Makefile20
-rw-r--r--www/wml/Makefile4
-rw-r--r--www/wmnetselect/Makefile4
-rw-r--r--www/wn/Makefile4
-rw-r--r--www/wwwcount/Makefile6
-rw-r--r--www/wwwoffle/Makefile4
-rw-r--r--www/wwwstat/Makefile6
-rw-r--r--www/xitami/Makefile6
-rw-r--r--www/zope/Makefile19
-rw-r--r--www/zope210/Makefile19
-rw-r--r--www/zope211/Makefile19
-rw-r--r--www/zope213/Makefile19
-rw-r--r--www/zope28/Makefile19
-rw-r--r--www/zope29/Makefile19
196 files changed, 563 insertions, 575 deletions
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index a6f86ad2ed45..79f98f612762 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: httperf
-# Version required: 0.6
# Date created: 28 Jul 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= httperf-0.6
+PORTNAME= httperf
+PORTVERSION= 0.6
CATEGORIES= www
MASTER_SITES= ftp://ftp.hpl.hp.com/pub/httperf/
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 2f829aebbb55..d072a945f04c 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Mosaic browser
-# Version required: 2.7b5
# Date created: 7 August 1995
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= Mosaic-src-2.7b5
-PKGNAME= mosaic-2.7b5
+PORTNAME= mosaic
+PORTVERSION= 2.7b5
CATEGORIES= www
MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/
+DISTNAME= Mosaic-src-2.7b5
MAINTAINER= ports@FreeBSD.org
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index b961eaf685d1..c3812807fb97 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: WebMagick
-# http://www.simplesystems.org/WebMagick/
-# Version required: 1.4*
# Date created: 20 May 1998
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= WebMagick-1.46
+PORTNAME= WebMagick
+PORTVERSION= 1.46
CATEGORIES= www graphics
MASTER_SITES= ftp://ftp.simplesystems.org/pub/WebMagick/
diff --git a/www/adzapper/Makefile b/www/adzapper/Makefile
index 9cd8635ef9c5..cabdce771915 100644
--- a/www/adzapper/Makefile
+++ b/www/adzapper/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: adzapper
-# Version required: 0.1.30
# Date created: 01 Oct 1999
# Whom: Dominik Rothert <dr@domix.de>
#
# $FreeBSD$
#
-DISTNAME= adzapper-0.1.30
+PORTNAME= adzapper
+PORTVERSION= 0.1.30
CATEGORIES= www
MASTER_SITES= http://www.halcyon.com/adamf/adzapper/
EXTRACT_SUFX= .tgz
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 80e7581130e5..f18e4bc42040 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: amaya
-# Version required: 2.4
# Date created: 26 Dec 1998
# Whom: Don Croyle <croyle@gelemna.ft-wayne.in.us>
#
# $FreeBSD$
#
-DISTNAME= amaya-src-2.4
-PKGNAME= amaya-2.4
+PORTNAME= amaya
+PORTVERSION= 2.4
CATEGORIES= www
MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
ftp://ftp.w3.org/pub/amaya/ \
ftp://mirror.aarnet.edu.au/pub/amaya/
+DISTNAME= ${PORTNAME}-src-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= croyle@gelemna.ft-wayne.in.us
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 071bbfbf4c9c..2c3d69578930 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: analog
-# http://www.analog.cx/
-# Version required: 4.*
# Date created: October 21st 1996
# Whom: jfitz
#
# $FreeBSD$
#
-DISTNAME= analog-4.04
+PORTNAME= analog
+PORTVERSION= 4.04
CATEGORIES= www
MASTER_SITES= http://www.analog.cx/ \
http://brendanr.simplenet.com/analog/ \
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index 445f3c5afbff..b5f91c83953b 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: aolserver
-# Version required: 3.0b6
# Date created: 13 January 2000
# Whom: Matt Braithwaite <mab@red-bean.com>
#
# $FreeBSD$
#
-DISTNAME= as3b61
-PKGNAME= aolserver-3.0b6.1
+PORTNAME= aolserver
+PORTVERSION= 3.0.b6.1
CATEGORIES= www
MASTER_SITES= http://aolserver.com/download/3.0b61/
+DISTNAME= as3b61
EXTRACT_SUFX= .src.tgz
MAINTAINER= mab@red-bean.com
diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile
index e6a04957ae13..319fdc31ee49 100644
--- a/www/apache-jserv/Makefile
+++ b/www/apache-jserv/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: apache mod_jserv
-# Version required: 1.1
# Date created: 1999/05/29
# Whom: Kensaku Masuda <greg@greg.rim.or.jp>
#
# $FreeBSD$
+#
-DISTNAME= ApacheJServ-1.1
-PKGNAME= apache-jserv-1.1
+PORTNAME= apache-jserv
+PORTVERSION= 1.1
CATEGORIES= www java
MASTER_SITES= http://java.apache.org/jserv/dist/
+DISTNAME= ApacheJServ-1.1
MAINTAINER= greg@greg.rim.or.jp
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 28dab55a2ff8..c1b0bec56d33 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: apache HTTPD
-# Version required: 1.3*
# Date created: Fri Feb 18 03:04:36 JST 2000
# Whom: sumikawa
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.11
-PKGNAME= apache+ipv6-1.3.11
+PORTNAME= apache+ipv6
+PORTVERSION= 1.3.11
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -24,6 +23,7 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME= apache_1.3.11
#put the below patch as patch-am
#PATCH_SITES= http://www.apache.org/info/css-security/
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 3a53c927fb69..003fa629082f 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: apache HTTPD w/FrontPage Module
-# Version required: 1.3* 3.0.4 (3.0.2.1330)
# Date created: Sat Oct 31 16:30:00 CDT 1997
# Whom: hetzels@westbend.net
#
# $FreeBSD$
#
-DISTNAME= apache_${AP_VERS}
-PKGNAME= apache_fp-${AP_VERS}
+PORTNAME= apache_fp
+PORTVERSION= 1.3.12
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.microsoft.com/products/frontpage/ \
@@ -28,14 +27,14 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME= apache_1.3.12
DISTFILES= ${APACHE} ${FRONTPAGE} powerlogo.gif fplogo.gif
MAINTAINER= hetzels@westbend.net
-#PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${AP_VERS}/
+#PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${PORTVERSION}/
#PATCHFILES=
-AP_VERS= 1.3.12
APACHE= ${DISTNAME}${EXTRACT_SUFX}
FRONTPAGE= fp40.bsdi.tar.Z
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 795115b42e8a..af5016d9e4d7 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Apache + mod_ssl
-# Version required: 1.3.12 + 2.6.2
# Date created: Sat Aug 22 12:00:00 CDT 1998
# Whom: rse@engelschall.com
#
# $FreeBSD$
#
-DISTNAME= apache_${VERSION_APACHE}
-PKGNAME= apache+mod_ssl-${VERSION_APACHE}+${VERSION_MODSSL}
+PORTNAME= apache+mod_ssl
+PORTVERSION= ${VERSION_APACHE}+${VERSION_MODSSL}
CATEGORIES= www security
MASTER_SITES= http://www.apache.org/dist/ \
http://www.modssl.org/source/ \
@@ -36,6 +35,7 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME= apache_1.3.12
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index c2e20e136e19..7c6bbdbc4593 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: apache-ssl HTTPSD
-# Version required: 1.2.x+
# Date created: 8th November, 1998
# Whom: Adam Laurie <adam@algroup.co.uk>
# based on apache port by ache@nagual.pp.ru
@@ -11,8 +10,8 @@
APACHE= 1.3.9
APACHE-SSL= 1.37
-DISTNAME= apache_${APACHE}
-PKGNAME= apache+ssl-${APACHE}+${APACHE-SSL}
+PORTNAME= apache+ssl
+PORTVERSION= ${APACHE}+${APACHE-SSL}
CATEGORIES= www security
MASTER_SITES= ftp://www.apache.org/dist/ \
ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
@@ -31,7 +30,7 @@ MASTER_SITES= ftp://www.apache.org/dist/ \
ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/
Y2K= http://www.apache-ssl.org/#Y2K
-
+DISTNAME= apache_${APACHE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX}
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index d81c6e81af7c..045724585ad0 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: apache HTTPD
-# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.12
-PKGNAME= apache-1.3.12
+PORTNAME= apache
+PORTVERSION= 1.3.12
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -24,6 +23,7 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME= ${PORTNAME_${PORTVERSION}
MAINTAINER= ache@freebsd.org
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index d81c6e81af7c..045724585ad0 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: apache HTTPD
-# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.12
-PKGNAME= apache-1.3.12
+PORTNAME= apache
+PORTVERSION= 1.3.12
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -24,6 +23,7 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME= ${PORTNAME_${PORTVERSION}
MAINTAINER= ache@freebsd.org
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index d81c6e81af7c..045724585ad0 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: apache HTTPD
-# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.12
-PKGNAME= apache-1.3.12
+PORTNAME= apache
+PORTVERSION= 1.3.12
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -24,6 +23,7 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME= ${PORTNAME_${PORTVERSION}
MAINTAINER= ache@freebsd.org
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index d81c6e81af7c..045724585ad0 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: apache HTTPD
-# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.12
-PKGNAME= apache-1.3.12
+PORTNAME= apache
+PORTVERSION= 1.3.12
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -24,6 +23,7 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME= ${PORTNAME_${PORTVERSION}
MAINTAINER= ache@freebsd.org
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index d81c6e81af7c..045724585ad0 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: apache HTTPD
-# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.12
-PKGNAME= apache-1.3.12
+PORTNAME= apache
+PORTVERSION= 1.3.12
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -24,6 +23,7 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
+DISTNAME= ${PORTNAME_${PORTVERSION}
MAINTAINER= ache@freebsd.org
diff --git a/www/arena/Makefile b/www/arena/Makefile
index adb365e6317f..96b1d24375e7 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: arena
-# Version required: i18n beta-3b
# Date created: Dec 1 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= arena-CJK-beta3a
-PKGNAME= arena-i18n-beta3b
+PORTNAME= arena-i18n
+PORTVERSION= beta3b
CATEGORIES= www
MASTER_SITES= ftp://ftp-eu.w3.org/pub/Arena/beta-3/
+DISTNAME= arena-CJK-beta3a
MAINTAINER= ache@FreeBSD.org
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index 4c96746f0fe2..fc448e2d6753 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ashe
-# Version required: 1.1.2
# Date created: 16 October 1995
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= ashe-1.1.2
+PORTNAME= ashe
+PORTVERSION= 1.1.2
CATEGORIES= www
MASTER_SITES= ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/src/ \
ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/libcci/ \
diff --git a/www/aswedit/Makefile b/www/aswedit/Makefile
index 00deedeffddd..8f705f6ef6d9 100644
--- a/www/aswedit/Makefile
+++ b/www/aswedit/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: asWedit
-# Version required: 4.0
# Date created: 25 June 1997
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= asWedit-4.0-i386.linux
-PKGNAME= asWedit-4.0.1
+PORTNAME= asWedit
+PORTVERSION= 4.0.1
CATEGORIES= editors www linux
MASTER_SITES= http://www.advasoft.com/asWedit/ \
ftp://sunsite.doc.ic.ac.uk/packages/www/asWedit/ \
ftp://sunsite.auc.dk/pub/infosystems/www/asWedit/ \
ftp://sunsite.icm.edu.pl/pub/www/asWedit/
+DISTNAME= asWedit-4.0-i386.linux
MAINTAINER= brett@peloton.runet.edu
diff --git a/www/bacon/Makefile b/www/bacon/Makefile
index cdc1020f8733..070f9e1cc5c9 100644
--- a/www/bacon/Makefile
+++ b/www/bacon/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: bacon
-# Version required: 1.1b
# Date created: 9 September 1999
# Whom: Justin Robinson <jmrobins@samurai.ruin.org>
#
# $FreeBSD$
#
-DISTNAME= bacon-1.071999
-CATEGORIES= www
-MASTER_SITES= ftp://samurai.ruin.org/pub/All/
+PORTNAME= bacon
+PORTVERSION= 1.071999
+CATEGORIES= www
+MASTER_SITES= ftp://samurai.ruin.org/pub/All/
-MAINTAINER= jmrobins@samurai.ruin.org
+MAINTAINER= jmrobins@samurai.ruin.org
-USE_PERL5= YES
+USE_PERL5= YES
DIST= bacon.pl
diff --git a/www/bkmrkconv/Makefile b/www/bkmrkconv/Makefile
index 9eaa149514a0..95269ca78813 100644
--- a/www/bkmrkconv/Makefile
+++ b/www/bkmrkconv/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: bkmrkconv
-# Version required: 1.08
# Date created: 18 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= bkmrkconv
-PKGNAME= bkmrkconv-1.08
+PORTNAME= bkmrkconv
+PORTVERSION= 1.08
CATEGORIES= www
MASTER_SITES= http://www.dcs.warwick.ac.uk/~csube/bkmrkconv/
+DISTNAME= ${PORTNAME}
MAINTAINER= will@FreeBSD.org
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index e16fbc41e43a..456f722a84e6 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bluefish
-# Version required: 0.3.6
# Date created: 25 July 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bluefish-0.3.6
+PORTNAME= bluefish
+PORTVERSION= 0.3.6
CATEGORIES= www editors
MASTER_SITES= http://bluefish.linuxave.net/download/ \
http://student.wau.nl/~olivier/bluefish/download/
diff --git a/www/boa/Makefile b/www/boa/Makefile
index acfc7e1912e9..61eb6a9a12fb 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: boa
-# Version required: 0.92
# Date created: 21 May 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= boa-0.92
+PORTNAME= boa
+PORTVERSION= 0.92
CATEGORIES= www
MASTER_SITES= http://www.boa.org/
diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index f8d970d202cb..e7a06b870bde 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: netscape (communicator suite)
-# Version required: 4.7*
# Date created: 24 Feb 1997
# Whom: thepish
#
diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index c1db314f6013..43c32b1762af 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: netscape (navigator only)
-# Version required: 4.7
# Date created: 20 Sept 1998
# Whom: brett@peloton.physics.montana.edu
#
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 35a2a439f7c3..162a840a49f1 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cadaver
-# Version required: 0.10.0
# Date created: 13 January 2000
# Whom: Alex Povolotsky <tarkhil@over.ru>
#
# $FreeBSD$
#
-DISTNAME= cadaver-0.10.0
+PORTNAME= cadaver
+PORTVERSION= 0.10.0
CATEGORIES= www
MASTER_SITES= http://www.webdav.org/cadaver/
diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile
index cdf5ed4eda50..4bbf045b06e1 100644
--- a/www/calamaris/Makefile
+++ b/www/calamaris/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: calmaris
-# Version required: 2.29
# Date created: 25 December 1998
# Whom: Dima Sivachenko
#
# $FreeBSD$
#
-DISTNAME= calamaris-2.29
+PORTNAME= calamaris
+PORTVERSION= 2.29
CATEGORIES= www textproc
MASTER_SITES= http://calamaris.cord.de/ \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
diff --git a/www/cgi-lib/Makefile b/www/cgi-lib/Makefile
index 98847095c055..61c94d35963c 100644
--- a/www/cgi-lib/Makefile
+++ b/www/cgi-lib/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libcgi
-# Version required: 1.3
# Date created: 7 January 2000
# Whom: Sergey Samoyloff <gonza@techline.ru>
#
# $FreeBSD$
#
-DISTNAME= cgi-lib
-PKGNAME= cgi-lib-1.3
+PORTNAME= cgi-lib
+PORTVERSION= 1.3
CATEGORIES= www
MASTER_SITES= http://www.geocities.com/SiliconValley/Vista/6493/projects/code/
+DISTNAME= ${PORTNAME}
MAINTAINER= gonza@techline.ru
diff --git a/www/cgic/Makefile b/www/cgic/Makefile
index 63f8cf7d6ca8..6b494a82a947 100644
--- a/www/cgic/Makefile
+++ b/www/cgic/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libcgic
-# Version required: 1.06
# Date created: 27 July 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= cgic106
-PKGNAME= cgic-1.06
+PORTNAME= cgic
+PORTVERSION= 1.06
CATEGORIES= www
MASTER_SITES= http://www.boutell.com/cgic/
+DISTNAME= ${PORTNAME}106
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile
index a4b8c67f7bc7..f76120221a74 100644
--- a/www/cgihtml/Makefile
+++ b/www/cgihtml/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cgihtml
-# Version required: 1.69
# Date created: 3 Nov 1997
# Whom: Ian Vaudrey <i.vaudrey@bigfoot.com>
#
# $FreeBSD$
#
-DISTNAME= cgihtml-1.69
+PORTNAME= cgihtml
+PORTVERSION= 1.69
CATEGORIES= devel www
MASTER_SITES= ftp://ftp.eekim.com/pub/users/eekim/cgihtml/
diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
index 1d662fa5e33a..0b22db9bf3e2 100644
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cgiparse
-# Version required: 0.8e
# Date created: 30 March 1997
# Whom: jmg
#
# $FreeBSD$
#
-DISTNAME= cgiparse-0.8e
+PORTNAME= cgiparse
+PORTVERSION= 0.8e
CATEGORIES= devel
MASTER_SITES= http://resnet.uoregon.edu/~gurney_j/ \
http://d182-89.uoregon.edu/~jmg/
diff --git a/www/cgiwrap/Makefile b/www/cgiwrap/Makefile
index 1a0f4c642f3d..4c684e34acce 100644
--- a/www/cgiwrap/Makefile
+++ b/www/cgiwrap/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cgiwrap
-# Version required: 3.6.1
# Date created: 30 July 1998
# Whom: Brent J. Nordquist <bjn@visi.com>
#
# $FreeBSD$
#
-DISTNAME= cgiwrap-3.6.3
+PORTNAME= cgiwrap
+PORTVERSION= 3.6.3
CATEGORIES= www
MASTER_SITES= http://www.unixtools.org/cgiwrap/dist/ \
ftp://ftp.umr.edu/pub/cgi/cgiwrap/ \
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index 4fc177fdb664..da1a8a04c271 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: checkbot
-# Version required: 1.57
# Date created: 2. Feb 1998
# Whom: wosch@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= checkbot-1.57
+PORTNAME= checkbot
+PORTVERSION= 1.57
CATEGORIES= www perl5
MASTER_SITES= http://www.xs4all.nl/~graaff/checkbot/ \
http://www.de.freebsd.org/~wosch/src/
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index df255f223f55..4685a7998191 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: chimera
-# Version required: 1.70p0
# Date created: 26 December 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= chimera-1.70p0
+PORTNAME= chimera
+PORTVERSION= 1.70p0
CATEGORIES= www
MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera/
diff --git a/www/chimera2/Makefile b/www/chimera2/Makefile
index 699f87eb417f..86e7232c2a52 100644
--- a/www/chimera2/Makefile
+++ b/www/chimera2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: chimera
-# Version required: 2.0a15
# Date created: 24 Nov 1997
# Whom: Bruce Gingery <bgingery@gtcs.com>
#
# $FreeBSD$
#
-DISTNAME= chimera-2.0a19
+PORTNAME= chimera
+PORTVERSION= 2.0a19
CATEGORIES= www
MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera-alpha/ \
ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/chimera/ \
diff --git a/www/comline/Makefile b/www/comline/Makefile
index f02df03f2a92..412168f0be38 100644
--- a/www/comline/Makefile
+++ b/www/comline/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: comline
-# Version required: 4.0D
# Date created: 9 Dec 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= WWW
-PKGNAME= comline-4.0D
+PORTNAME= comline
+PORTVERSION= 4.0D
CATEGORIES= www
MASTER_SITES= ftp://ftp.w3.org/pub/old/comline/ \
ftp://ftp.w3.org/pub/libwww/old/ \
diff --git a/www/css-mode.el/Makefile b/www/css-mode.el/Makefile
index 4ef71cb10f65..491388f40685 100644
--- a/www/css-mode.el/Makefile
+++ b/www/css-mode.el/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: css-mode.el
-# Version required: 0.10
# Date created: 21 October 1999
# Whom: Shigeyuki Fukushima <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= css-mode.el
-PKGNAME= css-mode-elisp-0.10
+PORTNAME= css-mode-elisp
+PORTVERSION= 0.10
CATEGORIES= www elisp
MASTER_SITES= http://www.stud.ifi.uio.no/~lmariusg/download/
+DISTNAME= css-mode.el
MAINTAINER= shige@FreeBSD.org
diff --git a/www/decss/Makefile b/www/decss/Makefile
index cc6741ea9393..5f6d66e16694 100644
--- a/www/decss/Makefile
+++ b/www/decss/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: decss
-# Version required: 1.0
# Date Created: 20 Feb 2000
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= decss
-PKGNAME= decss-1.0
+PORTNAME= decss
+PORTVERSION= 1.0
CATEGORIES= www perl5
MASTER_SITES= http://www.totse.com/DeCSS/
+DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/demoroniser/Makefile b/www/demoroniser/Makefile
index f864198c926d..41d40b96f208 100644
--- a/www/demoroniser/Makefile
+++ b/www/demoroniser/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: demoroniser
-# Version required: 1.0
# Date created: 07 August 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= demoroniser
-PKGNAME= demoroniser-1.0
+PORTNAME= demoroniser
+PORTVERSION= 1.0
CATEGORIES= www
MASTER_SITES= http://www.fourmilab.ch/webtools/demoroniser/ \
http://people.FreeBSD.org/~jedgar/distfiles/
+DISTNAME= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
diff --git a/www/djvuplugin/Makefile b/www/djvuplugin/Makefile
index 26f53a1542f1..5e4e939f94ed 100644
--- a/www/djvuplugin/Makefile
+++ b/www/djvuplugin/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: djvuplugin
-# Version required: 0.9
# Date created: 21 Jul 1999
# Whom: Mikhail Teterin <mi@aldan.algebra.com>
#
# $FreeBSD$
#
-DISTNAME= npdjvu-freebsd
-PKGNAME= djvuplugin-0.9
+PORTNAME= djvuplugin
+PORTVERSION= 0.9
CATEGORIES= www graphics
MASTER_SITES= http://www.djvu.com/products/plugin/unix/
+DISTNAME= npdjvu-freebsd
MAINTAINER= mi@aldan.algebra.com
diff --git a/www/elinks-devel/Makefile b/www/elinks-devel/Makefile
index 1b33158e9d65..747c55d541d6 100644
--- a/www/elinks-devel/Makefile
+++ b/www/elinks-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: links
-# Version required: 0.84
# Date created: 21 January 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= links-0.84
+PORTNAME= links
+PORTVERSION= 0.84
CATEGORIES= www
MASTER_SITES= http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/ \
http://www.add.com.pl/links/download/
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 1b33158e9d65..747c55d541d6 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: links
-# Version required: 0.84
# Date created: 21 January 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= links-0.84
+PORTNAME= links
+PORTVERSION= 0.84
CATEGORIES= www
MASTER_SITES= http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/ \
http://www.add.com.pl/links/download/
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 540d0faacec7..087c2877611d 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: erwin
-# Version required: 0.3.1
# Date created: 31 July 1999
# Whom: Jim Mock <jimFreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= erwin-0.3.1
-PKGNAME= erwn-0.3.1
+PORTNAME= erwn
+PORTVERSION= 0.3.1
CATEGORIES= www editors
MASTER_SITES= http://www-stud.fht-esslingen.de/erwin/
+DISTNAME= erwin-${PORTNAME}
MAINTAINER= jim@FreeBSD.org
diff --git a/www/evg/Makefile b/www/evg/Makefile
index abde22ffd938..d115be2c8a30 100644
--- a/www/evg/Makefile
+++ b/www/evg/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: evg
-# Version required: 1.0.1
# Date created: 19 April 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= evg-1.01
-PKGNAME= evg-1.0.1
+PORTNAME= evg
+PORTVERSION= 1.01
CATEGORIES= www
MASTER_SITES= ftp://ftp.uni-klu.ac.at/pub/projects/evg/ \
http://www.chg.ru/~dima/
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index c20014981d34..92b8b2278479 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fcgi-devkit
-# Version required: 2.1
# Date created: 13 May 1999
# Whom: kbyanc
#
# $FreeBSD$
#
-DISTNAME= fcgi-devkit-2.1
+PORTNAME= fcgi-devkit
+PORTVERSION= 2.1
CATEGORIES= www
MASTER_SITES= http://fastcgi.idle.com/dist/
diff --git a/www/fhttpd/Makefile b/www/fhttpd/Makefile
index a53dcda149d6..314c67ce7e01 100644
--- a/www/fhttpd/Makefile
+++ b/www/fhttpd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fhttpd
-# Version required: 0.4.2
# Date created: 21 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= fhttpd-0.4.2
+PORTNAME= fhttpd
+PORTVERSION= 0.4.2
CATEGORIES= www
MASTER_SITES= ftp://ftp.fhttpd.org/
diff --git a/www/flashplugin/Makefile b/www/flashplugin/Makefile
index d54c04bc5888..93c4ac00b403 100644
--- a/www/flashplugin/Makefile
+++ b/www/flashplugin/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: flashplugin
-# Version required: 0.4.3
# Date created: 3 October 1999
# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
#
# $FreeBSD$
#
-DISTNAME= flash-0.4.3
-PKGNAME= flashplugin-0.4.3
+PORTNAME= flashplugin
+PORTVERSION= 0.4.3
CATEGORIES= www graphics
MASTER_SITES= http://www.geocities.com/TimesSquare/Labyrinth/5084/flash/Linux/ \
http://perso.club-internet.fr/odebon/flash/Linux/
+DISTNAME= flash-${PORTVERSION}
EXTRACT_SUFX= .tgz
PATCH_SITES= http://leed.t.u-tokyo.ac.jp/~yamagata/flash/
diff --git a/www/fxhtml/Makefile b/www/fxhtml/Makefile
index c37931f27fc2..3f09ffbd0e7a 100644
--- a/www/fxhtml/Makefile
+++ b/www/fxhtml/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: fxhtml
-# Version required: 1.6.7
# Date created: 21 August 1994
# Whom: Trefor S. <trefor@flevel.co.uk>
#
# $FreeBSD$
#
-DISTNAME= fxhtml-freebsd-1.6.7
-PKGNAME= fxhtml-1.6.7
+PORTNAME= fxhtml
+PORTVERSION= 1.6.7
CATEGORIES= www
MASTER_SITES= ftp://ftp.flevel.co.uk/pub/fxhtml/
+DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/g-gcl/Makefile b/www/g-gcl/Makefile
index f3058519b5a1..a1b78818f35f 100644
--- a/www/g-gcl/Makefile
+++ b/www/g-gcl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: g-gcl
-# Version required: 1.10
# Date created: 21 Jun 1999
# Whom: G. Adam Stanislav <adam@whizkidtech.net>
#
# $FreeBSD$
#
-DISTNAME= g-gcl-1.10
+PORTNAME= g-gcl
+PORTVERSION= 1.10
CATEGORIES= www graphics
MASTER_SITES= ftp://ftp.whizkidtech.net/cgi/gcl/ \
http://www.whizkidtech.net/gcl/
diff --git a/www/gn/Makefile b/www/gn/Makefile
index 599afa75be40..da6cd5807d43 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gn
-# Version required: 2.24
# Date created: 20 Sep 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= gn-2.24
+PORTNAME= gn
+PORTVERSION= 2.24
CATEGORIES= www net
MASTER_SITES= ftp://ftp.acns.nwu.edu/pub/gn/
diff --git a/www/gnuinfo/Makefile b/www/gnuinfo/Makefile
index 6ab671a79f4e..c3c6f3bf9611 100644
--- a/www/gnuinfo/Makefile
+++ b/www/gnuinfo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnuinfo
-# Version required: 1.3
# Date created: Tue Oct 12 00:02:04 MET DST 1999
# Whom: Juergen Lock <nox@jelal.kn-bremen.de>
#
# $FreeBSD$
#
-DISTNAME= gnuinfo-1.3
+PORTNAME= gnuinfo
+PORTVERSION= 1.3
CATEGORIES= www
MASTER_SITES= http://user.cs.tu-berlin.de/~kraxel/info2html/
diff --git a/www/gnujsp/Makefile b/www/gnujsp/Makefile
index e5b25bc5e1d1..b26516690181 100644
--- a/www/gnujsp/Makefile
+++ b/www/gnujsp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnujsp
-# Version required: 0.9.10
# Date created: 1999-07-15
# Whom: Palle Girgensohn <girgen@partitur.se>
#
# $FreeBSD$
#
-DISTNAME= gnujsp-1.0.0
+PORTNAME= gnujsp
+PORTVERSION= 1.0.0
CATEGORIES= www java
MASTER_SITES= http://www.klomp.org/gnujsp/downloads/
diff --git a/www/grail/Makefile b/www/grail/Makefile
index 5604c573dde4..2ae6432b6aa9 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -1,15 +1,15 @@
# Ports collection Makefile for: Grail
-# Version required: 0.5
# Date created: 1/11/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= grail-06
-PKGNAME= grail-0.6
+PORTNAME= grail
+PORTVERSION= 0.6
CATEGORIES= www python
MASTER_SITES= http://grail.cnri.reston.va.us/grail/source/
+DISTNAME= ${PORTNAME}-06
EXTRACT_SUFX= .tgz
MAINTAINER= nectar@freebsd.org
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 7f58fd483cc2..cc8f5e21e9b8 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: harvest
-# Version required: 1.4.pl2
# Date created: Fri Mar 1 19:43:52 MET 1996
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= harvest-1.5
+PORTNAME= harvest
+PORTVERSION= 1.5
CATEGORIES= www
MASTER_SITES= ftp://ftp.tardis.ed.ac.uk/pub/harvest/ \
ftp://nic.nasa.gov/software/harvest-dist/ \
diff --git a/www/hotjava/Makefile b/www/hotjava/Makefile
index 93da1c683108..5045505975a5 100644
--- a/www/hotjava/Makefile
+++ b/www/hotjava/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Hotjava
-# Version required: 3.0
# Date created: 1999/07/03
# Whom: Jose Marques
#
# $FreeBSD$
#
-DISTNAME= hjb3_0-linux.sfx
-PKGNAME= hotjava-3.0
+PORTNAME= hotjava
+PORTVERSION= 3.0
CATEGORIES= www java
MASTER_SITES=
+DISTNAME= hjb3_0-linux.sfx
EXTRACT_SUFX=
MAINTAINER= noway@nohow.demon.co.uk
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index 05604b538cc0..99c919ec535d 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: htmlpp
-# Version required: 3.9d
# Date created: 9 Nov 1997
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= htmlp42a
-PKGNAME= htmlpp-4.2a
+PORTNAME= htmlpp
+PORTVERSION= 4.2a
CATEGORIES= www
MASTER_SITES= http://www.imatix.com/pub/tools/
+DISTNAME= htmlp42a
EXTRACT_SUFX= .tgz
MAINTAINER= dburr@FreeBSD.org
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index 26df7b76de61..9ea428aae8df 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: http-analyze
-# Version required: 1.9e
# Date created: Fri Jul 11 06:11:41 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= http-analyze2.01
-PKGNAME= http-analyze-2.01
+PORTNAME= http-analyze
+PORTVERSION= 2.01
CATEGORIES= www
MASTER_SITES= ftp://ftp.rent-a-guru.de/pub/http-analyze2.01/
+DISTNAME= http-analyze2.01
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/www/httperf/Makefile b/www/httperf/Makefile
index a6f86ad2ed45..79f98f612762 100644
--- a/www/httperf/Makefile
+++ b/www/httperf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: httperf
-# Version required: 0.6
# Date created: 28 Jul 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= httperf-0.6
+PORTNAME= httperf
+PORTVERSION= 0.6
CATEGORIES= www
MASTER_SITES= ftp://ftp.hpl.hp.com/pub/httperf/
diff --git a/www/httptunnel/Makefile b/www/httptunnel/Makefile
index 2e2bafb37152..91fc7f3e8418 100644
--- a/www/httptunnel/Makefile
+++ b/www/httptunnel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: httptunnel
-# Version required: 3.0
# Date created: March 20 2000
# Whom: Brian Somers <brian@Awfulhak.org>
#
# $FreeBSD$
#
-DISTNAME= httptunnel-3.0
+PORTNAME= httptunnel
+PORTVERSION= 3.0
CATEGORIES= net
MASTER_SITES= http://www.Awfulhak.org/httptunnel/ \
ftp://ftp.nocrew.org/pub/nocrew/unix/ \
diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index cf511989da4b..2426bbd28167 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -1,20 +1,18 @@
# New ports collection makefile for: hypermail
-# Version required: 2b28
# Date created: 23 Dec 1997
# Whom: mjhsieh
#
# $FreeBSD$
#
-DISTNAME= hypermail-${HYPERMAIL_VERSION}
+PORTNAME= hypermail
+PORTVERSION= 2b28
CATEGORIES= www
MASTER_SITES= ftp://ftp.landfield.com/hypermail/ \
ftp://ftp.faqs.org/hypermail/
MAINTAINER= veers@disturbed.net
-HYPERMAIL_VERSION= 2b28
-WRKSRC= ${WRKDIR}/hypermail-${HYPERMAIL_VERSION}
HAS_CONFIGURE= yes
MAN1= hypermail.1
diff --git a/www/indexme/Makefile b/www/indexme/Makefile
index 7a46ecf42daa..2efbb0a229b9 100644
--- a/www/indexme/Makefile
+++ b/www/indexme/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: indexme
# Date created: 30 Jan 2000
-# Version required: 0.1
# Whom: Carl Johan Madestrand
#
# $FreeBSD$
#
-DISTNAME= indexme
-PKGNAME= indexme-0.1
+PORTNAME= indexme
+PORTVERSION= 0.1
CATEGORIES= www
MASTER_SITES= ftp://ukug.uk.freebsd.org/pub/lord_cj/ \
http://kyb.homepage.com/perl/
+DISTNAME= ${PORTNAME}
MAINTAINER= calle.madestrand@norrgarden.se
diff --git a/www/jesred/Makefile b/www/jesred/Makefile
index e692405ae018..bffc12a0ea10 100644
--- a/www/jesred/Makefile
+++ b/www/jesred/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: jesred
-# Version required: 1.2.pl1
# Date created: Mon Nov 8 17:42:20 MSK 1999
# Whom: dsh@vlink.ru
#
# $FreeBSD$
#
-DISTNAME= jesred-1.2pl1
-PKGNAME= jesred-1.2.1
+PORTNAME= jesred
+PORTVERSION= 1.2.1
CATEGORIES= www
MASTER_SITES= http://ivs.cs.uni-magdeburg.de/~elkner/webtools/src/
+DISTNAME= jesred-1.2pl1
MAINTAINER= dsh@vlink.ru
diff --git a/www/junkbuster-zlib/Makefile b/www/junkbuster-zlib/Makefile
index ea19b99a7c2c..225194d1af4b 100644
--- a/www/junkbuster-zlib/Makefile
+++ b/www/junkbuster-zlib/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: junkbuster
-# Version required: 2.0
# Date created: 2 May 1998
# Whom: Ian Struble <ian@broken.net>
#
@@ -10,10 +9,11 @@
# I have contacted the author about this though so we may see something new
# in the next revision.
-DISTNAME= ijb20
-PKGNAME= junkbuster-2.0.2
+PORTNAME= junkbuster
+PORTVERSION= 2.0.2
CATEGORIES= www
MASTER_SITES= http://www.junkbusters.com/ht/en/
+DISTNAME= ijb20
MAINTAINER= ian@broken.net
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index ea19b99a7c2c..225194d1af4b 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: junkbuster
-# Version required: 2.0
# Date created: 2 May 1998
# Whom: Ian Struble <ian@broken.net>
#
@@ -10,10 +9,11 @@
# I have contacted the author about this though so we may see something new
# in the next revision.
-DISTNAME= ijb20
-PKGNAME= junkbuster-2.0.2
+PORTNAME= junkbuster
+PORTVERSION= 2.0.2
CATEGORIES= www
MASTER_SITES= http://www.junkbusters.com/ht/en/
+DISTNAME= ijb20
MAINTAINER= ian@broken.net
diff --git a/www/kdreamsite/Makefile b/www/kdreamsite/Makefile
index ba53b5d04814..44e5a0d82859 100644
--- a/www/kdreamsite/Makefile
+++ b/www/kdreamsite/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: KDreamSite
-# Version required: 0.2
# Date created: 12 Nov 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= kdreamsite-0.2
+PORTNAME= kdreamsite
+PORTVERSION= 0.2
CATEGORIES= www kde
MASTER_SITES= http://neptune.spaceports.com/%7Eatnet/files/
diff --git a/www/kwebsearch/Makefile b/www/kwebsearch/Makefile
index 38fb1b6d91ae..68c767ecf71a 100644
--- a/www/kwebsearch/Makefile
+++ b/www/kwebsearch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kwebsearch
-# Version required: 1.2
# Date created: 11 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= kwebsearch-1.2
+PORTNAME= kwebsearch
+PORTVERSION= 1.2
CATEGORIES= www kde
MASTER_SITES= http://www.bawue.de/~rgoetz/
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 978055af6929..23738854ac86 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libghttp
-# Version required: 1.0.5
# Date Created: 24 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libghttp-1.0.5
+PORTNAME= libghttp
+PORTVERSION= 1.0.5
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libghttp
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 6bdd16f6f412..fbd177f60a60 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libwww
-# Version required: 5.2.6
# Date created: 18 Feb 1996
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= w3c-${PKGNAME}
-PKGNAME= libwww-5.2.6
+PORTNAME= libwww
+PORTVERSION= 5.2.6
CATEGORIES= www devel
MASTER_SITES= http://www.w3.org/Library/Distribution/
+DISTNAME= w3c-${PKGNAME}
MAINTAINER= jseger@FreeBSD.org
diff --git a/www/libxpg4-ns/Makefile b/www/libxpg4-ns/Makefile
index cf798d93b6bb..b85dc8582193 100644
--- a/www/libxpg4-ns/Makefile
+++ b/www/libxpg4-ns/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: libxpg4-ns
-# Version required: 3.3
# Date created: 27 February 1999
# Whom: sada
#
# $FreeBSD$
#
-DISTNAME= libxpg4-3.3
-PKGNAME= libxpg4-ns-3.3
+PORTNAME= libxpg4-ns
+PORTVERSION= 3.3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
http://people.FreeBSD.org/~sada/distfiles/
+DISTNAME= libxpg4-3.3
MAINTAINER= sada@FreeBSD.ORG
diff --git a/www/linbot/Makefile b/www/linbot/Makefile
index a99067ad9882..807a75a3d735 100644
--- a/www/linbot/Makefile
+++ b/www/linbot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: linbot
-# Version required: 0.8
# Date created: 19 September 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= linbot-0.9
+PORTNAME= linbot
+PORTVERSION= 0.9
CATEGORIES= www python
MASTER_SITES= http://starship.skyport.net/crew/marduk/linbot/download/
diff --git a/www/linemode/Makefile b/www/linemode/Makefile
index 55d43ca9184b..d5589c52a75a 100644
--- a/www/linemode/Makefile
+++ b/www/linemode/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: linemode
-# Date created: 17 April 1995
# Whom: NIIMI Satoshi <sa2c@and.or.jp>
#
# $FreeBSD$
diff --git a/www/links/Makefile b/www/links/Makefile
index 1b33158e9d65..747c55d541d6 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: links
-# Version required: 0.84
# Date created: 21 January 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= links-0.84
+PORTNAME= links
+PORTVERSION= 0.84
CATEGORIES= www
MASTER_SITES= http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/ \
http://www.add.com.pl/links/download/
diff --git a/www/linux-flashplugin/Makefile b/www/linux-flashplugin/Makefile
index 0a34ebd6efbd..c9dcd2afeb6b 100644
--- a/www/linux-flashplugin/Makefile
+++ b/www/linux-flashplugin/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: linux-flashplugin
-# Version required: 4.0r12
# Date created: 13 Feburary 2000
# Whom: Matt Heckaman <matt@LUCIDA.QC.CA>
#
# $FreeBSD$
#
-DISTNAME= flash_linux
-PKGNAME= linux-flashplugin-4.0r12
+PORTNAME= linux-flashplugin
+PORTVERSION= 4.0.r12
CATEGORIES= www graphics linux
MASTER_SITES= http://download.macromedia.com/pub/shockwave/flash/english/linux/4.0r12/
+DISTNAME= flash_linux
MAINTAINER= matt@LUCIDA.QC.CA
diff --git a/www/linux-netscape4/Makefile b/www/linux-netscape4/Makefile
index 3c081247fe94..78917f65586a 100644
--- a/www/linux-netscape4/Makefile
+++ b/www/linux-netscape4/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: linux-netscape4
-# Version required: 4.08
# Date created: 24 Feb 1997
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= communicator-v408-export.x86-unknown-linux2.0_libc5
-PKGNAME= linux-netscape-4.08
+PORTNAME= linux-netscape
+PORTVERSION= 4.08
CATEGORIES= www linux
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
ftp://ftp.sunsite.auc.dk/disk4/mirrorsite.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/
+DISTNAME= communicator-v408-export.x86-unknown-linux2.0_libc5
MAINTAINER= tom@eborcom.com
diff --git a/www/linux-netscape47-communicator/Makefile b/www/linux-netscape47-communicator/Makefile
index 2d053bebd4dc..7c726b17cc2c 100644
--- a/www/linux-netscape47-communicator/Makefile
+++ b/www/linux-netscape47-communicator/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: netscape-communcator-linux-4.x
-# Version required: 4.7
# Date created: 27 June 1999
# Whom: girgen@partitur.se
# Based on work by: thepish
@@ -7,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= linux-netscape-${BROWSER}-${BROWSER_VER}
+PORTNAME= linux-netscape-${BROWSER}
+PORTVERSION= ${BROWSER_VER}
CATEGORIES= www linux
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/ \
ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/
diff --git a/www/linux-netscape47-navigator/Makefile b/www/linux-netscape47-navigator/Makefile
index 87d05ba93c4b..47057dafe534 100644
--- a/www/linux-netscape47-navigator/Makefile
+++ b/www/linux-netscape47-navigator/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: linux-netscape47-navigator
-# Version required: 4.72
# Date created: Tue Mar 7 22:59:55 CET 2000
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
# Based on work by: girgen@partitur.se
diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile
index 2d053bebd4dc..7c726b17cc2c 100644
--- a/www/linux-netscape6/Makefile
+++ b/www/linux-netscape6/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: netscape-communcator-linux-4.x
-# Version required: 4.7
# Date created: 27 June 1999
# Whom: girgen@partitur.se
# Based on work by: thepish
@@ -7,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= linux-netscape-${BROWSER}-${BROWSER_VER}
+PORTNAME= linux-netscape-${BROWSER}
+PORTVERSION= ${BROWSER_VER}
CATEGORIES= www linux
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/ \
ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 1a8bdab4c417..7eb11c86659a 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lynx
-# Version required: 2.8.3*
# Date created: 15 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= lynx2.8.3dev.20
-PKGNAME= lynx-2.8.3dev.20
+PORTNAME= lynx
+PORTVERSION= 2.8.3dev.20
CATEGORIES= www
MASTER_SITES= http://sol.slcc.edu/lynx/current/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ache@FreeBSD.org
diff --git a/www/lynx-ssl/Makefile b/www/lynx-ssl/Makefile
index e10b6a9113f9..85e5c82c1e8f 100644
--- a/www/lynx-ssl/Makefile
+++ b/www/lynx-ssl/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lynx
-# Version required: 2.8
# Date created: 15 Dec 1994
# Whom: Stefan `Sec` Zehl <sec@42.org>
#
# $FreeBSD$
#
-DISTNAME= lynx2.8.2rel.1
-PKGNAME= lynx-ssl-2.8.2.1
+PORTNAME= lynx-ssl
+PORTVERSION= 2.8.2.1
CATEGORIES= www
MASTER_SITES= http://sol.slcc.edu/lynx/current/
+DISTNAME= lynx2.8.2rel.1
USE_OPENSSL= RSA
FORBIDDEN= "Riddled with buffer overflows exploitable by a malicious server to execute code as the local user"
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 77b8d283a403..49a866d37933 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lynx
-# Version required: 2.8.2 release 1
# Date created: 15 Dec 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= lynx2.8.2rel.1
-PKGNAME= lynx-2.8.2rel.1
+PORTNAME= lynx
+PORTVERSION= 2.8.2rel.1
CATEGORIES= www
MASTER_SITES= http://sol.slcc.edu/lynx/current/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index 96ab0a7d12bf..efbb8d2ae5f6 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mapedit
-# Version required: 2.24
# Date created: Fr 4 Apr 1997 17:45:31 MET DST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= mapedit2.3
-PKGNAME= mapedit-2.3
+PORTNAME= mapedit
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= ftp://ftp.boutell.com/pub/boutell/mapedit/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/marc-search/Makefile b/www/marc-search/Makefile
index 62c429e9bcec..c50451f3ba90 100644
--- a/www/marc-search/Makefile
+++ b/www/marc-search/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: marc-search
-# Version required: 4.3
# Date created: 25 November 1998
# Whom: Sheldon Hearn <axl@iafrica.com>
#
# $FreeBSD$
#
-DISTNAME= marc-search.4.3
-PKGNAME= marc-search-4.3
+PORTNAME= marc-search
+PORTVERSION= 4.3
CATEGORIES= www
MASTER_SITES= http://www.oac.uci.edu/indiv/ehood/contrib/marc-search/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= sheldonh@FreeBSD.org
diff --git a/www/mathopd/Makefile b/www/mathopd/Makefile
index 13c04e7d3bfc..75e288a475f7 100644
--- a/www/mathopd/Makefile
+++ b/www/mathopd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mathopd HTTPD
-# Version required: 1.3pl4
# Date created: Sun Oct 31 1999
# Whom: tobez@plab.ku.dk
#
# $FreeBSD$
#
-DISTNAME= mathopd-1.3pl4
+PORTNAME= mathopd
+PORTVERSION= 1.3pl4
CATEGORIES= www
MASTER_SITES= http://mathop.diva.nl/dist/ \
ftp://ftp.prima.eu.org/pub/mirrored_files/mathop.diva.nl/
diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index 9eeadbe68142..9337589485ca 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: MHonArc
-# Version required: 2.1
# Date created: 18 June 1997
# Whom: koshy@india.hp.com
#
# $FreeBSD$
#
-DISTNAME= MHonArc2.3.3
-PKGNAME= mhonarc-2.3.3
+PORTNAME= mhonarc
+PORTVERSION= 2.3.3
CATEGORIES= www mail
MASTER_SITES= http://www.oac.uci.edu/indiv/ehood/tar/ \
ftp://hhobel.phl.univie.ac.at/MHonArc/ \
ftp://ftp.redhat.com/contrib/noarch/noarch/ \
ftp://ftp.plig.org/pub/CPAN/authors/id/EHOOD/ \
http://www.perl.com/CPAN/authors/id/EHOOD/
+DISTNAME= MHonArc2.3.3
MAINTAINER= jkoshy@freebsd.org
diff --git a/www/mod_dav/Makefile b/www/mod_dav/Makefile
index a5c1ae5780cc..1220d73e4f26 100644
--- a/www/mod_dav/Makefile
+++ b/www/mod_dav/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: mod_dav (apache)
-# Version required: 0.9.14
# Date created: Sun Oct 17, 1999
# Whom: patrick@mindstep.com
#
# $FreeBSD$
#
-DISTNAME= mod_dav-${DAV_VERSION}-${APACHE_VERSION}
-PKGNAME= mod_dav-${DAV_VERSION}
+PORTNAME= mod_dav
+PORTVERSION= 0.9.14
+DISTNAME= mod_dav-${PORTVERSION}-${APACHE_VERSION}
CATEGORIES= www
MASTER_SITES= http://www.webdav.org/mod_dav/
+DISTNAME= mod_dav-${PORTVERSION}-${APACHE_VERSION}
MAINTAINER= patrick@mindstep.com
@@ -18,7 +19,6 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
# This port will work with the following version of Apache and anything newer.
APACHE_VERSION= 1.3.6
-DAV_VERSION= 0.9.14
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/www/mod_dtcl/Makefile b/www/mod_dtcl/Makefile
index b2497d18cd2c..7abf2fdc576d 100644
--- a/www/mod_dtcl/Makefile
+++ b/www/mod_dtcl/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mod_dtcl
-# Version required: 0.6.4-2
# Date created: January 9, 1999
# Whom: Mikhail Teterin <mi@aldan.algebra.com>
#
# $FreeBSD$
#
-DISTNAME= libapache-mod-dtcl_0.7.3-1
-PKGNAME= mod_dtcl-0.7.3.1
+PORTNAME= mod_dtcl
+PORTVERSION= 0.7.3.1
CATEGORIES= www tcl82
MASTER_SITES= http://master.debian.org/~davidw/mod_dtcl/
+DISTNAME= libapache-mod-dtcl_0.7.3-1
MAINTAINER= mi@aldan.algebra.com
diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile
index 78c521cf0b25..203fba04c806 100644
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mod_perl
-# Version required: 1.21_02
# Date created: November 5th 1999
# Whom: Sheldon Hearn <sheldonh@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mod_perl-1.21_02
+PORTNAME= mod_perl
+PORTVERSION= 1.21_02
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 78c521cf0b25..203fba04c806 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mod_perl
-# Version required: 1.21_02
# Date created: November 5th 1999
# Whom: Sheldon Hearn <sheldonh@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mod_perl-1.21_02
+PORTNAME= mod_perl
+PORTVERSION= 1.21_02
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 488a014b47a9..cb98252dcfc0 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Apache / PHP
-# Version required: 1.3* / 3.0*
# Date created: So 21 Jun 1998 16:09:39 CEST
# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
# $FreeBSD$
#
-DISTNAME= apache_${VERSION_APACHE}
-PKGNAME= apache+php-${VERSION_APACHE}+${VERSION_PHP}
+PORTNAME= apache+php
+PORTVERSION= ${VERSION_APACHE}+${VERSION_PHP}
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
http://www.rge.com/pub/infosystems/apache/dist/ \
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index c7317d41c8a8..3e16e24c40ce 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Apache / PHP
-# Version required: 1.3* / 4.0*
# Date created: So 21 Jun 1998 16:09:39 CEST
# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
# $FreeBSD$
#
-DISTNAME= apache_${VERSION_APACHE}
-PKGNAME= apache+php-${VERSION_APACHE}+${VERSION_PHP}
+PORTNAME= apache+php
+PORTVERSION= ${VERSION_APACHE}+${VERSION_PHP}
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
http://www.rge.com/pub/infosystems/apache/dist/ \
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index c7317d41c8a8..3e16e24c40ce 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Apache / PHP
-# Version required: 1.3* / 4.0*
# Date created: So 21 Jun 1998 16:09:39 CEST
# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
# $FreeBSD$
#
-DISTNAME= apache_${VERSION_APACHE}
-PKGNAME= apache+php-${VERSION_APACHE}+${VERSION_PHP}
+PORTNAME= apache+php
+PORTVERSION= ${VERSION_APACHE}+${VERSION_PHP}
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
http://www.rge.com/pub/infosystems/apache/dist/ \
diff --git a/www/momspider/Makefile b/www/momspider/Makefile
index 9112e34b39c9..e697d2f90aa1 100644
--- a/www/momspider/Makefile
+++ b/www/momspider/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: dict
-# Version required: 1.00
# Date created: 11 October 1997
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= MOMspider-1.00
-PKGNAME= momspider-1.00
+PORTNAME= momspider
+PORTVERSION= 1.00
CATEGORIES= www
MASTER_SITES= ftp://www.ics.uci.edu/pub/websoft/libwww-perl/ \
ftp://www.ics.uci.edu/pub/websoft/MOMspider/ \
http://www.de.freebsd.org/~wosch/src/
+DISTNAME= MOMspider-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} libwww-perl-0.40.tar.gz
MAINTAINER= wosch@FreeBSD.org
diff --git a/www/mozilla+ipv6/Makefile b/www/mozilla+ipv6/Makefile
index 05898f3863c1..4cb1fbf49a1f 100644
--- a/www/mozilla+ipv6/Makefile
+++ b/www/mozilla+ipv6/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mozilla
-# Version required: M13
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
# $FreeBSD$
#
-DISTNAME= mozilla-source-M13
-PKGNAME= mozilla-M13
+PORTNAME= mozilla
+PORTVERSION= M13
CATEGORIES= www
MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/m13/src/
+DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 05898f3863c1..4cb1fbf49a1f 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mozilla
-# Version required: M13
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
# $FreeBSD$
#
-DISTNAME= mozilla-source-M13
-PKGNAME= mozilla-M13
+PORTNAME= mozilla
+PORTVERSION= M13
CATEGORIES= www
MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/m13/src/
+DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 05898f3863c1..4cb1fbf49a1f 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mozilla
-# Version required: M13
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
# $FreeBSD$
#
-DISTNAME= mozilla-source-M13
-PKGNAME= mozilla-M13
+PORTNAME= mozilla
+PORTVERSION= M13
CATEGORIES= www
MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/m13/src/
+DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 05898f3863c1..4cb1fbf49a1f 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mozilla
-# Version required: M13
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
# $FreeBSD$
#
-DISTNAME= mozilla-source-M13
-PKGNAME= mozilla-M13
+PORTNAME= mozilla
+PORTVERSION= M13
CATEGORIES= www
MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/m13/src/
+DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/www/netscape-remote/Makefile b/www/netscape-remote/Makefile
index 899ef0753ea2..3a9c3d961e14 100644
--- a/www/netscape-remote/Makefile
+++ b/www/netscape-remote/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: netscape-remote
-# Version required: 1.0
# Date created: 09/13/1999
# Whom: Kelly Yancey <kbyanc@posi.net>
#
# $FreeBSD$
#
-DISTNAME= netscape-remote
-PKGNAME= netscape-remote-1.0
+PORTNAME= netscape-remote
+PORTVERSION= 1.0
CATEGORIES= www
MASTER_SITES= http://home.netscape.com/newsref/std/
DISTFILES= remote.c vroot.h
diff --git a/www/netscape3-gold/Makefile b/www/netscape3-gold/Makefile
index fe4824e8c0ce..1d44880311d7 100644
--- a/www/netscape3-gold/Makefile
+++ b/www/netscape3-gold/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: netscape
-# Version required: 3.04 (gold)
# Date created: 21 August 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= netscape-gold-3.04
+PORTNAME= netscape-gold
+PORTVERSION= 3.04
MASTER_SITES= ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_gold_complete/
DIST_SUBDIR= gold
diff --git a/www/netscape3/Makefile b/www/netscape3/Makefile
index 798e8661107f..15d8a225f11b 100644
--- a/www/netscape3/Makefile
+++ b/www/netscape3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: netscape
-# Version required: 3.04
# Date created: 21 August 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME?= netscape-3.04
+PORTNAME?= netscape
+PORTVERSION?= 3.04
CATEGORIES= www
MASTER_SITES?= ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_complete/
DISTFILES= netscape-v304-export.x86-unknown-bsd.tar.gz
diff --git a/www/netscape4-communicator.us/Makefile b/www/netscape4-communicator.us/Makefile
index fd0717079090..0964202afa36 100644
--- a/www/netscape4-communicator.us/Makefile
+++ b/www/netscape4-communicator.us/Makefile
@@ -1,15 +1,15 @@
# ex:ts=8
# Ports collection makefile for: netscape (full communicator version)
-# Version required: 0.0
# Date created: 14 Feb 1998
# Whom: obrien@cs.ucdavis.edu
#
# $FreeBSD$
#
-DISTNAME= communicator-v407-us.x86-unknown-linux2.0_libc5
-PKGNAME= netscape-communicator-4.07.us
+PORTNAME= netscape-communicator
+PORTVERSION= 4.07.us
CATEGORIES= www linux
+DISTNAME= communicator-v407-us.x86-unknown-linux2.0_libc5
MAINTAINER= obrien@FreeBSD.org
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 3b95f5f5c261..3b46e97a9100 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: netscape (full communicator version)
-# Version required: 4.*
# Date created: 24 Feb 1997
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME?= netscape-${BROWSER_ARC}-${BROWSER_VER}
+PORTNAME?= netscape-${BROWSER_ARC}
+PORTVERSION?= ${BROWSER_VER}
CATEGORIES?= www
MASTER_SITES?= ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
DISTFILES?= communicator-v408-export.x86-unknown-freebsd.tar.gz
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index c71fee04d56e..ee7e73e0f81f 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: netscape (navigator only)
-# Version required: 4.08
# Date created: 24 Feb 1997
# Whom: ache
#
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index f8d970d202cb..e7a06b870bde 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: netscape (communicator suite)
-# Version required: 4.7*
# Date created: 24 Feb 1997
# Whom: thepish
#
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index c1db314f6013..43c32b1762af 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: netscape (navigator only)
-# Version required: 4.7
# Date created: 20 Sept 1998
# Whom: brett@peloton.physics.montana.edu
#
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index 3b95f5f5c261..3b46e97a9100 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: netscape (full communicator version)
-# Version required: 4.*
# Date created: 24 Feb 1997
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME?= netscape-${BROWSER_ARC}-${BROWSER_VER}
+PORTNAME?= netscape-${BROWSER_ARC}
+PORTVERSION?= ${BROWSER_VER}
CATEGORIES?= www
MASTER_SITES?= ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
DISTFILES?= communicator-v408-export.x86-unknown-freebsd.tar.gz
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 2d053bebd4dc..7c726b17cc2c 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: netscape-communcator-linux-4.x
-# Version required: 4.7
# Date created: 27 June 1999
# Whom: girgen@partitur.se
# Based on work by: thepish
@@ -7,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= linux-netscape-${BROWSER}-${BROWSER_VER}
+PORTNAME= linux-netscape-${BROWSER}
+PORTVERSION= ${BROWSER_VER}
CATEGORIES= www linux
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/ \
ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/
diff --git a/www/npc/Makefile b/www/npc/Makefile
index 7a205af7c3c3..4118a433b7e8 100644
--- a/www/npc/Makefile
+++ b/www/npc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: npc.cgi
-# Version required: 0.83
# Date created: 3 December 1998
# Whom: Yasuhiro Fukuma <yasuf@big.or.jp>
#
# $FreeBSD$
#
-DISTNAME= npc-0.83
+PORTNAME= npc
+PORTVERSION= 0.83
CATEGORIES= www
MASTER_SITES= http://www2.biglobe.ne.jp/%7Enir/soft/
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index a5b882e62fce..03c547ccb6b3 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: nscache
-# Version required: 0.2p2
# Date created: 04 March 2000
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= nscache-0.2pl2
-PKGNAME= nscache-0.2p2
+PORTNAME= nscache
+PORTVERSION= 0.2p2
CATEGORIES= www
MASTER_SITES= http://www.idata.sk/~ondrej/sw/
+DISTNAME= nscache-0.2pl2
EXTRACT_SUFX= .tgz
MAINTAINER= kris@FreeBSD.org
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 4e17729be329..da800cbc05ab 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Apache-ASP
-# Version required: 0.18
# Date created: 31 December 1999
# Whom: Igor Vinokurov <igor@zynaps.ru>
#
# $FreeBSD$
#
-DISTNAME= Apache-ASP-0.18
-PKGNAME= p5-Apache-ASP-0.18
+PORTNAME= p5-Apache-ASP
+PORTVERSION= 0.18
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
+DISTNAME= Apache-ASP-0.18
MAINTAINER= igor@zynaps.ru
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 8c78e2eea252..3149691bd4c0 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Apache-DBI
-# Version required: 0.87
# Date created: 21 December 1999
# Whom: Igor Vinokurov <igor@zynaps.ru>
#
# $FreeBSD$
#
-DISTNAME= ApacheDBI-0.87
-PKGNAME= p5-Apache-DBI-0.87
+PORTNAME= p5-Apache-DBI
+PORTVERSION= 0.87
CATEGORIES= www databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
+DISTNAME= ApacheDBI-0.87
MAINTAINER= igor@zynaps.ru
diff --git a/www/p5-Apache-Radius/Makefile b/www/p5-Apache-Radius/Makefile
index 060947876413..d6800fc25322 100644
--- a/www/p5-Apache-Radius/Makefile
+++ b/www/p5-Apache-Radius/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Apache-Radius
-# Version required: 0.3
# Date created: Mon 20 Sep 19:46:21 SAST 1999
# Whom: Sheldon Hearn <sheldonh@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Apache-AuthenRadius-0.3
-PKGNAME= p5-Apache-Radius-0.3
+PORTNAME= p5-Apache-Radius
+PORTVERSION= 0.3
CATEGORIES= www security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
+DISTNAME= Apache-AuthenRadius-0.3
MAINTAINER= sheldonh@FreeBSD.org
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index a6c0ca3a0ace..ee106e23bbf0 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Apache-Session
-# Version required: 1.03
# Date created: March 13, 2000
# Whom: Frank Mayhar <frank@exit.com>
#
# $FreeBSD$
#
-DISTNAME= Apache-Session-1.03
-PKGNAME= p5-Apache-Session-1.03
+PORTNAME= p5-Apache-Session
+PORTVERSION= 1.03
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
+DISTNAME= Apache-Session-1.03
MAINTAINER= frank@exit.com
diff --git a/www/p5-Apache/Makefile b/www/p5-Apache/Makefile
index b7b038e6b1f9..b308079ce5c0 100644
--- a/www/p5-Apache/Makefile
+++ b/www/p5-Apache/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Apache
-# Version required: 1.21
# Date created: April 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mod_perl-1.21
-PKGNAME= p5-Apache-1.21
+PORTNAME= p5-Apache
+PORTVERSION= 1.21
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
+DISTNAME= mod_perl-1.21
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 581c1e82e4b3..2d34d54d5f09 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-CGI-FastTemplate
-# Version required: 1.09
# Date created: 27 Feb 2000
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
# $FreeBSD$
#
-DISTNAME= CGI-FastTemplate-1.09
-PKGNAME= p5-CGI-FastTemplate-1.09
+PORTNAME= p5-CGI-FastTemplate
+PORTVERSION= 1.09
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= CGI
+DISTNAME= CGI-FastTemplate-1.09
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 998cce28e788..8931cfaa9448 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-CGI
-# Version required: 2.76
# Date created: September 30th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= CGI-modules-2.76
-PKGNAME= p5-CGI-2.76
+PORTNAME= p5-CGI
+PORTVERSION= 2.76
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= CGI
+DISTNAME= CGI-modules-2.76
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 998cce28e788..8931cfaa9448 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-CGI
-# Version required: 2.76
# Date created: September 30th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= CGI-modules-2.76
-PKGNAME= p5-CGI-2.76
+PORTNAME= p5-CGI
+PORTVERSION= 2.76
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= CGI
+DISTNAME= CGI-modules-2.76
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 322cb4ed93a9..e02a67103c18 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-CGI_Lite
-# Version required: 1.8
# Date created: September 30th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= CGI_Lite-1.8
-PKGNAME= p5-CGI_Lite-1.8
+PORTNAME= p5-CGI_Lite
+PORTVERSION= 1.8
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= CGI_Lite
+DISTNAME= CGI_Lite-1.8
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-FastCGI/Makefile b/www/p5-FastCGI/Makefile
index 5218799ee5fe..3ef31ff184e3 100644
--- a/www/p5-FastCGI/Makefile
+++ b/www/p5-FastCGI/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-FastCGI
-# Version required: 0.48
# Date created: October 27th 1999
# Whom: Kelly Yancey <kbyanc@posi.net>
#
# $FreeBSD$
#
-DISTNAME= FCGI-0.48
-PKGNAME= p5-FastCGI-0.48
+PORTNAME= p5-FastCGI
+PORTVERSION= 0.48
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= FCGI
+DISTNAME= FCGI-0.48
MAINTAINER= kbyanc@posi.net
diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 1f3b391448e5..36a6375cc50a 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTML-Embperl
-# Version required: 1.3b2
# Date created: March 13, 2000
# Whom: Frank Mayhar <frank@exit.com>
#
# $FreeBSD$
#
-DISTNAME= HTML-Embperl-1.3b2
-PKGNAME= p5-HTML-Embperl-1.3b2
+PORTNAME= p5-HTML-Embperl
+PORTVERSION= 1.3b2
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
+DISTNAME= p5-HTML-Embperl-1.3b2
MAINTAINER= ports@FreeBSD.org
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index 6cf1dfe21240..78c68807a2b6 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTML-Parser
-# Version required: 3.*
# Date Created: 28 April 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= HTML-Parser-3.05
-PKGNAME= p5-HTML-Parser-3.05
+PORTNAME= p5-HTML-Parser
+PORTVERSION= 3.05
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
+DISTNAME= HTML-Parser-3.05
MAINTAINER= ports@FreeBSD.org
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index 049c75079df8..067416abe7c8 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTML-QuickCheck
-# Version required: 1.0b1
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= HTML-QuickCheck-1.0b1
-PKGNAME= p5-HTML-QuickCheck-1.0b1
+PORTNAME= p5-HTML-QuickCheck
+PORTVERSION= 1.0b1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
+DISTNAME= HTML-QuickCheck-1.0b1
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 182a9e7ccef0..3ddd2825e557 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTML-Stream
-# Version required: 1.44
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= HTML-Stream-1.44
-PKGNAME= p5-HTML-Stream-1.44
+PORTNAME= p5-HTML-Stream
+PORTVERSION= 1.44
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
+DISTNAME= HTML-Stream-1.44
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index b2da8bd725cb..672de712c534 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTML-Summary
-# Version required: 0.017
# Date created: 3 January 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= HTML-Summary-0.017
-PKGNAME= p5-HTML-Summary-0.017
+PORTNAME= p5-HTML-Summary
+PORTVERSION= 0.017
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
+DISTNAME= HTML-Summary-0.017
MAINTAINER= dima@Chg.RU
diff --git a/www/p5-HTML-TableLayout/Makefile b/www/p5-HTML-TableLayout/Makefile
index 3894a65b4ea7..fec316213e78 100644
--- a/www/p5-HTML-TableLayout/Makefile
+++ b/www/p5-HTML-TableLayout/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTML-TableLayout
-# Version required: 1.001008
# Date Created: 01 February 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= HTML-TableLayout-1.001008
-PKGNAME= p5-HTML-TableLayout-1.001008
+PORTNAME= p5-HTML-TableLayout
+PORTVERSION= 1.001008
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
+DISTNAME= HTML-TableLayout-1.001008
MAINTAINER= dima@Chg.RU
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index ed754261bd87..aca8bfd95860 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTML-Tree
-# Version required: 0.62
# Date created: 3 January 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= HTML-Tree-0.62
-PKGNAME= p5-HTML-Tree-0.62
+PORTNAME= p5-HTML-Tree
+PORTVERSION= 0.62
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
+DISTNAME= HTML-Tree-0.62
MAINTAINER= dima@Chg.RU
diff --git a/www/p5-HTML/Makefile b/www/p5-HTML/Makefile
index 98eacbf5b22a..f1b6cc41ebad 100644
--- a/www/p5-HTML/Makefile
+++ b/www/p5-HTML/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTML
-# Version required: 0.6
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= HTML-0.6
-PKGNAME= p5-HTML-0.6
+PORTNAME= p5-HTML
+PORTVERSION= 0.6
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
+DISTNAME= HTML-0.6
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index 370e53dde5a4..5b728e802807 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTTPD-Tools
-# Version required: 0.55
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= HTTPD-Tools-0.55
-PKGNAME= p5-HTTPD-Tools-0.55
+PORTNAME= p5-HTTPD-Tools
+PORTVERSION= 0.55
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTTPD
+DISTNAME= HTTPD-Tools-0.55
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 370e53dde5a4..5b728e802807 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-HTTPD-Tools
-# Version required: 0.55
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= HTTPD-Tools-0.55
-PKGNAME= p5-HTTPD-Tools-0.55
+PORTNAME= p5-HTTPD-Tools
+PORTVERSION= 0.55
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTTPD
+DISTNAME= HTTPD-Tools-0.55
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index add61f632ff7..878908d3645b 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: p5-Parallel-UA
-# http://www.cs.washington.edu/homes/marclang/ParallelUA/
-# Version required: 2.*
# Date created: Sep 8 1998
# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= ParallelUserAgent-2.43
-PKGNAME= p5-ParallelUA-2.43
+PORTNAME= p5-ParallelUA
+PORTVERSION= 2.43
CATEGORIES= www perl5 devel
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= LWP
+DISTNAME= ParallelUserAgent-2.43
MAINTAINER= ache@FreeBSD.org
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index e72edba834f9..59160d893506 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-WWW-Search
-# Version required: 2.10
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= WWW-Search-2.10
-PKGNAME= p5-WWW-Search-2.10
+PORTNAME= p5-WWW-Search
+PORTVERSION= 2.10
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= WWW
+DISTNAME= WWW-Search-2.10
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index 6b57bbcec4f6..b4f01603338f 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-libapreq
-# Version required: 0.31
# Date created: March 13, 2000
# Whom: Frank Mayhar <frank@exit.com>
#
# $FreeBSD$
#
-DISTNAME= libapreq-0.31
-PKGNAME= p5-libapreq-0.31
+PORTNAME= p5-libapreq
+PORTVERSION= 0.31
CATEGORIES= www perl5 devel
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
+DISTNAME= libapreq-0.31
MAINTAINER= frank@exit.com
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index bfe182b635d5..dc5add0e6a81 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: p5-libwww
-# http://www.linpro.no/lwp/
-# Version required: 5.*
# Date created: September 30th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libwww-perl-5.47
-PKGNAME= p5-libwww-5.47
+PORTNAME= p5-libwww
+PORTVERSION= 5.47
CATEGORIES= www perl5 devel
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= LWP
+DISTNAME= libwww-perl-5.47
MAINTAINER= jfitz@FreeBSD.org
diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index 33edfb344c50..17b9819e3c95 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: plugger
-# Version required: 3.0
# Date created: 11 Februrary 1999
# Whom: Jay Sachs <sachs@cs.williams.edu>
#
# $FreeBSD$
#
-DISTNAME= plugger-3.0
+PORTNAME= plugger
+PORTVERSION= 3.0
CATEGORIES= www
MASTER_SITES= http://www.hubbe.net/~hubbe/plugger/ \
ftp://ftp.netscape.com/pub/sdk/plugin/unix/
diff --git a/www/publicfile/Makefile b/www/publicfile/Makefile
index 5cba29ac395f..0dd31236873e 100644
--- a/www/publicfile/Makefile
+++ b/www/publicfile/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: publicfile-0.52
-# Version required: 0.52
# Date created: 24 Jan 2000
# Whom: Neil Blakey-Milner
#
# $FreeBSD$
#
-DISTNAME= publicfile-0.52
+PORTNAME= publicfile
+PORTVERSION= 0.52
CATEGORIES= ftp
MASTER_SITES= http://cr.yp.to/publicfile/
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 8ecf02414453..3c591f90463d 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -1,16 +1,16 @@
# Ports collection Makefile for: HTMLgen
-# Version required: 2.1
# Date created: 03/20/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= HTMLgen
-PKGNAME= py-HTMLgen-2.1
+PORTNAME= py-HTMLgen
+PORTVERSION= 2.1
CATEGORIES= www python
MASTER_SITES= http://starship.skyport.net/crew/friedrich/ \
http://www.nectar.cc/distfiles/
+DISTNAME= HTMLgen
MAINTAINER= nectar@FreeBSD.org
diff --git a/www/qdecoder/Makefile b/www/qdecoder/Makefile
index d5b4cf69502d..4942ed3748a2 100644
--- a/www/qdecoder/Makefile
+++ b/www/qdecoder/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: qDecoder library
-# Version required: 5
# Date created: Sep 10 1999
# Whom: CHOI Junho <cjh@kr.freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= qDecoder-5.0.8
+PORTNAME= qDecode
+PORTVERSION= 5.0.8
CATEGORIES= www
MASTER_SITES= ftp://ftp.hongik.com/pub/qDecoder/
EXTRACT_SUFX= .tar.Z
diff --git a/www/roxen/Makefile b/www/roxen/Makefile
index 67b65021e0aa..7a492674f479 100644
--- a/www/roxen/Makefile
+++ b/www/roxen/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Roxen Challenger
-# Version required: 1.3.111-0.6-40bit
# Date created: 26 February 1999
# Whom: Kai Voigt (k@123.org)
#
# $FreeBSD$
#
-DISTNAME= roxen_1.3.111-0.6-40bit
-PKGNAME= roxen-1.3.111
+PORTNAME= roxen
+PORTVERSION= 1.3.111
CATEGORIES= www
MASTER_SITES= ftp://ftp.roxen.com/roxen/source/
+DISTNAME= roxen_1.3.111-0.6-40bit
MAINTAINER= k@123.org
diff --git a/www/ruboard/Makefile b/www/ruboard/Makefile
index 86c2ecf6aaea..e6455990399d 100644
--- a/www/ruboard/Makefile
+++ b/www/ruboard/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: ruboard
-# Version required: 1.2
# Date created: 5 October 1998
# Whom: Andrew Maltsev <am@amsoft.ru>
#
# $FreeBSD$
#
-DISTNAME= ruboard-1.2.1
-CATEGORIES= www russian
-MASTER_SITES= ftp://ftp.amsoft.ru/software/ruboard/
+PORTNAME= ruboard
+PORTVERSION= 1.2.1
+CATEGORIES= www russian
+MASTER_SITES= ftp://ftp.amsoft.ru/software/ruboard/
MAINTAINER= am@amsoft.ru
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 8772f951fca3..7529494b3a27 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: SCREEM
-# Version required: 0.2.1
# Date created: 05 Nov 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= screem-0.2.1
+PORTNAME= screem
+PORTVERSION= 0.2.1
CATEGORIES= www
MASTER_SITES= ftp://download.sourceforge.net/pub/sourceforge/screem/ \
http://www.screem.org/src/
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 8772f951fca3..7529494b3a27 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: SCREEM
-# Version required: 0.2.1
# Date created: 05 Nov 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= screem-0.2.1
+PORTNAME= screem
+PORTVERSION= 0.2.1
CATEGORIES= www
MASTER_SITES= ftp://download.sourceforge.net/pub/sourceforge/screem/ \
http://www.screem.org/src/
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 05898f3863c1..4cb1fbf49a1f 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mozilla
-# Version required: M13
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
# $FreeBSD$
#
-DISTNAME= mozilla-source-M13
-PKGNAME= mozilla-M13
+PORTNAME= mozilla
+PORTVERSION= M13
CATEGORIES= www
MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/m13/src/
+DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 05898f3863c1..4cb1fbf49a1f 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mozilla
-# Version required: M13
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
# $FreeBSD$
#
-DISTNAME= mozilla-source-M13
-PKGNAME= mozilla-M13
+PORTNAME= mozilla
+PORTVERSION= M13
CATEGORIES= www
MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/m13/src/
+DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index c86f88027245..8540450636ee 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sitecopy
-# Version required: 0.9.*
# Date created: 15 January 1999
# Whom: nik
#
# $FreeBSD$
#
-DISTNAME= sitecopy-0.9.5
+PORTNAME= sitecopy
+PORTVERSION= 0.9.5
CATEGORIES= www
MASTER_SITES= http://www.lyra.org/sitecopy/
diff --git a/www/smb_auth/Makefile b/www/smb_auth/Makefile
index 129bb991d6e6..91cd5a852172 100644
--- a/www/smb_auth/Makefile
+++ b/www/smb_auth/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: smb_auth
-# Version required: 0.05
# Date created: 13 January 2000
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= smb_auth-0.05
+PORTNAME= smb_auth
+PORTVERSION= 0.05
CATEGORIES= www
MASTER_SITES= http://www.hacom.nl/~richard/software/
diff --git a/www/snarf/Makefile b/www/snarf/Makefile
index b4d586ea047b..ca4a7f0f41b4 100644
--- a/www/snarf/Makefile
+++ b/www/snarf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: snarf
-# Version required: 2.0.5
# Date created: 2 January 1999
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= snarf-2.0.5
+PORTNAME= snarf
+PORTVERSION= 2.0.5
CATEGORIES= www
MASTER_SITES= http://www.xach.com/snarf/
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 8cc79b5ab803..45abaa24d8b7 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: squid
-# Version required: 2.3.STABLE2
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= squid-2.3.STABLE2
-PKGNAME= squid-2.3
+PORTNAME= squid
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.3.STABLE2
EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
@@ -68,7 +68,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 8b8db7731173..6b9965ed77da 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -6,14 +6,15 @@
# $FreeBSD$
#
-DISTNAME= squid-2.2.STABLE5
-PKGNAME= squid-2.2
+PORTNAME= squid
+PORTVERSION= 2.2
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.2.STABLE5
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= peter@freebsd.org
@@ -59,7 +60,7 @@ NO_LATEST_LINK= yes
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 8cc79b5ab803..45abaa24d8b7 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: squid
-# Version required: 2.3.STABLE2
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= squid-2.3.STABLE2
-PKGNAME= squid-2.3
+PORTNAME= squid
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.3.STABLE2
EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
@@ -68,7 +68,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 8cc79b5ab803..45abaa24d8b7 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: squid
-# Version required: 2.3.STABLE2
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= squid-2.3.STABLE2
-PKGNAME= squid-2.3
+PORTNAME= squid
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.3.STABLE2
EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
@@ -68,7 +68,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 8cc79b5ab803..45abaa24d8b7 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: squid
-# Version required: 2.3.STABLE2
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= squid-2.3.STABLE2
-PKGNAME= squid-2.3
+PORTNAME= squid
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.3.STABLE2
EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
@@ -68,7 +68,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 8cc79b5ab803..45abaa24d8b7 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: squid
-# Version required: 2.3.STABLE2
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= squid-2.3.STABLE2
-PKGNAME= squid-2.3
+PORTNAME= squid
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.3.STABLE2
EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
@@ -68,7 +68,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 8cc79b5ab803..45abaa24d8b7 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: squid
-# Version required: 2.3.STABLE2
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= squid-2.3.STABLE2
-PKGNAME= squid-2.3
+PORTNAME= squid
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.3.STABLE2
EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
@@ -68,7 +68,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 8cc79b5ab803..45abaa24d8b7 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: squid
-# Version required: 2.3.STABLE2
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= squid-2.3.STABLE2
-PKGNAME= squid-2.3
+PORTNAME= squid
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.3.STABLE2
EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
@@ -68,7 +68,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 8cc79b5ab803..45abaa24d8b7 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: squid
-# Version required: 2.3.STABLE2
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= squid-2.3.STABLE2
-PKGNAME= squid-2.3
+PORTNAME= squid
+PORTVERSION= 2.3
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+DISTNAME= squid-2.3.STABLE2
EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/
@@ -68,7 +68,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP
#CONFIGURE_ARGS+= --enable-time-hack
# - Set an explicit hostname in cachemgr.cgi
#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
# - Enable HTCP protocol
diff --git a/www/squidclients/Makefile b/www/squidclients/Makefile
index 3cb249e1c7df..429642dfc49c 100644
--- a/www/squidclients/Makefile
+++ b/www/squidclients/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: squidclients
-# Version required: 1.6
# Date created: 05 January 1999
# Whom: Dima Sivachenko
#
# $FreeBSD$
#
-DISTNAME= squidclients-1.6-freebsd.bin
-PKGNAME= squidclients-1.6
+PORTNAME= squidclients
+PORTVERSION= 1.6
CATEGORIES= www
MASTER_SITES= http://www.cineca.it/~nico/binaries/
+DISTNAME= squidclients-1.6-freebsd.bin
EXTRACT_SUFX=
MAINTAINER= dima@chg.ru
diff --git a/www/squidtimes/Makefile b/www/squidtimes/Makefile
index 8f6691928ccc..50ec52e13dd0 100644
--- a/www/squidtimes/Makefile
+++ b/www/squidtimes/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: squidtimes
-# Version required: 1.12
# Date created: 31 January 1999
# Whom: Dima Sivachenko
#
# $FreeBSD$
#
-DISTNAME= squidtimes-1.12-freebsd.bin
-PKGNAME= squidtimes-1.12
+PORTNAME= squidtimes
+PORTVERSION= 1.12
CATEGORIES= www
MASTER_SITES= http://www.cineca.it/~nico/binaries/ \
http://people.FreeBSD.org/~billf/
+DISTNAME= squidtimes-1.12-freebsd.bin
EXTRACT_SUFX=
MAINTAINER= dima@chg.ru
diff --git a/www/squirm/Makefile b/www/squirm/Makefile
index 0a5292626b8b..c0067dfc5b09 100644
--- a/www/squirm/Makefile
+++ b/www/squirm/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: squirm
-# Version required: 1.0betaB
# Date created: 24 May 1999
# Whom: Maxim Sobolev <sobomax@altavista.net>
#
# $FreeBSD$
#
-DISTNAME= squirm-1.0betaB
-PKGNAME= squirm-1.0b
+PORTNAME= squirm
+PORTVERSION= 1.0b
CATEGORIES= www
MASTER_SITES= http://www.senet.com.au/squirm/ \
http://www.elab.co.za/squirm/
+DISTNAME= squirm-1.0betaB
MAINTAINER= sobomax@altavista.net
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 66908cdf586e..f59e6e90929f 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: swish-e
-# Version required: 1.3.2
# Date created: 23 Feb 98
# Whom: Daniel O'Connor <doconnor@gsoft.com.au>
#
# $FreeBSD$
#
-DISTNAME= swish-efiles.1.3.2
-PKGNAME= swish-e-1.3.2
+PORTNAME= swish-e
+PORTVERSION= 1.3.2
CATEGORIES= www textproc
MASTER_SITES= ftp://sunsite.berkeley.edu/pub/swish-e/
+DISTNAME= swish-efiles.1.3.2
MAINTAINER= doconnor@gsoft.com.au
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index c8d3818e1254..ff4fb236a0ba 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: thttpd
-# Version required: thttpd-2.16
# Date created: 24 May 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= thttpd-2.16
+PORTNAME= thttpd
+PORTVERSION= 2.16
CATEGORIES= www ipv6
MASTER_SITES= http://www.acme.com/software/thttpd/ \
http://www.freenix.no/~anders/
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index 61c78d0b2b39..99e6675cc98a 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tidy
-# Version required: tidy13jan00
# Date created: 27 Oct 1998
# Whom: Abel Chow <achow@transoft.net>
#
# $FreeBSD$
#
-DISTNAME= tidy13jan00
-PKGNAME= tidy-20000113
+PORTNAME= tidy
+PORTVERSION= 20000113
CATEGORIES= www
MASTER_SITES= http://www.w3.org/People/Raggett/
+DISTNAME= tidy13jan00
EXTRACT_SUFX= .tgz
MAINTAINER= saken@hotel.rmta.org
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index 61c78d0b2b39..99e6675cc98a 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tidy
-# Version required: tidy13jan00
# Date created: 27 Oct 1998
# Whom: Abel Chow <achow@transoft.net>
#
# $FreeBSD$
#
-DISTNAME= tidy13jan00
-PKGNAME= tidy-20000113
+PORTNAME= tidy
+PORTVERSION= 20000113
CATEGORIES= www
MASTER_SITES= http://www.w3.org/People/Raggett/
+DISTNAME= tidy13jan00
EXTRACT_SUFX= .tgz
MAINTAINER= saken@hotel.rmta.org
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 52047740c9af..184332f038ad 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tinyproxy
-# Version required: 1.2.8
# Date created: 01 Jul 1999
# Whom: Mitsuru Yoshida <mitsuru@riken.go.jp>
#
# $FreeBSD$
#
-DISTNAME= tinyproxy-1.2.8
+PORTNAME= tinyproxy
+PORTVERSION= 1.2.8
CATEGORIES= www
MASTER_SITES= http://tinyproxy.attacca.com/ \
http://www.flarenet.com/tinyproxy/
diff --git a/www/transproxy/Makefile b/www/transproxy/Makefile
index 6a24c9b1d1f2..a7ffc81e35b0 100644
--- a/www/transproxy/Makefile
+++ b/www/transproxy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: transproxy
-# Version required: 1.2
# Date created: Fri Mar 27 21:24:13 WST 1998
# Whom: Peter Wemm <peter@netplex.com.au>
#
# $FreeBSD$
#
-DISTNAME= transproxy-1.2
+PORTNAME= transproxy
+PORTVERSION= 1.2
CATEGORIES= www net
MASTER_SITES= ftp://ftp.nlc.net.au/pub/unix/transproxy/
EXTRACT_SUFX= .tgz
diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 698cc769898e..0dc877642d7f 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: udmsearch
-# Version required: 2.2.1
# Date created: 11/29/1999
# Whom: Kelly Yancey <kbyanc@posi.net>
#
# $FreeBSD$
#
-DISTNAME= udmsearch-2.2.1b
+PORTNAME= udmsearch
+PORTVERSION= 2.2.1b
CATEGORIES= www databases
MASTER_SITES= http://mysearch.udm.net/Download/ \
ftp://ftp.izhcom.ru/pub/unix/UdmSearch/ \
diff --git a/www/vrweb/Makefile b/www/vrweb/Makefile
index e006c9b05d9b..699e28cbd232 100644
--- a/www/vrweb/Makefile
+++ b/www/vrweb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vrweb
-# Version required: 1.5
# Date created: 20 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= vrweb-1.5
+PORTNAME= vrweb
+PORTVERSION= 1.5
CATEGORIES= www
MASTER_SITES= ftp://ftp.iicm.edu/pub/VRweb/UNIX/vrweb-1.5/ \
ftp://ftp.sunet.se/pub/nir/Hyper-G/VRweb/UNIX/vrweb-1.5/ \
diff --git a/www/w3-4/Makefile b/www/w3-4/Makefile
index cd01ef4451c7..709d5e54c835 100644
--- a/www/w3-4/Makefile
+++ b/www/w3-4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: w3 on Emacs
-# Version required: 2.2.26
# Date created: 31 December 1996
# Whom: MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= w3-2.2.26
+PORTNAME= w3
+PORTVERSION= 2.2.26
CATEGORIES?= www elisp
MASTER_SITES= ftp://ftp.iij.ad.jp/pub/network/WWW/w3/ \
ftp://ftp.cs.indiana.edu/pub/elisp/w3/
@@ -53,7 +53,7 @@ post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PORTSDOCDIR}
@${MKDIR} ${SAMPLEDIR}
-.for f in dot.mosaic-hotlist-default
+.for f in dot.mosaic-hotlist-default
@${INSTALL_DATA} ${FILESDIR}/${f} ${SAMPLEDIR}
.endfor
.for f in dot.emacs
@@ -68,6 +68,6 @@ post-install:
INFODIR=${INFODIR} INFOFILE=${INFOFILE} \
ELISPDIR=${ELISPDIR} ADDIR=${ADDIR} \
DIRSECTION="${DIRSECTION}" \
- ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/www/w3/Makefile b/www/w3/Makefile
index cd01ef4451c7..709d5e54c835 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: w3 on Emacs
-# Version required: 2.2.26
# Date created: 31 December 1996
# Whom: MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= w3-2.2.26
+PORTNAME= w3
+PORTVERSION= 2.2.26
CATEGORIES?= www elisp
MASTER_SITES= ftp://ftp.iij.ad.jp/pub/network/WWW/w3/ \
ftp://ftp.cs.indiana.edu/pub/elisp/w3/
@@ -53,7 +53,7 @@ post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PORTSDOCDIR}
@${MKDIR} ${SAMPLEDIR}
-.for f in dot.mosaic-hotlist-default
+.for f in dot.mosaic-hotlist-default
@${INSTALL_DATA} ${FILESDIR}/${f} ${SAMPLEDIR}
.endfor
.for f in dot.emacs
@@ -68,6 +68,6 @@ post-install:
INFODIR=${INFODIR} INFOFILE=${INFOFILE} \
ELISPDIR=${ELISPDIR} ADDIR=${ADDIR} \
DIRSECTION="${DIRSECTION}" \
- ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 7445f3817e21..6a45eadd36c6 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: w3c-httpd
-# Version required: 3.0A
# Date created: 29 October 1994
# Whom: pst (orig)
#
# $FreeBSD$
#
-DISTNAME= w3c-httpd-3.0A
+PORTNAME= w3c-httpd
+PORTVERSION= 3.0A
CATEGORIES= www
MASTER_SITES= ftp://ftp.w3.org/pub/httpd/ \
ftp://ftp-eu.w3.org/pub/httpd/
diff --git a/www/w3m-ssl/Makefile b/www/w3m-ssl/Makefile
index a956531c24e6..705a7e5aa82e 100644
--- a/www/w3m-ssl/Makefile
+++ b/www/w3m-ssl/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: w3m-ssl
-# Version required: 991028-2
# Date Created: 12 Oct 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
# $FreeBSD$
#
-PKGNAME= w3m-ssl-${W3M_VER}
-CATEGORIES= www ipv6
+PORTNAME= w3m-ssl
+PORTVERSION= ${W3m_VER}
+CATEGORIES= www ipv6
MASTERDIR= ${.CURDIR}/../../www/w3m
PKGDIR= ${.CURDIR}/pkg
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 63f9362eb9c4..9dbf03fd29c6 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: w3m
-# Version required: 0.1.7
# Date Created: 7 Oct 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
# $FreeBSD$
#
-DISTNAME= w3m-${W3M_VER}
+PORTNAME?= w3m
+PORTVERSION?= ${W3M_VER}
CATEGORIES?= www ipv6
MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/ \
ftp://ftp.firedrake.org/w3m/dev/ \
diff --git a/www/w3mir/Makefile b/www/w3mir/Makefile
index 6b6801227166..e4c6bc41feb1 100644
--- a/www/w3mir/Makefile
+++ b/www/w3mir/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: w3mir
-# Version required: 1*
# Date created: 9 May 1998
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= w3mir-1.0.8
+PORTNAME= w3mir
+PORTVERSION= 1.0.8
CATEGORIES= www perl5
MASTER_SITES= http://www.math.uio.no/~janl/w3mir/
diff --git a/www/wcol/Makefile b/www/wcol/Makefile
index 2b64c54d5f7b..c0850372fc2f 100644
--- a/www/wcol/Makefile
+++ b/www/wcol/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wcolEpre
-# Version required: 990110_150126
# Date created: 17 July 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wcolEpre.990110_150126
-PKGNAME= wcolEpre-1999.01.10
+PORTNAME= wcolEpre
+PORTVERSION= 1999.01.10
CATEGORIES= www
MASTER_SITES= http://shika.aist-nara.ac.jp/products/DEST/Wcol/
+DISTNAME= wcolEpre.990110_150126
MAINTAINER= shige@FreeBSD.org
diff --git a/www/web500gw/Makefile b/www/web500gw/Makefile
index 357b74ddb6db..29c53e22a05c 100644
--- a/www/web500gw/Makefile
+++ b/www/web500gw/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: web500gw
-# Version required: 2.1b2
# Date created: 30 July 1998
# Whom: Brent J. Nordquist <bjn@visi.com>
#
# $FreeBSD$
#
-DISTNAME= web500gw-2.1b3
+PORTNAME= web500gw
+PORTVERSION= 2.1b3
CATEGORIES= www net
MASTER_SITES= ftp://ftp.tu-chemnitz.de/pub/Local/urz/web500gw/ \
http://www.tu-chemnitz.de/ftp-home/pub/Local/urz/web500gw/ \
diff --git a/www/webalizer-2/Makefile b/www/webalizer-2/Makefile
index 10a3493f5b25..7edfa8f7bbf9 100644
--- a/www/webalizer-2/Makefile
+++ b/www/webalizer-2/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: webalizer
-# Version required: 1.30.*
# Date created: 02.Jun 1998
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
+#
-DISTNAME= webalizer-1.30-04-src
-PKGNAME= webalizer-1.30.4
+PORTNAME= webalizer
+PORTVERSION= 1.30.4
CATEGORIES= www
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \
ftp://ftp.lan-ks.de/pub/approved/
+DISTNAME= webalizer-1.30-04-src
EXTRACT_SUFX= .tgz
MAINTAINER= dirk.meyer@dinoex.sub.org
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 10a3493f5b25..7edfa8f7bbf9 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: webalizer
-# Version required: 1.30.*
# Date created: 02.Jun 1998
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
+#
-DISTNAME= webalizer-1.30-04-src
-PKGNAME= webalizer-1.30.4
+PORTNAME= webalizer
+PORTVERSION= 1.30.4
CATEGORIES= www
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \
ftp://ftp.lan-ks.de/pub/approved/
+DISTNAME= webalizer-1.30-04-src
EXTRACT_SUFX= .tgz
MAINTAINER= dirk.meyer@dinoex.sub.org
diff --git a/www/webcheck/Makefile b/www/webcheck/Makefile
index a99067ad9882..807a75a3d735 100644
--- a/www/webcheck/Makefile
+++ b/www/webcheck/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: linbot
-# Version required: 0.8
# Date created: 19 September 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= linbot-0.9
+PORTNAME= linbot
+PORTVERSION= 0.9
CATEGORIES= www python
MASTER_SITES= http://starship.skyport.net/crew/marduk/linbot/download/
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index 9a4744b300d8..8941b5214be8 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: webcopy
-# Version required: 0.98b7
# Date created: 14 Sep 1996
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= webcopy
-PKGNAME= ${DISTNAME}-${VERSION}
+PORTNAME= webcopy
+PORTVERSION= 0.98b7
CATEGORIES= www
MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/utfsm/perl/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org
NO_PACKAGE= "This program cannot be distributed if modified in any way"
NO_CDROM= "Don't sell for profit without written permission"
WRKSRC= ${WRKDIR}/${PKGNAME}
-VERSION= 0.98b7
ALL_TARGET=
do-install:
diff --git a/www/webcrawl/Makefile b/www/webcrawl/Makefile
index a388dcafc808..ec95d9eecb06 100644
--- a/www/webcrawl/Makefile
+++ b/www/webcrawl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: webcrawl
-# Version required: 1.10
# Date created: 31 January 1999
# Whom: Dima Sivachenko
#
# $FreeBSD$
#
-DISTNAME= webcrawl-1.10
+PORTNAME= webcrawl
+PORTVERSION= 1.10
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/www/mirroring
diff --git a/www/webfs/Makefile b/www/webfs/Makefile
index 189ed7f620f1..ad792d446ea8 100644
--- a/www/webfs/Makefile
+++ b/www/webfs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: webfs
-# Version required: 1.0
# Date created: 18 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= webfs-1.0
+PORTNAME= webfs
+PORTVERSION= 1.0
CATEGORIES= www
MASTER_SITES= http://me.IN-Berlin.DE/~kraxel/dl/
diff --git a/www/webglimpse/Makefile b/www/webglimpse/Makefile
index 7cbafa680f3b..5d7ef62847a2 100644
--- a/www/webglimpse/Makefile
+++ b/www/webglimpse/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: WebGlimpse
-# http://glimpse.cs.arizona.edu/webglimpse/
-# Version required: 1.*
# Date created: 2 Nov 1998
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= webglimpse-1.6.src
-PKGNAME= webglimpse-1.6
+PORTNAME= webglimpse
+PORTVERSION= 1.6
CATEGORIES= www textproc
MASTER_SITES= ftp://ftp.cs.arizona.edu/glimpse/
+DISTNAME= ${PKGNAME}.src
MAINTAINER= ache@freebsd.org
diff --git a/www/weblint/Makefile b/www/weblint/Makefile
index f77a15a17c3c..f5298c0fb2c2 100644
--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: weblint
-# Version required: 1.020
# Date created: Oct 14, 1995
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= weblint-1.020
+PORTNAME= weblint
+PORTVERSION= 1.020
CATEGORIES= www
MASTER_SITES= ftp://ftp.cre.canon.co.uk/pub/weblint/
diff --git a/www/webstone/Makefile b/www/webstone/Makefile
index 5fe5c92ed930..9810e44dad23 100644
--- a/www/webstone/Makefile
+++ b/www/webstone/Makefile
@@ -1,23 +1,23 @@
# New ports collection makefile for: webstone
-# Version required: 2.0
# Date created: 25 March 1997
# Whom: Soren Dossing <sauber@netcom.com>
#
# $FreeBSD$
#
-DISTNAME= WebStone-2.0
-PKGNAME= webstone-2.0.1
-CATEGORIES= www benchmarks
+PORTNAME= webstone
+PORTVERSION= 2.0.1
+CATEGORIES= www benchmarks
#WebStone no longer distributed by SGi
-#MASTER_SITES= http://www.sgi.com/Products/WebFORCE/WebStone/
+#MASTER_SITES= http://www.sgi.com/Products/WebFORCE/WebStone/
+DISTNAME= WebStone-2.0
-MAINTAINER= sauber@netcom.com
+MAINTAINER= sauber@netcom.com
-GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/WebStone/src
-ALL_TARGET= install
-NO_INSTALL_MANPAGES=yes
+GNU_CONFIGURE= yes
+WRKSRC= ${WRKDIR}/WebStone/src
+ALL_TARGET= install
+NO_INSTALL_MANPAGES= yes
post-extract:
( cd ${WRKSRC}; make clobber )
diff --git a/www/wml/Makefile b/www/wml/Makefile
index fb6a9617440c..1d482a957618 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wml
-# Version required: 1.6.8
# Date created: 09-Sep-1997
# Whom: Ralf S. Engelschall <rse@engelschall.com>
#
# $FreeBSD$
#
-DISTNAME= wml-1.6.8
+PORTNAME= wml
+PORTVERSION= 1.6.8
CATEGORIES= www lang
MASTER_SITES= http://www.engelschall.com/sw/wml/distrib/ \
ftp://ftp.ch.engelschall.com/sw/wml/ \
diff --git a/www/wmnetselect/Makefile b/www/wmnetselect/Makefile
index f6a42ad6d07d..dc5578f4a24a 100644
--- a/www/wmnetselect/Makefile
+++ b/www/wmnetselect/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmnetselect
-# Version required: 0.4
# Date created: 7 March 1999
# Whom: David McNett <nugget@slacker.com>
#
# $FreeBSD$
#
-DISTNAME= wmnetselect-0.8
+PORTNAME= wmnetselect
+PORTVERSION= 0.8
CATEGORIES= www windowmaker
MASTER_SITES= http://home.att.net/~apathos/code/
diff --git a/www/wn/Makefile b/www/wn/Makefile
index d4696c15905b..94deedcbf51f 100644
--- a/www/wn/Makefile
+++ b/www/wn/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wn
-# Version required: 1.18
# Date created: 4 May 1995
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= wn-1.18.6
+PORTNAME= wn
+PORTVERSION= 1.18.6
CATEGORIES= www
MASTER_SITES= ftp://ftp.acns.nwu.edu/pub/wn/
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index 4c91eb9c4f78..ed8f1a392d6d 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wwwcount
-# Version required: 2.5
# Date created: 16 May 1996
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= wwwcount2.5
-PKGNAME= wwwcount-2.5
+PORTNAME= wwwcount
+PORTVERSION= 2.5
CATEGORIES= www
MASTER_SITES= http://www.muquit.com/muquit/software/Count/src/wwwcount2.5/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= dervish@ikhala.tcimet.net
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index adb9d3229eed..9afafaa51bef 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wwwoffle
-# Version required: 2.4
# Date created: 1 Jun 1998
# Whom: Peter Mutsaers
#
# $FreeBSD$
#
-DISTNAME= wwwoffle-2.4
+PORTNAME= wwwoffle
+PORTVERSION= 2.4
CATEGORIES= www
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/httpd/ \
${MASTER_SITE_SUNSITE}
diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile
index e121de53f78d..b465065e8f2a 100644
--- a/www/wwwstat/Makefile
+++ b/www/wwwstat/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: wwwstat
-# Version required: 2.01
# Date created: So 2 M-Aär 1997 18:10:49 MET$)B
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= wwwstat-2.0
-PKGNAME= wwwstat-2.01
+PORTNAME= wwwstat
+PORTVERSION= 2.01
CATEGORIES= www
MASTER_SITES= ftp://www.ics.uci.edu/pub/websoft/wwwstat/ \
ftp://ftp.gwdg.de/pub/misc/www-stat/websoft/wwwstat/
+DISTNAME= ${PORTNAME}-2.0
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= patch-2.01.txt
diff --git a/www/xitami/Makefile b/www/xitami/Makefile
index d226152261c2..9b4368f1be06 100644
--- a/www/xitami/Makefile
+++ b/www/xitami/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Xitami HTTP Server
-# Version required: 2.3d
# Date created: 15 Oct 1997
# Whom: Ian Vaudrey <i.vaudrey@cableinet.co.uk>
#
# $FreeBSD$
#
-DISTNAME= xiuni23d
-PKGNAME= xitami-2.3d
+PORTNAME= xitami
+PORTVERSION= 2.3d
CATEGORIES= www
MASTER_SITES= http://www.imatix.com/pub/xitami/
+DISTNAME= xiuni23d
EXTRACT_SUFX= .tgz
MAINTAINER= i.vaudrey@cableinet.co.uk
diff --git a/www/zope/Makefile b/www/zope/Makefile
index b05286b087da..eb1089f3881c 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,14 +1,16 @@
# New ports collection makefile for: Zope
-# Version required: 2.0.1
# Date created: Sat 21 Aug 1999
# Whom: Peter Cornelius <pcc@gmx.net>
#
# $FreeBSD$
+#
+PORTNAME= zope
+PORTVERSION= 2.0.0b5
DISTNAME= Zope-${VERSION}-src
-PKGNAME= zope-${VERSION}
CATEGORIES= www python
MASTER_SITES= http://www.zope.org/Products/Zope/${VERSION}/
+DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -24,10 +26,9 @@ do-build: # empty, but needs to be there for the python dependency.
# then on, data, cgi-bin and such. Thus, I decided that Zope belongs
# there, too. I don't know whether this still applies to current apache
# releases, though. I still run 2.2.8-STABLE.
-VERSION= 2.0.0b5
-PLIST_SUB= ZOPEBASEDIR=www/Zope-${VERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${VERSION}
+PLIST_SUB= ZOPEBASEDIR=www/Zope-${PORTVERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${PORTVERSION}
WEBBASEDIR?= ${PREFIX}/www
-ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${VERSION}
+ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${PORTVERSION}
CGI_BIN_DIR?= ${PREFIX}/share/apache/cgi-bin
APACHE_CONFDIR?= ${PREFIX}/etc/apache
PYTHON15?= ${PREFIX}/bin/python1.5
@@ -55,11 +56,11 @@ do-install: #
${CHMOD} ugo+rwt var ; \
${ECHO} "===> Setting user/password to zopemaster/test..." ; \
${PYTHON15} zpasswd.py -u zopemaster -p test -e CLEARTEXT access ; \
- ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
- ${CP} -p ${FILESDIR}/apache.conf.Zope-${VERSION}-Changes ${APACHE_CONFDIR}/ ; \
+ ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
+ ${CP} -p ${FILESDIR}/apache.conf.Zope-${PORTVERSION}-Changes ${APACHE_CONFDIR}/ ; \
${ECHO} "===> Please have a look at this file and the instructions" ; \
${ECHO} "===> therein and incorporate them to your apache.conf." ; \
- ${ECHO} "===> Creating rc startup file for Zope-${VERSION}..." ; \
+ ${ECHO} "===> Creating rc startup file for Zope-${PORTVERSION}..." ; \
${ECHO} "#! /bin/sh" > ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "${ZOPEBASEDIR}/start -w '' -f '' -m '' -p ${CGI_BIN_DIR}/Zope.cgi &" >> ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "echo -n \" Zope\"" >> ${PREFIX}/etc/rc.d/zope.sh ; \
@@ -68,7 +69,7 @@ do-install: #
${CAT} ${FILESDIR}/Message ; \
${ECHO} "===> Your Zope base directory is ${ZOPEBASEDIR}." ; \
${ECHO} "===> The Zope license is in ${ZOPEBASEDIR}/LICENSE.txt." ; \
- ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
+ ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
${ECHO} "===> Zope.cgi and pcgi-wrapper live in ${CGI_BIN_DIR}." )
#pre-deinstall: # Save Database contents. I expect /tmp to have sufficient
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index b05286b087da..eb1089f3881c 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -1,14 +1,16 @@
# New ports collection makefile for: Zope
-# Version required: 2.0.1
# Date created: Sat 21 Aug 1999
# Whom: Peter Cornelius <pcc@gmx.net>
#
# $FreeBSD$
+#
+PORTNAME= zope
+PORTVERSION= 2.0.0b5
DISTNAME= Zope-${VERSION}-src
-PKGNAME= zope-${VERSION}
CATEGORIES= www python
MASTER_SITES= http://www.zope.org/Products/Zope/${VERSION}/
+DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -24,10 +26,9 @@ do-build: # empty, but needs to be there for the python dependency.
# then on, data, cgi-bin and such. Thus, I decided that Zope belongs
# there, too. I don't know whether this still applies to current apache
# releases, though. I still run 2.2.8-STABLE.
-VERSION= 2.0.0b5
-PLIST_SUB= ZOPEBASEDIR=www/Zope-${VERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${VERSION}
+PLIST_SUB= ZOPEBASEDIR=www/Zope-${PORTVERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${PORTVERSION}
WEBBASEDIR?= ${PREFIX}/www
-ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${VERSION}
+ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${PORTVERSION}
CGI_BIN_DIR?= ${PREFIX}/share/apache/cgi-bin
APACHE_CONFDIR?= ${PREFIX}/etc/apache
PYTHON15?= ${PREFIX}/bin/python1.5
@@ -55,11 +56,11 @@ do-install: #
${CHMOD} ugo+rwt var ; \
${ECHO} "===> Setting user/password to zopemaster/test..." ; \
${PYTHON15} zpasswd.py -u zopemaster -p test -e CLEARTEXT access ; \
- ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
- ${CP} -p ${FILESDIR}/apache.conf.Zope-${VERSION}-Changes ${APACHE_CONFDIR}/ ; \
+ ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
+ ${CP} -p ${FILESDIR}/apache.conf.Zope-${PORTVERSION}-Changes ${APACHE_CONFDIR}/ ; \
${ECHO} "===> Please have a look at this file and the instructions" ; \
${ECHO} "===> therein and incorporate them to your apache.conf." ; \
- ${ECHO} "===> Creating rc startup file for Zope-${VERSION}..." ; \
+ ${ECHO} "===> Creating rc startup file for Zope-${PORTVERSION}..." ; \
${ECHO} "#! /bin/sh" > ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "${ZOPEBASEDIR}/start -w '' -f '' -m '' -p ${CGI_BIN_DIR}/Zope.cgi &" >> ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "echo -n \" Zope\"" >> ${PREFIX}/etc/rc.d/zope.sh ; \
@@ -68,7 +69,7 @@ do-install: #
${CAT} ${FILESDIR}/Message ; \
${ECHO} "===> Your Zope base directory is ${ZOPEBASEDIR}." ; \
${ECHO} "===> The Zope license is in ${ZOPEBASEDIR}/LICENSE.txt." ; \
- ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
+ ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
${ECHO} "===> Zope.cgi and pcgi-wrapper live in ${CGI_BIN_DIR}." )
#pre-deinstall: # Save Database contents. I expect /tmp to have sufficient
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index b05286b087da..eb1089f3881c 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -1,14 +1,16 @@
# New ports collection makefile for: Zope
-# Version required: 2.0.1
# Date created: Sat 21 Aug 1999
# Whom: Peter Cornelius <pcc@gmx.net>
#
# $FreeBSD$
+#
+PORTNAME= zope
+PORTVERSION= 2.0.0b5
DISTNAME= Zope-${VERSION}-src
-PKGNAME= zope-${VERSION}
CATEGORIES= www python
MASTER_SITES= http://www.zope.org/Products/Zope/${VERSION}/
+DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -24,10 +26,9 @@ do-build: # empty, but needs to be there for the python dependency.
# then on, data, cgi-bin and such. Thus, I decided that Zope belongs
# there, too. I don't know whether this still applies to current apache
# releases, though. I still run 2.2.8-STABLE.
-VERSION= 2.0.0b5
-PLIST_SUB= ZOPEBASEDIR=www/Zope-${VERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${VERSION}
+PLIST_SUB= ZOPEBASEDIR=www/Zope-${PORTVERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${PORTVERSION}
WEBBASEDIR?= ${PREFIX}/www
-ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${VERSION}
+ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${PORTVERSION}
CGI_BIN_DIR?= ${PREFIX}/share/apache/cgi-bin
APACHE_CONFDIR?= ${PREFIX}/etc/apache
PYTHON15?= ${PREFIX}/bin/python1.5
@@ -55,11 +56,11 @@ do-install: #
${CHMOD} ugo+rwt var ; \
${ECHO} "===> Setting user/password to zopemaster/test..." ; \
${PYTHON15} zpasswd.py -u zopemaster -p test -e CLEARTEXT access ; \
- ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
- ${CP} -p ${FILESDIR}/apache.conf.Zope-${VERSION}-Changes ${APACHE_CONFDIR}/ ; \
+ ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
+ ${CP} -p ${FILESDIR}/apache.conf.Zope-${PORTVERSION}-Changes ${APACHE_CONFDIR}/ ; \
${ECHO} "===> Please have a look at this file and the instructions" ; \
${ECHO} "===> therein and incorporate them to your apache.conf." ; \
- ${ECHO} "===> Creating rc startup file for Zope-${VERSION}..." ; \
+ ${ECHO} "===> Creating rc startup file for Zope-${PORTVERSION}..." ; \
${ECHO} "#! /bin/sh" > ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "${ZOPEBASEDIR}/start -w '' -f '' -m '' -p ${CGI_BIN_DIR}/Zope.cgi &" >> ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "echo -n \" Zope\"" >> ${PREFIX}/etc/rc.d/zope.sh ; \
@@ -68,7 +69,7 @@ do-install: #
${CAT} ${FILESDIR}/Message ; \
${ECHO} "===> Your Zope base directory is ${ZOPEBASEDIR}." ; \
${ECHO} "===> The Zope license is in ${ZOPEBASEDIR}/LICENSE.txt." ; \
- ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
+ ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
${ECHO} "===> Zope.cgi and pcgi-wrapper live in ${CGI_BIN_DIR}." )
#pre-deinstall: # Save Database contents. I expect /tmp to have sufficient
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index b05286b087da..eb1089f3881c 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -1,14 +1,16 @@
# New ports collection makefile for: Zope
-# Version required: 2.0.1
# Date created: Sat 21 Aug 1999
# Whom: Peter Cornelius <pcc@gmx.net>
#
# $FreeBSD$
+#
+PORTNAME= zope
+PORTVERSION= 2.0.0b5
DISTNAME= Zope-${VERSION}-src
-PKGNAME= zope-${VERSION}
CATEGORIES= www python
MASTER_SITES= http://www.zope.org/Products/Zope/${VERSION}/
+DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -24,10 +26,9 @@ do-build: # empty, but needs to be there for the python dependency.
# then on, data, cgi-bin and such. Thus, I decided that Zope belongs
# there, too. I don't know whether this still applies to current apache
# releases, though. I still run 2.2.8-STABLE.
-VERSION= 2.0.0b5
-PLIST_SUB= ZOPEBASEDIR=www/Zope-${VERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${VERSION}
+PLIST_SUB= ZOPEBASEDIR=www/Zope-${PORTVERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${PORTVERSION}
WEBBASEDIR?= ${PREFIX}/www
-ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${VERSION}
+ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${PORTVERSION}
CGI_BIN_DIR?= ${PREFIX}/share/apache/cgi-bin
APACHE_CONFDIR?= ${PREFIX}/etc/apache
PYTHON15?= ${PREFIX}/bin/python1.5
@@ -55,11 +56,11 @@ do-install: #
${CHMOD} ugo+rwt var ; \
${ECHO} "===> Setting user/password to zopemaster/test..." ; \
${PYTHON15} zpasswd.py -u zopemaster -p test -e CLEARTEXT access ; \
- ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
- ${CP} -p ${FILESDIR}/apache.conf.Zope-${VERSION}-Changes ${APACHE_CONFDIR}/ ; \
+ ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
+ ${CP} -p ${FILESDIR}/apache.conf.Zope-${PORTVERSION}-Changes ${APACHE_CONFDIR}/ ; \
${ECHO} "===> Please have a look at this file and the instructions" ; \
${ECHO} "===> therein and incorporate them to your apache.conf." ; \
- ${ECHO} "===> Creating rc startup file for Zope-${VERSION}..." ; \
+ ${ECHO} "===> Creating rc startup file for Zope-${PORTVERSION}..." ; \
${ECHO} "#! /bin/sh" > ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "${ZOPEBASEDIR}/start -w '' -f '' -m '' -p ${CGI_BIN_DIR}/Zope.cgi &" >> ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "echo -n \" Zope\"" >> ${PREFIX}/etc/rc.d/zope.sh ; \
@@ -68,7 +69,7 @@ do-install: #
${CAT} ${FILESDIR}/Message ; \
${ECHO} "===> Your Zope base directory is ${ZOPEBASEDIR}." ; \
${ECHO} "===> The Zope license is in ${ZOPEBASEDIR}/LICENSE.txt." ; \
- ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
+ ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
${ECHO} "===> Zope.cgi and pcgi-wrapper live in ${CGI_BIN_DIR}." )
#pre-deinstall: # Save Database contents. I expect /tmp to have sufficient
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index b05286b087da..eb1089f3881c 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -1,14 +1,16 @@
# New ports collection makefile for: Zope
-# Version required: 2.0.1
# Date created: Sat 21 Aug 1999
# Whom: Peter Cornelius <pcc@gmx.net>
#
# $FreeBSD$
+#
+PORTNAME= zope
+PORTVERSION= 2.0.0b5
DISTNAME= Zope-${VERSION}-src
-PKGNAME= zope-${VERSION}
CATEGORIES= www python
MASTER_SITES= http://www.zope.org/Products/Zope/${VERSION}/
+DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -24,10 +26,9 @@ do-build: # empty, but needs to be there for the python dependency.
# then on, data, cgi-bin and such. Thus, I decided that Zope belongs
# there, too. I don't know whether this still applies to current apache
# releases, though. I still run 2.2.8-STABLE.
-VERSION= 2.0.0b5
-PLIST_SUB= ZOPEBASEDIR=www/Zope-${VERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${VERSION}
+PLIST_SUB= ZOPEBASEDIR=www/Zope-${PORTVERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${PORTVERSION}
WEBBASEDIR?= ${PREFIX}/www
-ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${VERSION}
+ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${PORTVERSION}
CGI_BIN_DIR?= ${PREFIX}/share/apache/cgi-bin
APACHE_CONFDIR?= ${PREFIX}/etc/apache
PYTHON15?= ${PREFIX}/bin/python1.5
@@ -55,11 +56,11 @@ do-install: #
${CHMOD} ugo+rwt var ; \
${ECHO} "===> Setting user/password to zopemaster/test..." ; \
${PYTHON15} zpasswd.py -u zopemaster -p test -e CLEARTEXT access ; \
- ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
- ${CP} -p ${FILESDIR}/apache.conf.Zope-${VERSION}-Changes ${APACHE_CONFDIR}/ ; \
+ ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
+ ${CP} -p ${FILESDIR}/apache.conf.Zope-${PORTVERSION}-Changes ${APACHE_CONFDIR}/ ; \
${ECHO} "===> Please have a look at this file and the instructions" ; \
${ECHO} "===> therein and incorporate them to your apache.conf." ; \
- ${ECHO} "===> Creating rc startup file for Zope-${VERSION}..." ; \
+ ${ECHO} "===> Creating rc startup file for Zope-${PORTVERSION}..." ; \
${ECHO} "#! /bin/sh" > ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "${ZOPEBASEDIR}/start -w '' -f '' -m '' -p ${CGI_BIN_DIR}/Zope.cgi &" >> ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "echo -n \" Zope\"" >> ${PREFIX}/etc/rc.d/zope.sh ; \
@@ -68,7 +69,7 @@ do-install: #
${CAT} ${FILESDIR}/Message ; \
${ECHO} "===> Your Zope base directory is ${ZOPEBASEDIR}." ; \
${ECHO} "===> The Zope license is in ${ZOPEBASEDIR}/LICENSE.txt." ; \
- ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
+ ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
${ECHO} "===> Zope.cgi and pcgi-wrapper live in ${CGI_BIN_DIR}." )
#pre-deinstall: # Save Database contents. I expect /tmp to have sufficient
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index b05286b087da..eb1089f3881c 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -1,14 +1,16 @@
# New ports collection makefile for: Zope
-# Version required: 2.0.1
# Date created: Sat 21 Aug 1999
# Whom: Peter Cornelius <pcc@gmx.net>
#
# $FreeBSD$
+#
+PORTNAME= zope
+PORTVERSION= 2.0.0b5
DISTNAME= Zope-${VERSION}-src
-PKGNAME= zope-${VERSION}
CATEGORIES= www python
MASTER_SITES= http://www.zope.org/Products/Zope/${VERSION}/
+DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -24,10 +26,9 @@ do-build: # empty, but needs to be there for the python dependency.
# then on, data, cgi-bin and such. Thus, I decided that Zope belongs
# there, too. I don't know whether this still applies to current apache
# releases, though. I still run 2.2.8-STABLE.
-VERSION= 2.0.0b5
-PLIST_SUB= ZOPEBASEDIR=www/Zope-${VERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${VERSION}
+PLIST_SUB= ZOPEBASEDIR=www/Zope-${PORTVERSION} CGIBINDIR=share/apache/cgi-bin VERSION=${PORTVERSION}
WEBBASEDIR?= ${PREFIX}/www
-ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${VERSION}
+ZOPEBASEDIR?= ${WEBBASEDIR}/Zope-${PORTVERSION}
CGI_BIN_DIR?= ${PREFIX}/share/apache/cgi-bin
APACHE_CONFDIR?= ${PREFIX}/etc/apache
PYTHON15?= ${PREFIX}/bin/python1.5
@@ -55,11 +56,11 @@ do-install: #
${CHMOD} ugo+rwt var ; \
${ECHO} "===> Setting user/password to zopemaster/test..." ; \
${PYTHON15} zpasswd.py -u zopemaster -p test -e CLEARTEXT access ; \
- ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
- ${CP} -p ${FILESDIR}/apache.conf.Zope-${VERSION}-Changes ${APACHE_CONFDIR}/ ; \
+ ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
+ ${CP} -p ${FILESDIR}/apache.conf.Zope-${PORTVERSION}-Changes ${APACHE_CONFDIR}/ ; \
${ECHO} "===> Please have a look at this file and the instructions" ; \
${ECHO} "===> therein and incorporate them to your apache.conf." ; \
- ${ECHO} "===> Creating rc startup file for Zope-${VERSION}..." ; \
+ ${ECHO} "===> Creating rc startup file for Zope-${PORTVERSION}..." ; \
${ECHO} "#! /bin/sh" > ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "${ZOPEBASEDIR}/start -w '' -f '' -m '' -p ${CGI_BIN_DIR}/Zope.cgi &" >> ${PREFIX}/etc/rc.d/zope.sh ; \
${ECHO} "echo -n \" Zope\"" >> ${PREFIX}/etc/rc.d/zope.sh ; \
@@ -68,7 +69,7 @@ do-install: #
${CAT} ${FILESDIR}/Message ; \
${ECHO} "===> Your Zope base directory is ${ZOPEBASEDIR}." ; \
${ECHO} "===> The Zope license is in ${ZOPEBASEDIR}/LICENSE.txt." ; \
- ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${VERSION}-Changes." ; \
+ ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-${PORTVERSION}-Changes." ; \
${ECHO} "===> Zope.cgi and pcgi-wrapper live in ${CGI_BIN_DIR}." )
#pre-deinstall: # Save Database contents. I expect /tmp to have sufficient