aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--astro/dgpsip/Makefile4
-rw-r--r--astro/ephem/Makefile6
-rw-r--r--astro/luna/Makefile6
-rw-r--r--astro/openuniverse/Makefile4
-rw-r--r--astro/pyweather/Makefile6
-rw-r--r--astro/saoimage/Makefile4
-rw-r--r--astro/sattrack/Makefile14
-rw-r--r--astro/stars/Makefile6
-rw-r--r--astro/sunclock/Makefile4
-rw-r--r--astro/tkseti/Makefile4
-rw-r--r--astro/wmglobe/Makefile4
-rw-r--r--astro/wmmoonclock/Makefile4
-rw-r--r--astro/wmspaceweather/Makefile6
-rw-r--r--astro/wmsun/Makefile6
-rw-r--r--astro/x3arth/Makefile4
-rw-r--r--astro/xearth/Makefile4
-rw-r--r--astro/xephem/Makefile4
-rw-r--r--astro/xglobe/Makefile6
-rw-r--r--astro/xphoon/Makefile6
-rw-r--r--astro/xplanet/Makefile4
-rw-r--r--astro/xtide/Makefile4
-rw-r--r--benchmarks/bonnie/Makefile6
-rw-r--r--benchmarks/bytebench/Makefile6
-rw-r--r--benchmarks/dbs/Makefile4
-rw-r--r--benchmarks/iozone/Makefile6
-rw-r--r--benchmarks/iozone21/Makefile10
-rw-r--r--benchmarks/lmbench/Makefile6
-rw-r--r--benchmarks/nbench/Makefile6
-rw-r--r--benchmarks/netperf/Makefile6
-rw-r--r--benchmarks/netpipe/Makefile4
-rw-r--r--benchmarks/polygraph/Makefile6
-rw-r--r--benchmarks/polygraph31/Makefile6
-rw-r--r--benchmarks/postmark/Makefile5
-rw-r--r--benchmarks/rawio/Makefile4
-rw-r--r--benchmarks/tcpblast/Makefile5
-rw-r--r--benchmarks/unixbench/Makefile6
-rw-r--r--benchmarks/xengine/Makefile4
-rw-r--r--biology/babel/Makefile4
-rw-r--r--biology/deft/Makefile8
-rw-r--r--biology/gperiodic/Makefile4
-rw-r--r--biology/hmmer/Makefile4
-rw-r--r--biology/kinemage/Makefile6
-rw-r--r--biology/molden/Makefile7
-rw-r--r--biology/mopac/Makefile5
-rw-r--r--biology/ortep3/Makefile16
-rw-r--r--biology/platon/Makefile6
-rw-r--r--biology/povchem/Makefile4
-rw-r--r--biology/psi88/Makefile6
-rw-r--r--biology/rasmol/Makefile12
-rw-r--r--biology/seaview/Makefile12
-rw-r--r--biology/tinker/Makefile6
-rw-r--r--biology/xmolwt/Makefile4
-rw-r--r--deskutils/abacus/Makefile6
-rw-r--r--deskutils/cal/Makefile4
-rw-r--r--deskutils/cbb/Makefile4
-rw-r--r--deskutils/gaddr/Makefile4
-rw-r--r--deskutils/genius/Makefile4
-rw-r--r--deskutils/gnofin/Makefile4
-rw-r--r--deskutils/gnome-pim/Makefile6
-rw-r--r--deskutils/gnomepim/Makefile6
-rw-r--r--deskutils/gnucash/Makefile4
-rw-r--r--deskutils/gtimer/Makefile4
-rw-r--r--deskutils/ical/Makefile4
-rw-r--r--deskutils/korganizer/Makefile6
-rw-r--r--deskutils/kproject/Makefile4
-rw-r--r--deskutils/offix-trash/Makefile6
-rw-r--r--deskutils/plan/Makefile4
-rw-r--r--deskutils/sliderule/Makefile6
-rw-r--r--deskutils/teapot/Makefile4
-rw-r--r--deskutils/wmpinboard/Makefile4
-rw-r--r--deskutils/xinvest/Makefile4
-rw-r--r--deskutils/xmaddressbook/Makefile4
-rw-r--r--deskutils/xmdiary/Makefile4
-rw-r--r--deskutils/xopps/Makefile6
-rw-r--r--deskutils/xpostit/Makefile21
-rw-r--r--deskutils/xpostitPlus/Makefile4
-rw-r--r--deskutils/xrolo/Makefile6
-rw-r--r--deskutils/xwrits/Makefile4
-rw-r--r--deskutils/yank/Makefile4
-rw-r--r--deskutils/zorro/Makefile6
-rw-r--r--finance/cbb/Makefile4
-rw-r--r--finance/gnofin/Makefile4
-rw-r--r--finance/gnucash-devel/Makefile4
-rw-r--r--finance/gnucash/Makefile4
-rw-r--r--finance/xinvest/Makefile4
-rw-r--r--german/BBBike/Makefile4
-rw-r--r--german/cheapcall/Makefile6
-rw-r--r--german/dict/Makefile12
-rw-r--r--german/manpages/Makefile4
-rw-r--r--german/phone/Makefile6
-rw-r--r--german/staroffice5/Makefile6
-rw-r--r--german/staroffice52/Makefile6
-rw-r--r--german/webalizer/Makefile6
-rw-r--r--german/webalizer2/Makefile6
94 files changed, 262 insertions, 265 deletions
diff --git a/astro/dgpsip/Makefile b/astro/dgpsip/Makefile
index 5710c84afe7a..d8e83c9f2954 100644
--- a/astro/dgpsip/Makefile
+++ b/astro/dgpsip/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dgpsip
-# Version required: 1.25
# Date created: 05 Jun 1999
# Whom: Daniel Baker <dbaker@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= dgpsip-1.32
+PORTNAME= dgpsip
+PORTVERSION= 1.32
CATEGORIES= astro
MASTER_SITES= http://www.wsrcc.com/wolfgang/ftp/
diff --git a/astro/ephem/Makefile b/astro/ephem/Makefile
index 1fa41e967391..b183daeeb7ce 100644
--- a/astro/ephem/Makefile
+++ b/astro/ephem/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ephem
-# Version required: 4.28
# Date created: 3 April 1997
# Whom: eserte
#
# $FreeBSD$
#
-DISTNAME= ephem_4.28_unix
-PKGNAME= ephem-4.28
+PORTNAME= ephem
+PORTVERSION= 4.28
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_LOCAL}
+DISTNAME= ${PORTNAME}_${PORTVERSION}_unix
MAINTAINER= eserte@cs.tu-berlin.de
diff --git a/astro/luna/Makefile b/astro/luna/Makefile
index 4bb8c75ae193..ab40d0e184c8 100644
--- a/astro/luna/Makefile
+++ b/astro/luna/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: luna
-# Version required: 1.9
# Date created: 03 July 1996
# Whom: ABURAYER Rewsirow <rewsirow@ff.iij4u.or.jp>
#
# $FreeBSD$
#
-DISTNAME= luna19s
-PKGNAME= luna-1.9
+PORTNAME= luna
+PORTVERSION= 1.9
CATEGORIES= astro games
MASTER_SITES= ftp://ftp.vector.co.jp/pack/dos/edu/science/space/
+DISTNAME= luna19s
EXTRACT_SUFX= .lzh
MAINTAINER= rewsirow@ff.iij4u.or.jp
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile
index 5ff7715ed89b..b5eb25ede2bd 100644
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ssystem
-# Version required: 1.6
# Date created: 4 August 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= ssystem-1.6
+PORTNAME= ssystem
+PORTVERSION= 1.6
CATEGORIES= astro
MASTER_SITES= http://plasma.gsfc.nasa.gov/Ssystem/ \
http://www.wam.umd.edu/~kamelkev/Ssystem/ \
diff --git a/astro/pyweather/Makefile b/astro/pyweather/Makefile
index 47eee525b3dd..6fb472a13bb9 100644
--- a/astro/pyweather/Makefile
+++ b/astro/pyweather/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pyWeather
-# Version required: 0.1b
# Date created: 18 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= pyWeather
-PKGNAME= pyWeather-0.1b
+PORTNAME= pyWeather
+PORTVERSION= 0.1b
CATEGORIES= astro python
MASTER_SITES= http://members.bellatlantic.net/~rasclkng/
+DISTNAME= pyWeather
MAINTAINER= will@FreeBSD.org
diff --git a/astro/saoimage/Makefile b/astro/saoimage/Makefile
index 0c9337727aa0..70471cad96ca 100644
--- a/astro/saoimage/Makefile
+++ b/astro/saoimage/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: saoimage
-# Version required: 1.26.10
# Date created: 21 Feb 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= saoimage-1.26.10
+PORTNAME= saoimage
+PORTVERSION= 1.26.10
CATEGORIES= astro
MASTER_SITES= ftp://cfa-ftp.harvard.edu/pub/gsc/SAOimage/
diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile
index 31cc1767d778..c6a527f966a0 100644
--- a/astro/sattrack/Makefile
+++ b/astro/sattrack/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: sattrack
-# Version required: 3.1.6
# Date created: 6 Apr 1996
# Whom: Brent J. Nordquist <bjn@visi.com>
#
# $FreeBSD$
#
-DISTNAME= sattrack-3.1.6
-CATEGORIES= astro
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+PORTNAME= sattrack
+PORTVERSION= 3.1.6
+CATEGORIES= astro
+MASTER_SITES= ${MASTER_SITE_LOCAL}
-MAINTAINER= bjn@visi.com
+MAINTAINER= bjn@visi.com
-USE_XLIB= yes
-WRKSRC= ${WRKDIR}/SatTrack-3.1.6/src
+USE_XLIB= yes
+WRKSRC= ${WRKDIR}/SatTrack-${PORTVERSION}/src
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/astro/stars/Makefile b/astro/stars/Makefile
index 69d236d10e81..9d0fff1f519d 100644
--- a/astro/stars/Makefile
+++ b/astro/stars/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: stars-1.0
-# Version required: 1.0
# Date created: 10 Jul 1996
# Whom: searle
#
# $FreeBSD$
#
-DISTNAME= stars-1.0-ss-10.20
-PKGNAME= stars-1.0
+PORTNAME= stars
+PORTVERSION= 1.0
CATEGORIES= astro
MASTER_SITES= ftp://hpux.csc.liv.ac.uk/hpux/X11/Demos/stars-1.0/ \
ftp://askdonald.ask.uni-karlsruhe.de/hpux/X11/Demos/stars-1.0/
+DISTNAME= stars-1.0-ss-10.20
MAINTAINER= jseger@FreeBSD.org
diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 131c59f70c57..415cd6f086aa 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sunclock
-# Version required: 1.3
# Date created: 15 September 1996
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= sunclock-1.5
+PORTNAME= sunclock
+PORTVERSION= 1.5
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/astro/tkseti/Makefile b/astro/tkseti/Makefile
index e2bf9a1a644d..5bea75f397b9 100644
--- a/astro/tkseti/Makefile
+++ b/astro/tkseti/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: tkseti
-# Version required: 1.42
# Date created: 30 Jun 1999
# Whom: Brett Taylor <brett@peloton.physics.montana.edu>
#
# $FreeBSD$
#
-DISTNAME= tkseti-1.46
+PORTNAME= tkseti
+PORTVERSION= 1.46
CATEGORIES= astro tk82
MASTER_SITES= http://www.cuug.ab.ca/~macdonal/tkseti/
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index 130a84ae5332..c7972483e546 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmglobe
-# Version required: 1.0
# Date created: 23 Jun 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= wmglobe-1.0
+PORTNAME= wmglobe
+PORTVERSION= 1.0
CATEGORIES= astro windowmaker
MASTER_SITES= http://perso.linuxfr.org/jdumont/wmg/
diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile
index df6865234f83..e7881e9c57d4 100644
--- a/astro/wmmoonclock/Makefile
+++ b/astro/wmmoonclock/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmMoonClock
-# Version required: 1.27
# Date created: 14 March 1999
# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
#
# $FreeBSD$
#
-DISTNAME= wmMoonClock-1.27
+PORTNAME= wmMoonClock
+PORTVERSION= 1.27
CATEGORIES= astro windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index b6219b27d6d7..662ef0c7aa85 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: wmSpaceWeather
-# Version required: 1.04
# Date created: 16 April 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
-DISTNAME= wmSpaceWeather-1.04
-PKGNAME= wmspaceweather-1.04
+PORTNAME= wmspaceweather
+PORTVERSION= 1.04
CATEGORIES= astro windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
+DISTNAME= wmSpaceWeather-1.04
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile
index ae422201cef3..bf63f4169e73 100644
--- a/astro/wmsun/Makefile
+++ b/astro/wmsun/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: wmSun
-# Version required: 1.03
# Date created: 16 April 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
-DISTNAME= wmSun-1.03
-PKGNAME= wmsun-1.03
+PORTNAME= wmsun
+PORTVERSION= 1.03
CATEGORIES= astro windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
+DISTNAME= wmSun-1.03
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/astro/x3arth/Makefile b/astro/x3arth/Makefile
index c99aefe1eaad..73c77a8b4110 100644
--- a/astro/x3arth/Makefile
+++ b/astro/x3arth/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: x3arth
-# Version required: 1.1
# Date created: 15 April 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= x3arth-1.1
+PORTNAME= x3arth
+PORTVERSION= 1.1
CATEGORIES= astro tcl82
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index 83d71f22fde7..f9bc8bb1bf58 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xearth
-# Version required: 1.1
# Date created: 29 October 1995
# Whom: piero
#
# $FreeBSD$
#
-DISTNAME= xearth-1.1
+PORTNAME= xearth
+PORTVERSION= 1.1
CATEGORIES= astro x11
MASTER_SITES= ftp://cag.lcs.mit.edu/pub/tuna/ \
ftp://ftp.cs.colorado.edu/users/tuna/ \
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 930fe0e2dbad..69d7220efc69 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xephem
-# Version required: 3.2.3
# Date created: Thu Aug 1 09:10:22 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= xephem-3.2.3
+PORTNAME= xephem
+PORTVERSION= 3.2.3
CATEGORIES= astro
MASTER_SITES= ftp://iraf.noao.edu/contrib/xephem/ \
ftp://gastro23.physics.uiowa.edu/pub/xephem/ \
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
index 7adce7457132..e927c5751e3e 100644
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: xglobe
-# Version required: 0.3.1
# Date created: 20 January 1998
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xglobe-0.3.1
+PORTNAME= xglobe
+PORTVERSION= 0.3.1
CATEGORIES= astro
MASTER_SITES= http://www.uni-karlsruhe.de/~uddn/xglobe/
MAINTAINER= kris@FreeBSD.org
USE_QT= yes
-USE_X_PREFIX= yes
+USE_X_PREFIX= yes
USE_GMAKE= yes
do-install:
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 7e9963f135fe..dd05d3a03814 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xphoon
-# Version required: 18sep91 (in R5 contrib)
# Date created: 14 February 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xphoon
-PKGNAME= xphoon-91.9.18
+PORTNAME= xphoon
+PORTVERSION= 1991.9.18
CATEGORIES= astro x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+DISTNAME= xphoon
EXTRACT_SUFX= .tar.Z
MAINTAINER= will@FreeBSD.org
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index ab4bfe17e582..9d0991f214c0 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xplanet
-# Version required: 0.50
# Date created: 22 Feb 2000
# Whom: darius@dons.net.au
#
# $FreeBSD$
#
-DISTNAME= xplanet-0.50
+PORTNAME= xplanet
+PORTVERSION= 0.50
CATEGORIES= astro x11
MASTER_SITES= http://www.alumni.caltech.edu/~hari/xplanet/ \
http://www.radcyberzine.com/xglobe/
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index cc5ba512d3f2..4be5df6dd6e7 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xtide
-# Version required: 1.6.2
# Date created: 30 August 1997
# Whom: Brion Moss <brion@queeg.com>
#
# $FreeBSD$
#
-DISTNAME= xtide-1.6.2
+PORTNAME= xtide
+PORTVERSION= 1.6.2
CATEGORIES= astro
MASTER_SITES= http://www.universe.digex.net/~dave/files/
DISTFILES= xtide-1.6.2.tar.gz harmonics.gz
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 1b8bf277229e..4503d28114d4 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: bonnie
-# Version required: 1.0
# Date created: 26 September 1994
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= Bonnie
-PKGNAME= bonnie-1.0
+PORTNAME= bonnie
+PORTVERSION= 1.0
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.sunet.se/pub/benchmark/Bonnie/
EXTRACT_SUFX= .tar.Z
+DISTNAME= Bonnie
MAINTAINER= se@FreeBSD.org
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index 200f088c714e..466166ed86b0 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: bytebench
-# Version required: 3.1
# Date created: 28 December 1995
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= bytebench-3.1
+PORTNAME= bytebench
+PORTVERSION= 3.1
CATEGORIES= benchmarks
-MASTER_SITES= ftp://ftp.inria.fr/system/benchmark/
+MASTER_SITES ftp://ftp.inria.fr/system/benchmark/
EXTRACT_SUFX= .tar.Z
MAINTAINER= se@FreeBSD.org
diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile
index 15af76ed5d0e..ff62a78dbca9 100644
--- a/benchmarks/dbs/Makefile
+++ b/benchmarks/dbs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dbs
-# Version required: 1.1.5
# Date created: 1 August 1998
# Whom: jkoshy
#
# $FreeBSD$
#
-DISTNAME= dbs-1.1.5
+PORTNAME= dbs
+PORTVERSION= 1.1.5
CATEGORIES= benchmarks
MASTER_SITES= http://shika.aist-nara.ac.jp/member/yukio-m/dbs/software1.1.5/
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index f33616ec34bd..25ce3f27cd5e 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: iozone
-# Version required: 3.9
# Date created: 26 September 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= iozone3_9
-PKGNAME= iozone-3.9
+PORTNAME= iozone
+PORTVERSION= 3.9
CATEGORIES= benchmarks
MASTER_SITES= http://www.iozone.org/src/stable/
+DISTNAME= iozone3_9
EXTRACT_SUFX= .tar
MAINTAINER= jmz@FreeBSD.org
diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
index 9a21bf81e07b..a6945b55c12b 100644
--- a/benchmarks/iozone21/Makefile
+++ b/benchmarks/iozone21/Makefile
@@ -1,23 +1,23 @@
# ex:ts=8
# Ports collection makefile for: iozone
-# Version required: 0.0
# Date created: 26 September 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= iozone-2.01
+PORTNAME= iozone
+PORTVERSION= 2.01
CATEGORIES= benchmarks
-MASTER_SITES= ftp://ftp.cs.uni-sb.de/pub/others/
+MASTER_SITES= ftp://ftp.cs.uni-sb.de/pub/others/
EXTRACT_SUFX= .shar.gz
MAINTAINER= obrien@FreeBSD.org
-EXTRACT_CMD= ( gzcat | awk '{if (/^\#!/) x++} {if(x) print $$0'}| /bin/sh )
+EXTRACT_CMD= ( gzcat | awk '{if (/^\#!/) x++} {if(x) print $$0'}| /bin/sh )
EXTRACT_BEFORE_ARGS= <
EXTRACT_AFTER_ARGS= # empty
-NO_WRKSUBDIR= YES
+NO_WRKSUBDIR= YES
MAN1= iozone.1
.include <bsd.port.mk>
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index aecd7a9c7316..a616f99a0971 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: lmbench
-# Version required: 1.1
# Date created: 6 May 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= lmbench
-PKGNAME= lmbench-1.1
+PORTNAME= lmbench
+PORTVERSION= 1.1
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.deva.net/pub/sources/system/benchmarks/ \
ftp://ftp.kuis.kyoto-u.ac.jp/misc/benchmarks/ \
ftp://ftp.netlab.is.tsukuba.ac.jp/pub/utils/benchmark/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@FreeBSD.org
diff --git a/benchmarks/nbench/Makefile b/benchmarks/nbench/Makefile
index 92a9059edcee..66d436e9bd89 100644
--- a/benchmarks/nbench/Makefile
+++ b/benchmarks/nbench/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: nbench
-# Version required: 2.1
# Date created: 17 December 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= nbench-byte-2.1
-PKGNAME= nbench-2.1
+PORTNAME= nbench
+PORTVERSION= 2.1
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.tux.org/pub/tux/mayer/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/benchmark
+DISTNAME= nbench-byte-2.1
MAINTAINER= ports@FreeBSD.org
diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index f31523942eae..f9def6c17738 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: netperf
-# Version required: 2.1.3
# Date created: 19 July 1996
# Whom: koshy
#
# $FreeBSD$
#
-DISTNAME= netperf-2.1pl3
-PKGNAME= netperf-2.1.3
+PORTNAME= netperf
+PORTVERSION= 2.1.3
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/
+DISTNAME= netperf-2.1pl3
MAINTAINER= fenner@freebsd.org
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index e251ce17efc5..9b0e6c4250b1 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: netpipe
-# Version required: 2.3
# Date created: 20 Feb 1998
# Whom: jkoshy
#
# $FreeBSD$
-DISTNAME= netpipe-2.3
+PORTNAME= netpipe
+PORTVERSION= 2.3
CATEGORIES= benchmarks net
MASTER_SITES= ftp://ftp.scl.ameslab.gov/pub/netpipe/ \
http://people.FreeBSD.org/~jkoshy/PORTS/
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index 5ef901f32ee1..6b9c9cfa3fe5 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: polygraph
-# Version required: 2.2.7
# Date created: 3 March 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= polygraph-2.2.7-src
-PKGNAME= polygraph-2.2.7
+PORTNAME= polygraph
+PORTVERSION= 2.2.7
CATEGORIES= benchmarks www
MASTER_SITES= http://polygraph.ircache.net/sources/tars/ \
http://www.chg.ru/~dima/
+DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= dima@Chg.RU
diff --git a/benchmarks/polygraph31/Makefile b/benchmarks/polygraph31/Makefile
index 5ef901f32ee1..6b9c9cfa3fe5 100644
--- a/benchmarks/polygraph31/Makefile
+++ b/benchmarks/polygraph31/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: polygraph
-# Version required: 2.2.7
# Date created: 3 March 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= polygraph-2.2.7-src
-PKGNAME= polygraph-2.2.7
+PORTNAME= polygraph
+PORTVERSION= 2.2.7
CATEGORIES= benchmarks www
MASTER_SITES= http://polygraph.ircache.net/sources/tars/ \
http://www.chg.ru/~dima/
+DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= dima@Chg.RU
diff --git a/benchmarks/postmark/Makefile b/benchmarks/postmark/Makefile
index fc3de0086d07..311e22b6cbae 100644
--- a/benchmarks/postmark/Makefile
+++ b/benchmarks/postmark/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: postmark
-# Version required: 0.0
# Date created: Sat Sep 18, 1999
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= postmark-1_11
-PKGNAME= postmark-1.11
+PORTNAME= postmark
+PORTVERSION= 1.11
CATEGORIES= benchmarks
MASTER_SITES= http://www.netapp.com/ftp/ \
http://www.taronga.com/~nick/files/
diff --git a/benchmarks/rawio/Makefile b/benchmarks/rawio/Makefile
index 82d1f207be51..e92395e57df4 100644
--- a/benchmarks/rawio/Makefile
+++ b/benchmarks/rawio/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: Rawio
-# Version required: 0.0
# Date created: Sun Aug 08, 1999
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= rawio-1.1
+PORTNAME= rawio
+PORTVERSION= 1.1
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.lemis.com/pub/
diff --git a/benchmarks/tcpblast/Makefile b/benchmarks/tcpblast/Makefile
index d29ffea0f17c..f5bc2e2f17d6 100644
--- a/benchmarks/tcpblast/Makefile
+++ b/benchmarks/tcpblast/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: tcpblast
-# Version required: <self contained>
# Date created: 22 August 1994
# Whom: mr
#
# $FreeBSD$
#
-DISTNAME= tcpblast
-PKGNAME= tcpblast-1.0
+PORTNAME= tcpblast
+PORTVERSION= 1.0
CATEGORIES= benchmarks net
DISTFILES= # empty
diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile
index 200f088c714e..466166ed86b0 100644
--- a/benchmarks/unixbench/Makefile
+++ b/benchmarks/unixbench/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: bytebench
-# Version required: 3.1
# Date created: 28 December 1995
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= bytebench-3.1
+PORTNAME= bytebench
+PORTVERSION= 3.1
CATEGORIES= benchmarks
-MASTER_SITES= ftp://ftp.inria.fr/system/benchmark/
+MASTER_SITES ftp://ftp.inria.fr/system/benchmark/
EXTRACT_SUFX= .tar.Z
MAINTAINER= se@FreeBSD.org
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index ac814c0b72c4..77d8d62e8941 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xengine
-# Version required: pl1
# Date created: 17 January 1997
# Whom: FURUSAWA,Kazuhisa <furusawa@com.cs.osakafu-u.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xengine-1.0.1
+PORTNAME= xengine
+PORTVERSION= 1.0.1
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Usenet/comp.sources.x/volume09/xengine/
DISTFILES= part01.z patch1.z
diff --git a/biology/babel/Makefile b/biology/babel/Makefile
index e7d15b9bb520..869768fc3e53 100644
--- a/biology/babel/Makefile
+++ b/biology/babel/Makefile
@@ -1,12 +1,12 @@
# New ports collection Makefile for: babel
-# Version required: 1.6
# Date created: Dec 4 1997
# Whom: frankch@waru.life.nthu.edu.tw
#
# $FreeBSD$
#
-DISTNAME= babel-1.6
+PORTNAME= babel
+PORTVERSION= 1.6
CATEGORIES= biology
MASTER_SITES= ftp://ccl.osc.edu/pub/chemistry/software/MAC/babel/
EXTRACT_SUFX= .tar.Z
diff --git a/biology/deft/Makefile b/biology/deft/Makefile
index 0f23b115b95b..47e5bbb8b9e2 100644
--- a/biology/deft/Makefile
+++ b/biology/deft/Makefile
@@ -1,20 +1,20 @@
# New ports collection makefile for: DeFT
-# Version required: 2.2
# Date created: 1999-01-11
# Whom: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= DeFT_2.2
-PKGNAME= deft-2.2
+PORTNAME= deft
+PORTVERSION= 2.2
CATEGORIES= biology
MASTER_SITES= ftp://theory.chem.uottawa.ca/pub/
+DISTNAME= DeFT_${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= rmiya@cc.hirosaki-u.ac.jp
-WRKSRC= ${WRKDIR}/DeFT_2.2/source
+WRKSRC= ${WRKDIR}/${DISTNAME}/source
post-configure:
${CP} ${FILESDIR}/Makefile.deft ${WRKSRC}/Makefile
diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile
index 2a4950eb4930..131cbfa6a33a 100644
--- a/biology/gperiodic/Makefile
+++ b/biology/gperiodic/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gperiodic
-# Version required: 1.2.2
# Date created: 16 July 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= gperiodic-1.2.2
+PORTNAME= gperiodic
+PORTVERSION= 1.2.2
CATEGORIES= biology
MASTER_SITES= ftp://ftp.seul.org/pub/gperiodic/
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index f134431e6f1e..9f080d6bb1bc 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -1,12 +1,12 @@
# New ports collection Makefile for: hmmer
-# Version required: 2.0
# Date created: June 29 1998
# Whom: barnhart@genetics.wustl.edu
#
# $FreeBSD$
#
-DISTNAME= hmmer-2.1.1
+PORTNAME= hmmer
+PORTVERSION= 2.1.1
CATEGORIES= biology
MASTER_SITES= ftp://ftp.genetics.wustl.edu/pub/eddy/hmmer/
EXTRACT_SUFX= .tar.Z
diff --git a/biology/kinemage/Makefile b/biology/kinemage/Makefile
index a859d9ddc154..b40906826b14 100644
--- a/biology/kinemage/Makefile
+++ b/biology/kinemage/Makefile
@@ -1,17 +1,17 @@
# New ports collection Makefile for: kinemage
-# Version required: 4.2
# Date created: Dec 4 1997
# Whom: frankch@waru.life.nthu.edu.tw
#
# $FreeBSD$
#
-DISTNAME= MAGE_4_2.LINUX
-PKGNAME= kinemage-4.2
+PORTNAME= kinemage
+PORTVERSION= 4.2
CATEGORIES= biology linux
MASTER_SITES= ftp://kinemage.biochem.duke.edu/LINUXprograms/ \
ftp://ftp.ebi.ac.uk/pub/databases/pdb/pub/xternal_software/kinemage/LINUX/ \
ftp://ftp.pdb.bnl.gov/pub/xternal_software/kinemage/LINUX/
+DISTNAME= MAGE_4_2.LINUX
EXTRACT_SUFX= .Z
MAINTAINER= frankch@waru.life.nthu.edu.tw
diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index ca2eea132c46..ca5b0b9f7a75 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: molden
-# Version required: 3.4
# Date created: 1998-11-14
# Whom: rmiya
#
# $FreeBSD$
#
-DISTNAME= molden3.4
-PKGNAME= molden-3.4
+PORTNAME= molden
+PORTVERSION= 3.4
CATEGORIES= biology
MASTER_SITES= ftp://ftp.caos.kun.nl/pub/molgraph/molden/
MASTER_SITES+= ftp://ftp.caos.kun.nl/pub/molgraph/molden/bin/
-DISTFILES= molden3.4.tar.Z molden3.4-freebsd
+DISTFILES= ${PORTNAME}${PORTVERSION}.tar.Z ${PORTNAME}${PORTVERSION}-freebsd
MAINTAINER= rmiya@cc.hirosaki-u.ac.jp
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index c6a746db81e5..1db9eb2b4aba 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: mopac
-# Version required: 7
# Date created: 1997-04-23
# Whom: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= mopac7
-PKGNAME= mopac-7.02
+PORTNAME= mopac
+PORTVERSION= 7.02
CATEGORIES= biology
MASTER_SITES= ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/mopac7_sources/
DISTFILES= mopac7.tar.Z mopac7-man.tar.Z
diff --git a/biology/ortep3/Makefile b/biology/ortep3/Makefile
index e19b211cd632..986cf1ae11f5 100644
--- a/biology/ortep3/Makefile
+++ b/biology/ortep3/Makefile
@@ -1,20 +1,20 @@
# New ports collection makefile for: ORTEP-III
-# Version required: 1.0
# Date created: 1999-05-08
# Whom: Ryo MIYAMOTO
#
# $FreeBSD$
#
-DISTNAME= ortep
-PKGNAME= ortep3-1.0
-CATEGORIES= biology
-MASTER_SITES= ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/ortep/
-EXTRACT_SUFX= .tar.Z
+PORTNAME= ortep3
+PORTVERSION= 1.0
+CATEGORIES= biology
+MASTER_SITES= ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/ortep/
+DISTNAME= ortep
+EXTRACT_SUFX= .tar.Z
-MAINTAINER= rmiya@cc.hirosaki-u.ac.jp
+MAINTAINER= rmiya@cc.hirosaki-u.ac.jp
-LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphics/pgplot
+LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphics/pgplot
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 400002
diff --git a/biology/platon/Makefile b/biology/platon/Makefile
index 40d2a1e3348f..b7e72b5a531e 100644
--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: platon
-# Version required: Version 07-apr-99
# Date created: 1999-04-22
# Whom: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= platon
-PKGNAME= platon-070499
+PORTNAME= platon
+PORTVERSION= 1999.04.07
CATEGORIES= biology
MASTER_SITES= ftp://xraysoft.chem.ruu.nl/pub/unix/
+DISTNAME= platon
MAINTAINER= rmiya@cc.hirosaki-u.ac.jp
diff --git a/biology/povchem/Makefile b/biology/povchem/Makefile
index faf03cde2305..4c6a2fd5f8d5 100644
--- a/biology/povchem/Makefile
+++ b/biology/povchem/Makefile
@@ -1,12 +1,12 @@
# New ports collection Makefile for: povchem
-# Version required: 1.0
# Date created: Mar 14 1998
# Whom: frankch@waru.life.nthu.edu.tw
#
# $FreeBSD$
#
-DISTNAME= povchem-1.0
+PORTNAME= povchem
+PORTVERSION= 1.0
CATEGORIES= biology graphics
MASTER_SITES= http://cherubino.med.jhmi.edu/~paul/PC_Dist/v1.00/
DISTFILES= povchem.c \
diff --git a/biology/psi88/Makefile b/biology/psi88/Makefile
index 4451c4e10dc9..36654e4ca86a 100644
--- a/biology/psi88/Makefile
+++ b/biology/psi88/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Psi88
-# Version required: 88-1.0
# Date created: 1998-11-11
# Whom: Ryo MIYAMOTO
#
# $FreeBSD$
#
-DISTNAME= psi88
-PKGNAME= psi88-1.0
+PORTNAME= psi88
+PORTVERSION= 1.0
CATEGORIES= biology
MASTER_SITES= ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/psi88/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= rmiya@cc.hirosaki-u.ac.jp
diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index 2a79989f02cf..c4f0e1ad8eda 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -1,17 +1,17 @@
# New ports collection Makefile for: rasmol
-# Version required: 2.7.1
# Date created: Dec 4 1997
# Whom: frankch@waru.life.nthu.edu.tw
#
# $FreeBSD$
#
-DISTNAME= RasMol_2.7.1
-PKGNAME= rasmol-2.7.1
-CATEGORIES= biology
-MASTER_SITES= ftp://ftp.bernstein-plus-sons.com/software/
+PORTNAME= rasmol
+PORTVERSION= 2.7.1
+CATEGORIES= biology
+MASTER_SITES= ftp://ftp.bernstein-plus-sons.com/software/
+DISTNAME= RasMol_2.7.1
-MAINTAINER= frankch@waru.life.nthu.edu.tw
+MAINTAINER= frankch@waru.life.nthu.edu.tw
WRKSRC= $(WRKDIR)/RasMol_2.7.1/src/
USE_IMAKE= yes
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index 1621c26b080c..adf7019eec55 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -1,18 +1,18 @@
# New ports collection Makefile for: seaview
-# Version required: 1.0
# Date created: Dec 5 1997
# Whom: frankch@waru.life.nthu.edu.tw
#
# $FreeBSD$
#
-DISTNAME= seaview
-PKGNAME= seaview-1.0
-CATEGORIES= biology
-MASTER_SITES= ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
+PORTNAME= seaview
+PORTVERSION= 1.0
+CATEGORIES= biology
+MASTER_SITES= ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar
-MAINTAINER= frankch@waru.life.nthu.edu.tw
+MAINTAINER= frankch@waru.life.nthu.edu.tw
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms
diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile
index 1774a3b4a8e6..b00a496cad83 100644
--- a/biology/tinker/Makefile
+++ b/biology/tinker/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tinker
-# Version required: 3.7
# Date Created: 26 August 1998
# Whom: Glenn Johnson
#
# $FreeBSD$
#
-DISTNAME= tinker
-PKGNAME= tinker-3.7
+PORTNAME= tinker
+PORTVERSION= 3.7
CATEGORIES= biology
MASTER_SITES= ftp://dasher.wustl.edu/pub/
+DISTNAME= ${PORTNAME}
MAINTAINER= gjohnson@nola.srrc.usda.gov
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index 6383317f8394..e43a19ef0440 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: xmolwt/gmolwt
-# Version required: 0.3
# Date created: 1999-08-30
# Whom: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
#
# $FreeBSD$
-DISTNAME= xmolwt-0.3
+PORTNAME= xmolwt
+PORTVERSION= 0.3
CATEGORIES= biology
MASTER_SITES= http://www.st.hirosaki-u.ac.jp/~rmiya/xmolwt/
diff --git a/deskutils/abacus/Makefile b/deskutils/abacus/Makefile
index 11b42466315e..39152933ffa7 100644
--- a/deskutils/abacus/Makefile
+++ b/deskutils/abacus/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: abacus
-# Version required: 0.9.13
# Date created: 18 August 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= abacus
-PKGNAME= abacus-0.9.13
+PORTNAME= abacus
+PORTVERSION= 0.9.13
CATEGORIES= deskutils
MASTER_SITES= http://www-cad.eecs.berkeley.edu/HomePages/aml/abacus/ \
http://tahoe.inesc.pt/~aml/abacus/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
PATCH_SITES= http://people.FreeBSD.org/~steve/distfiles/
diff --git a/deskutils/cal/Makefile b/deskutils/cal/Makefile
index 4bd6e171843c..6fbf5aa0880f 100644
--- a/deskutils/cal/Makefile
+++ b/deskutils/cal/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cal
-# Version required: 3.5
# Date created: 2 April 1997
# Whom: Andrey Zakhvatov <andy@icc.surw.chel.su>
#
# $FreeBSD$
#
-DISTNAME= cal-3.5
+PORTNAME= cal
+PROTVERSION= 3.5
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/shell
diff --git a/deskutils/cbb/Makefile b/deskutils/cbb/Makefile
index d83f3ab8940f..c11db0666ed7 100644
--- a/deskutils/cbb/Makefile
+++ b/deskutils/cbb/Makefile
@@ -1,12 +1,12 @@
# New ports collection Makefile for: cbb
-# Version required: 0.8.1
# Date created: 24 September, 1998
# Whom: kline
#
# $FreeBSD$
#
-DISTNAME= cbb-0.8.1
+PORTNAME= cbb
+PORTVERSION= 0.8.1
CATEGORIES= deskutils
MASTER_SITES= http://download.sourceforge.net/cbb/
diff --git a/deskutils/gaddr/Makefile b/deskutils/gaddr/Makefile
index ae58536aa4ab..47a1c3dad133 100644
--- a/deskutils/gaddr/Makefile
+++ b/deskutils/gaddr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gaddr
-# Version required: 1.1.4.
# Date created: 8 August 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gaddr-1.1.4
+PORTNAME= gaddr
+PORTVERSION= 1.1.4
CATEGORIES= deskutils
MASTER_SITES= http://www.cse.unl.edu/~cluening/gaddr/
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 07b281c47c1b..cfadce6f4b98 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: genius
-# Version required: 0.4.6
# Date created: 1 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= genius-0.4.6
+PORTNAME= genius
+PORTVERSION= 0.4.6
CATEGORIES= deskutils gnome
MASTER_SITES= http://ftp.5z.com/pub/genius/
diff --git a/deskutils/gnofin/Makefile b/deskutils/gnofin/Makefile
index e054f1e4bae4..c36e5701607a 100644
--- a/deskutils/gnofin/Makefile
+++ b/deskutils/gnofin/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnofin
-# Version required: 0.8.0
# Date created: Sun Jul 18 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= gnofin-0.8.0
+PORTNAME= gnofin
+PORTVERSION= 0.8.0
CATEGORIES= deskutils
MASTER_SITES= http://download.sourceforge.net/gnofin/
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index f3efcd71c3b5..5a714e465cbb 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomepim
-# Version required: 1.0.55
# Date created: 17 Jan 1999
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-pim-1.0.55
-PKGNAME= gnomepim-1.0.55
+PORTNAME= gnomepim
+PORTVERSION= 1.0.55
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-pim
+DISTNAME= gnome-pim-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index f3efcd71c3b5..5a714e465cbb 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomepim
-# Version required: 1.0.55
# Date created: 17 Jan 1999
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-pim-1.0.55
-PKGNAME= gnomepim-1.0.55
+PORTNAME= gnomepim
+PORTVERSION= 1.0.55
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-pim
+DISTNAME= gnome-pim-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/deskutils/gnucash/Makefile b/deskutils/gnucash/Makefile
index dd1ae34e3e56..75a29c932e16 100644
--- a/deskutils/gnucash/Makefile
+++ b/deskutils/gnucash/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: gnucash
-# Version required: 1.0.18
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= gnucash-1.3.4
+PORTNAME= gnucash
+PORTVERSION= 1.3.4
CATEGORIES= deskutils
MASTER_SITES= ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index 05891a5c740a..3a39cc162271 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtimer
-# Version required: 1.1.4
# Date created: 25 February 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gtimer-1.1.4
+PORTNAME= gtimer
+PORTVERSION= 1.1.4
CATEGORIES= deskutils
MASTER_SITES= http://www.radix.net/~cknudsen/gtimer/
diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index a4cb20671d41..d6ec70c8377a 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ical
-# Version required: 2.2
# Date created: Mon Aug 28 13:35:31 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= ical-2.2
+PORTNAME= ical
+PORTVERSION= 2.2
CATEGORIES= deskutils tk82
MASTER_SITES= http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/icalbins/
diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile
index 6ec72d149eb8..755c8e709f02 100644
--- a/deskutils/korganizer/Makefile
+++ b/deskutils/korganizer/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: korganizer
-# Version required: Beta4
# Date created: 23 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
# $FreeBSD$
#
-DISTNAME= korganizer-1.1
+PORTNAME= korganizer
+PORTVERSION= 1.1
CATEGORIES= deskutils kde
MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR=stable/1.1/distribution/tar/generic/source/bz2
+MASTER_SITE_SUBDIR= stable/1.1/distribution/tar/generic/source/bz2
MAINTAINER= hanspb@persbraten.vgs.no
diff --git a/deskutils/kproject/Makefile b/deskutils/kproject/Makefile
index 7414c45e2887..f8670943221e 100644
--- a/deskutils/kproject/Makefile
+++ b/deskutils/kproject/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kproject
-# Version required: Beta4
# Date created: 23 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
# $FreeBSD$
#
-DISTNAME= kproject-0.1
+PORTNAME= kproject
+PORTVERSION= 0.1
CATEGORIES= deskutils kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= unstable/apps/office
diff --git a/deskutils/offix-trash/Makefile b/deskutils/offix-trash/Makefile
index 96d54dec3f6a..9dee0a02fe20 100644
--- a/deskutils/offix-trash/Makefile
+++ b/deskutils/offix-trash/Makefile
@@ -1,16 +1,16 @@
# ports collection makefile for: Clipboard
-# Version required: 2.4
# Date created: 28 Jun 1997
# Whom: Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
#
# $FreeBSD$
#
-DISTNAME= Trash-2.4
-PKGNAME= offix-trash-2.4
+PORTNAME= offix-trash
+PORTVERSION= 2.4
CATEGORIES= deskutils offix
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= desktop_managers/OffiX
+DISTNAME= Trash-${PORTVERSION}
MAINTAINER= ruslan@shevchenko.kiev.ua
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index cb5e0db510c3..88249b3494e7 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: plan
-# Version required: 1.8.2
# Date created: 14 April 1996
# Whom: Daniel Eischen <deischen@iworks.InterWorks.org>
#
@@ -7,7 +6,8 @@
#
# Also update ports/japanese/plan/ (ja-plan) when this port is updated
-DISTNAME= plan-1.8.2
+PORTNAME= plan
+PORTVERSION= 1.8.2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index e3e00b7bba9f..6d4e79ca0ba2 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sliderule
-# Version required: 11.3 (X11R3)
# Date created: 4 Aug 1997
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= sliderule
-PKGNAME= sliderule-1.0
+PORTNAME= sliderule
+PORTVERSIOn= 1.0
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_LOCAL}
+DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
diff --git a/deskutils/teapot/Makefile b/deskutils/teapot/Makefile
index ae79489ecc59..74e1019dde87 100644
--- a/deskutils/teapot/Makefile
+++ b/deskutils/teapot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: teapot
-# Version required: 1.03
# Date created: 7 January 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= teapot-1.03
+PORTNAME= teapot
+PORTVERSION= 1.03
CATEGORIES= deskutils
MASTER_SITES= ftp://cantor.informatik.rwth-aachen.de/pub/unix/ \
http://www.moria.de/~michael/teapot/
diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile
index 88dbfc1d4d7e..575abc624b28 100644
--- a/deskutils/wmpinboard/Makefile
+++ b/deskutils/wmpinboard/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmpinboard
-# Version required: 0.10
# Date created: 17 January 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wmpinboard-0.10
+PORTNAME= wmpinboard
+PORTVERSION= 0.10
CATEGORIES= deskutils afterstep windowmaker
MASTER_SITES= http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/
diff --git a/deskutils/xinvest/Makefile b/deskutils/xinvest/Makefile
index 83094ee9b4a2..e527731905ae 100644
--- a/deskutils/xinvest/Makefile
+++ b/deskutils/xinvest/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xinvest
-# Version required: 2.5.1
# Date created: 1 Ag 1997
# Whom: Pedro Giffuni (orig)
#
# $FreeBSD$
#
-DISTNAME= xinvest-2.5.1
+PORTNAME= xinvest
+PORTVERSION= 2.5.1
CATEGORIES= deskutils
MASTER_SITES= http://sunsite.auc.dk/xinvest/ \
${MASTER_SITE_XCONTRIB}
diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile
index 62ca2770d2d3..f40a5d47f95d 100644
--- a/deskutils/xmaddressbook/Makefile
+++ b/deskutils/xmaddressbook/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmaddressbook
-# Version required: 1.5.3
# Date created: 31 Jul 1996
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= xmaddressbook-1.5.3
+PORTNAME= xmaddressbook
+PORTVERSION= 1.5.3
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= office
diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile
index 4467a9341d18..43e9b00d747d 100644
--- a/deskutils/xmdiary/Makefile
+++ b/deskutils/xmdiary/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmdiary
-# Version required: 3.0.1
# Date created: 29 Sep 1997
# Whom: mi@aldan.ziplink.net
#
# $FreeBSD$
#
-DISTNAME= xmdiary-3.0.1
+PORTNAME= xmdiary
+PORTVERSION= 3.0.1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= office
diff --git a/deskutils/xopps/Makefile b/deskutils/xopps/Makefile
index cd829e7e126c..327cb128c039 100644
--- a/deskutils/xopps/Makefile
+++ b/deskutils/xopps/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xopps
-# Version required: 1.13
# Date created: 1 Ag 1997
# Whom: Pedro Giffuni (orig)
#
# $FreeBSD$
#
-DISTNAME= xopps.1.13
-PKGNAME= xopps-1.13
+PORTNAME= xopps
+PORTVERSION= 1.13
CATEGORIES= deskutils
MASTER_SITES= ftp://ftp.weird.com/pub/mirror/ \
ftp://devvax.jpl.nasa.gov/pub/xopps/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/deskutils/xpostit/Makefile b/deskutils/xpostit/Makefile
index 09f818111510..1965f50d768b 100644
--- a/deskutils/xpostit/Makefile
+++ b/deskutils/xpostit/Makefile
@@ -1,26 +1,27 @@
# New ports collection makefile for: xpostit
-# Version required: 3.3.1
# Date created: 6 May 1996
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= xpostit3.3.1
-PKGNAME= xpostit-3.3.1
-CATEGORIES= deskutils
#
# Not all servers archie could find actually still have it. Alas, some
# servers only have the comp.sources.x version, with its distfile named
# `part01.gz'.
#
-MASTER_SITES= ftp://ftp.hrz.tu-darmstadt.de/pub/X11/R5contrib/
-EXTRACT_SUFX= .tar.Z
-MAINTAINER= joerg@FreeBSD.org
+PORTNAME= xpostit
+PORTVERSION= 3.3.1
+CATEGORIES= deskutils
+MASTER_SITES= ftp://ftp.hrz.tu-darmstadt.de/pub/X11/R5contrib/
+DISTNAME= ${PORTNAME}${PORTVERSION}
+EXTRACT_SUFX= .tar.Z
-USE_IMAKE= yes
-WRKSRC= ${WRKDIR}/xpostit
-MAN1= xpostit.1
+MAINTAINER= joerg@FreeBSD.org
+
+USE_IMAKE= yes
+WRKSRC= ${WRKDIR}/xpostit
+MAN1= xpostit.1
.include <bsd.port.mk>
diff --git a/deskutils/xpostitPlus/Makefile b/deskutils/xpostitPlus/Makefile
index e3df3f4957ed..34dcd72c3fde 100644
--- a/deskutils/xpostitPlus/Makefile
+++ b/deskutils/xpostitPlus/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xpostit+
-# Version required: 2.3
# Date created: 26 Sep 1997
# Whom: mi
#
# $FreeBSD$
#
-DISTNAME= XPostitPlus-2.3
+PORTNAME= XPostitPlus
+PORTVERSION= 2.3
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= office
diff --git a/deskutils/xrolo/Makefile b/deskutils/xrolo/Makefile
index 2ad96495cdf6..12f996bc3f8f 100644
--- a/deskutils/xrolo/Makefile
+++ b/deskutils/xrolo/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: xrolo
-# Version required: 2.6
# Date created: 17 January 1999
# Whom: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
#
# $FreeBSD$
#
-DISTNAME= xrolo.v2p6
-PKGNAME= xrolo-2.6
+PORTNAME= xrolo
+PORTVERSION= 2.6
CATEGORIES= deskutils
MASTER_SITES= ftp://gatekeeper.dec.com/pub/X11-contrib/ \
ftp://ftp.postech.ac.kr/pub/X11/R5contrib/ \
@@ -15,6 +14,7 @@ MASTER_SITES= ftp://gatekeeper.dec.com/pub/X11-contrib/ \
ftp://ftp.khoral.com/pub/dist/X/X11R5.contrib/ \
ftp://ftp.imag.fr/pub1/x11/xrolo/ \
ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
+DISTNAME= ${PORTNAME}.v2p6
EXTRACT_SUFX= .tar.Z
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
diff --git a/deskutils/xwrits/Makefile b/deskutils/xwrits/Makefile
index a70ea37fb1de..30d2ba992583 100644
--- a/deskutils/xwrits/Makefile
+++ b/deskutils/xwrits/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xwrits
-# Version required: 2.10
# Date created: 02 January 2000
# Whom: Matt Braithwaite <mab@red-bean.com>
#
# $FreeBSD$
#
-DISTNAME= xwrits-2.10
+PORTNAME= xwrits
+PORTVERSION= 2.10
CATEGORIES= deskutils
MASTER_SITES= http://www.pdos.lcs.mit.edu/~eddietwo/xwrits/
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index 5a6a95c41d6d..330ceb2d897d 100644
--- a/deskutils/yank/Makefile
+++ b/deskutils/yank/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: yank
-# Version required: 0.1.3
# Date created: 28 November 1999
# Whom: Chris D. Faulhaber <jedgar@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= yank-0.1.3
+PORTNAME= yank
+PORTVERSION= 0.1.3
CATEGORIES= deskutils gnome
MASTER_SITES= http://home.ins.de/~m.hussmann/software/yank/
diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index 9a6fb049e2fc..85fec116913d 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: zorro
-# Version required: 1.1p8
# Date created: 03 Aug 1996
# Whom: shanee@rabbit.augusta.de
#
# $FreeBSD$
#
-DISTNAME= zorro-1.1p8
-PKGNAME= zorro-1.1.8
+PORTNAME= zorro
+PORTVERSION= 1.1.8
CATEGORIES= deskutils tk82
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/
+DISTNAME= ${PORTNAME}-1.1p8
MAINTAINER= shanee@augusta.de
diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index d83f3ab8940f..c11db0666ed7 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -1,12 +1,12 @@
# New ports collection Makefile for: cbb
-# Version required: 0.8.1
# Date created: 24 September, 1998
# Whom: kline
#
# $FreeBSD$
#
-DISTNAME= cbb-0.8.1
+PORTNAME= cbb
+PORTVERSION= 0.8.1
CATEGORIES= deskutils
MASTER_SITES= http://download.sourceforge.net/cbb/
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index e054f1e4bae4..c36e5701607a 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnofin
-# Version required: 0.8.0
# Date created: Sun Jul 18 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= gnofin-0.8.0
+PORTNAME= gnofin
+PORTVERSION= 0.8.0
CATEGORIES= deskutils
MASTER_SITES= http://download.sourceforge.net/gnofin/
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index dd1ae34e3e56..75a29c932e16 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: gnucash
-# Version required: 1.0.18
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= gnucash-1.3.4
+PORTNAME= gnucash
+PORTVERSION= 1.3.4
CATEGORIES= deskutils
MASTER_SITES= ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index dd1ae34e3e56..75a29c932e16 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: gnucash
-# Version required: 1.0.18
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= gnucash-1.3.4
+PORTNAME= gnucash
+PORTVERSION= 1.3.4
CATEGORIES= deskutils
MASTER_SITES= ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index 83094ee9b4a2..e527731905ae 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xinvest
-# Version required: 2.5.1
# Date created: 1 Ag 1997
# Whom: Pedro Giffuni (orig)
#
# $FreeBSD$
#
-DISTNAME= xinvest-2.5.1
+PORTNAME= xinvest
+PORTVERSION= 2.5.1
CATEGORIES= deskutils
MASTER_SITES= http://sunsite.auc.dk/xinvest/ \
${MASTER_SITE_XCONTRIB}
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 1935a6feb197..562998a7df74 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: BBBike
-# Version required: 2.x
# Date created: Fri Aug 14 15:32:26 CEST 1998
# Whom: Slaven Rezic <eserte@cs.tu-berlin.de>
#
# $FreeBSD$
#
-DISTNAME= BBBike-2.48
+PORTNAME= BBBike
+PORTVERSION= 2.48
CATEGORIES= german
MASTER_SITES= http://pub.cs.tu-berlin.de/src/BBBike/
diff --git a/german/cheapcall/Makefile b/german/cheapcall/Makefile
index 47536cd411cb..ccd086e23a14 100644
--- a/german/cheapcall/Makefile
+++ b/german/cheapcall/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: cheap-call
-# Version required: 0.7e-1.9.99
# Date created: 9 Jun 1999
# Whom: Peter Cornelius <pcc@gmx.net>
#
# $FreeBSD$
#
-DISTNAME= cheap-call-${LONGVER}.tcl
-PKGNAME= cheapcall-0.7e
+PORTNAME= cheap-call
+PORTVERSION= 0.7e
CATEGORIES= german
MASTER_SITES= http://212.227.69.105/download/
+DISTNAME= cheap-call-${LONGVER}.tcl
EXTRACT_SUFX= .bz2
MAINTAINER= pcc@gmx.net
diff --git a/german/dict/Makefile b/german/dict/Makefile
index 9890e00597b0..7e8f23c98e1d 100644
--- a/german/dict/Makefile
+++ b/german/dict/Makefile
@@ -6,18 +6,18 @@
# $FreeBSD$
#
-DISTNAME= dict-1.2
-PKGNAME= de-dict-1.2
+PORTNAME= de-dict
+PORTVERSION= 1.2
CATEGORIES= german
-MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
+MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
+DISTNAME= dict-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${dict}.gz
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-MAINTAINER= wosch@FreeBSD.org
+MAINTAINER= wosch@FreeBSD.org
RUN_DEPENDS= agrep:${PORTSDIR}/textproc/agrep
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
dict= ger-eng.txt
post-extract: ${dict}
diff --git a/german/manpages/Makefile b/german/manpages/Makefile
index 85ec7090d0a4..7d58b05acd20 100644
--- a/german/manpages/Makefile
+++ b/german/manpages/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: German manpages
-# Version required: 1.0
# Date created: 29 September 1997
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= de-manpages-1.0
+PORTNAME= de-manpages
+PORTVERSION= 1.0
CATEGORIES= german
MASTER_SITES= http://www.de.freebsd.org/~wosch/src/ \
ftp://ftp.Infodrom.North.DE/pub/Linux/Devel/manpages-de/
diff --git a/german/phone/Makefile b/german/phone/Makefile
index ed3ba4f72e60..1ed7e80fe5d1 100644
--- a/german/phone/Makefile
+++ b/german/phone/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: German phone codes
-# Version required: 1.0
# Date created: 1997-12-30
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= avon-1996
-PKGNAME= de-phone-1.0
+PORTNAME= de-phone
+PORTVERSION= 1.0
CATEGORIES= german misc
MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
+DISTNAME= avon-1996
EXTRACT_SUFX= .gz
MAINTAINER= wosch@FreeBSD.org
diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile
index 2a3d6032f113..dd3fa2091785 100644
--- a/german/staroffice5/Makefile
+++ b/german/staroffice5/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: StarOffice 5.1a german
-# Version required: 5.1a
# Date created: 20 Dezember 1999
# Whom: Martin Blapp
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_49
-PKGNAME= de-staroffice-5.1a
+PORTNAME= de-staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= ftp://ftp.hagenhomes.com/pub/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_49
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index 2a3d6032f113..dd3fa2091785 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: StarOffice 5.1a german
-# Version required: 5.1a
# Date created: 20 Dezember 1999
# Whom: Martin Blapp
#
# $FreeBSD$
#
-DISTNAME= so51a_lnx_49
-PKGNAME= de-staroffice-5.1a
+PORTNAME= de-staroffice
+PORTVERSION= 5.1a
CATEGORIES= editors linux
MASTER_SITES= ftp://ftp.hagenhomes.com/pub/ \
ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \
ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/ \
ftp://ftp.stardivision.de/pub/support/so51a/db/unxlnxi/
+DISTNAME= so51a_lnx_49
EXTRACT_SUFX= .tar
DISTFILES= applicat.rdb.gz libofa517li.so libsdb517li.so
diff --git a/german/webalizer/Makefile b/german/webalizer/Makefile
index b87df8ed33f7..495a2b59b864 100644
--- a/german/webalizer/Makefile
+++ b/german/webalizer/Makefile
@@ -1,15 +1,15 @@
# 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= de-webalizer-1.30.4
+PORTNAME= de-webalizer
+PORTVERSION= 1.30.4
CATEGORIES= german 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/german/webalizer2/Makefile b/german/webalizer2/Makefile
index b87df8ed33f7..495a2b59b864 100644
--- a/german/webalizer2/Makefile
+++ b/german/webalizer2/Makefile
@@ -1,15 +1,15 @@
# 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= de-webalizer-1.30.4
+PORTNAME= de-webalizer
+PORTVERSION= 1.30.4
CATEGORIES= german 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