summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-04-14 07:20:58 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-04-14 07:20:58 +0000
commit1df1a17abc224c7b035253c7089ca62f3b56a87a (patch)
tree729d9b50958f323b815e1a00b7acf534920af239 /math
parentupdate g-k ports with PORTNAME/PORTVERSION and fix error in fkiss's Makefile (diff)
Convert to PORTNAME/PORTVERSION.
Notes
Notes: svn path=/head/; revision=27509
Diffstat (limited to 'math')
-rw-r--r--math/PDL/Makefile4
-rw-r--r--math/R-a4/Makefile1
-rw-r--r--math/R-letter/Makefile7
-rw-r--r--math/R-project/Makefile7
-rw-r--r--math/R/Makefile7
-rw-r--r--math/Scilab/Makefile9
-rw-r--r--math/abs/Makefile6
-rw-r--r--math/add/Makefile6
-rw-r--r--math/apc/Makefile4
-rw-r--r--math/bihar/Makefile6
-rw-r--r--math/blas/Makefile6
-rw-r--r--math/calc/Makefile6
-rw-r--r--math/calctool/Makefile6
-rw-r--r--math/dcdflib/Makefile4
-rw-r--r--math/eispack/Makefile7
-rw-r--r--math/eval/Makefile6
-rw-r--r--math/femlab/Makefile6
-rw-r--r--math/fftpack/Makefile6
-rw-r--r--math/fftw/Makefile4
-rw-r--r--math/fftw3/Makefile4
-rw-r--r--math/freefem/Makefile4
-rw-r--r--math/fudgit/Makefile8
-rw-r--r--math/geg/Makefile4
-rw-r--r--math/gnumeric/Makefile4
-rw-r--r--math/gnumeric2/Makefile4
-rw-r--r--math/gnuplot+/Makefile4
-rw-r--r--math/gnuplot/Makefile4
-rw-r--r--math/grace/Makefile6
-rw-r--r--math/grpn/Makefile4
-rw-r--r--math/gsl/Makefile4
-rw-r--r--math/hexcalc/Makefile5
-rw-r--r--math/lapack/Makefile6
-rw-r--r--math/librandlib/Makefile6
-rw-r--r--math/libranlib/Makefile6
-rw-r--r--math/linalg/Makefile4
-rw-r--r--math/linpack/Makefile7
-rw-r--r--math/metis/Makefile4
-rw-r--r--math/metis4/Makefile4
-rw-r--r--math/netcdf/Makefile7
-rw-r--r--math/ngraph/Makefile6
-rw-r--r--math/numpy/Makefile7
-rw-r--r--math/octave-devel/Makefile4
-rw-r--r--math/octave/Makefile4
-rw-r--r--math/oleo/Makefile4
-rw-r--r--math/p5-MatrixReal/Makefile7
-rw-r--r--math/p5-Set-IntSpan/Makefile6
-rw-r--r--math/pari/Makefile6
-rw-r--r--math/parmetis/Makefile4
-rw-r--r--math/plplot/Makefile6
-rw-r--r--math/py-numeric/Makefile7
-rw-r--r--math/py-numeric17/Makefile7
-rw-r--r--math/py-scientific/Makefile7
-rw-r--r--math/pygist/Makefile7
-rw-r--r--math/randlib/Makefile6
-rw-r--r--math/rcalc/Makefile6
-rw-r--r--math/sc/Makefile4
-rw-r--r--math/scilab/Makefile9
-rw-r--r--math/siag/Makefile4
-rw-r--r--math/simpack/Makefile4
-rw-r--r--math/slsc/Makefile6
-rw-r--r--math/snns/Makefile7
-rw-r--r--math/spin/Makefile4
-rw-r--r--math/ss/Makefile6
-rw-r--r--math/superlu/Makefile6
-rw-r--r--math/topaz/Makefile6
-rw-r--r--math/umatrix/Makefile4
-rw-r--r--math/umfpack/Makefile6
-rw-r--r--math/vtk/Makefile6
-rw-r--r--math/vtk43/Makefile6
-rw-r--r--math/vtk5/Makefile6
-rw-r--r--math/wingz/Makefile4
-rw-r--r--math/wingz3/Makefile4
-rw-r--r--math/wmcalc/Makefile4
-rw-r--r--math/xgfe/Makefile8
-rw-r--r--math/xgraph/Makefile6
-rw-r--r--math/xldlas/Makefile4
-rw-r--r--math/xlispstat/Makefile6
-rw-r--r--math/xmgr/Makefile4
-rw-r--r--math/xplot/Makefile4
-rw-r--r--math/xspread/Makefile6
-rw-r--r--math/xwpl/Makefile6
81 files changed, 223 insertions, 218 deletions
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 980bdb1c3952..dc5b50c9e2ed 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: PDL
-# Version required: 2.0
# Date created: 08 February 1999
# Whom: Anton Berezin <tobez@plab.ku.dk>
#
# $FreeBSD$
#
-DISTNAME= PDL-2.0
+PORTNAME= PDL
+PORTVERSION= 2.0
CATEGORIES= math perl5
MASTER_SITES= http://www.fastlane.net/~jcerney/%SUBDIR%/ \
${MASTER_SITE_PERL_CPAN}
diff --git a/math/R-a4/Makefile b/math/R-a4/Makefile
index 7758bb28a444..d9c08f8b8c78 100644
--- a/math/R-a4/Makefile
+++ b/math/R-a4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: R (a4)
-# Version required: R-0.64.2
# Date created: Tue Jun 23 07:36:55 EST 1998
# Whom: Maurice Castro <maurice@serc.rmit.edu.au>
#
diff --git a/math/R-letter/Makefile b/math/R-letter/Makefile
index c01a66fe1074..77e88420a8bd 100644
--- a/math/R-letter/Makefile
+++ b/math/R-letter/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: R (letter)
-# Version required: R-0.99.0a
# Date created: Tue Jun 23 07:36:55 EST 1998
# Whom: Maurice Castro <maurice@serc.rmit.edu.au>
#
# $FreeBSD$
#
-DISTNAME= R-0.99.0a
-PKGNAME= R-${PAPERSIZE}-0.99.0a
+PORTNAME= R
+PORTVERSION= 0.99.0a
CATEGORIES= math
MASTER_SITES= http://lib.stat.cmu.edu/R/CRAN/src/base/ \
ftp://ftp.biostat.washington.edu/mirrors/R/CRAN/src/base/ \
@@ -18,6 +17,8 @@ MASTER_SITES= http://lib.stat.cmu.edu/R/CRAN/src/base/ \
ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/ \
ftp://dola.snu.ac.kr/pub/R/CRAN/src/base/ \
http://www.stat.math.ethz.ch/R-CRAN/src/base/
+PKGNAMESUFFIX= -${PAPERSIZE}
+DISTNAME= R-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= maurice@serc.rmit.edu.au
diff --git a/math/R-project/Makefile b/math/R-project/Makefile
index c01a66fe1074..77e88420a8bd 100644
--- a/math/R-project/Makefile
+++ b/math/R-project/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: R (letter)
-# Version required: R-0.99.0a
# Date created: Tue Jun 23 07:36:55 EST 1998
# Whom: Maurice Castro <maurice@serc.rmit.edu.au>
#
# $FreeBSD$
#
-DISTNAME= R-0.99.0a
-PKGNAME= R-${PAPERSIZE}-0.99.0a
+PORTNAME= R
+PORTVERSION= 0.99.0a
CATEGORIES= math
MASTER_SITES= http://lib.stat.cmu.edu/R/CRAN/src/base/ \
ftp://ftp.biostat.washington.edu/mirrors/R/CRAN/src/base/ \
@@ -18,6 +17,8 @@ MASTER_SITES= http://lib.stat.cmu.edu/R/CRAN/src/base/ \
ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/ \
ftp://dola.snu.ac.kr/pub/R/CRAN/src/base/ \
http://www.stat.math.ethz.ch/R-CRAN/src/base/
+PKGNAMESUFFIX= -${PAPERSIZE}
+DISTNAME= R-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= maurice@serc.rmit.edu.au
diff --git a/math/R/Makefile b/math/R/Makefile
index c01a66fe1074..77e88420a8bd 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: R (letter)
-# Version required: R-0.99.0a
# Date created: Tue Jun 23 07:36:55 EST 1998
# Whom: Maurice Castro <maurice@serc.rmit.edu.au>
#
# $FreeBSD$
#
-DISTNAME= R-0.99.0a
-PKGNAME= R-${PAPERSIZE}-0.99.0a
+PORTNAME= R
+PORTVERSION= 0.99.0a
CATEGORIES= math
MASTER_SITES= http://lib.stat.cmu.edu/R/CRAN/src/base/ \
ftp://ftp.biostat.washington.edu/mirrors/R/CRAN/src/base/ \
@@ -18,6 +17,8 @@ MASTER_SITES= http://lib.stat.cmu.edu/R/CRAN/src/base/ \
ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/ \
ftp://dola.snu.ac.kr/pub/R/CRAN/src/base/ \
http://www.stat.math.ethz.ch/R-CRAN/src/base/
+PKGNAMESUFFIX= -${PAPERSIZE}
+DISTNAME= R-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= maurice@serc.rmit.edu.au
diff --git a/math/Scilab/Makefile b/math/Scilab/Makefile
index f6eb0e5a428d..49b2da509681 100644
--- a/math/Scilab/Makefile
+++ b/math/Scilab/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Scilab
-# Version required: 2.4.1
# Date created: 13 June 1997
# Whom: paulo@isr.uc.pt
#
# $FreeBSD$
#
-DISTNAME= scilab-${SCILAB_VER}
-PKGNAME= Scilab-${SCILAB_VER}
+PORTNAME= Scilab
+PORTVERSION= 2.4.1
CATEGORIES= math cad
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
+DISTNAME= scilab-${PORTVERSION}
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= paulo@isr.uc.pt
@@ -17,8 +17,7 @@ MAINTAINER= paulo@isr.uc.pt
RUN_DEPENDS= pvm:${PORTSDIR}/net/pvm \
xless:${PORTSDIR}/misc/xless
-SCILAB_VER= 2.4.1
-PLIST_SUB+= SCILAB_VER=${SCILAB_VER}
+PLIST_SUB= SCILAB_VER=${PORTVERSION}
NO_CDROM= "Don't sell for profit."
GNU_CONFIGURE= yes
diff --git a/math/abs/Makefile b/math/abs/Makefile
index 6e1b6116ae31..7fb6d64bad5d 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: abs
-# Version required: 0.5
# Date created: 20 January 1999
# Whom: gmarco@giovannelli.it
#
# $FreeBSD$
#
-DISTNAME= abs-src-0.6a
-PKGNAME= abs-0.6
+PORTNAME= abs
+PORTVERSION= 0.6
CATEGORIES= math
MASTER_SITES= http://www.ping.be/bertin/ \
http://www.giovannelli.it/~gmarco/files/
+DISTNAME= abs-src-0.6a
MAINTAINER= gmarco@giovannelli.it
diff --git a/math/add/Makefile b/math/add/Makefile
index bff2c064d02e..28e196d6a538 100644
--- a/math/add/Makefile
+++ b/math/add/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: add
-# Version required: 1.0
# Date created: 20 August 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= add
-PKGNAME= add-1.0
+PORTNAME= add
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.clark.net/pub/dickey/add/
+DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 778cefd0ddd3..2d49ac657b23 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: apc
-# Version required: 1.0
# Date created: May 1 1997
# Whom: Eric A. Griff <eagriff@global2000.net>
#
# $FreeBSD$
#
-DISTNAME= apc-1.0
+PORTNAME= apc
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= http://members.global2000.net/~eagriff/
diff --git a/math/bihar/Makefile b/math/bihar/Makefile
index 4c01f03cfa9c..b50dace2ab13 100644
--- a/math/bihar/Makefile
+++ b/math/bihar/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: fftpack
-# Version required: ?
# Date created: 31 October 1996
# Whom: Pedro Giffuni S.
#
# $FreeBSD$
#
-DISTNAME= bihar
-PKGNAME= fftpack-1.0
+PORTNAME= fftpack
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://netlib.bell-labs.com/netlib/
+DISTNAME= bihar
EXTRACT_SUFX= .tar
MAINTAINER= giffunip@asme.org
diff --git a/math/blas/Makefile b/math/blas/Makefile
index e7db3b09ac72..60ec84a6b6f2 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: blas
-# Version required: 1.0
# Date created: 27 October 1994
# Whom: ljo
#
# $FreeBSD$
#
-DISTNAME= blas
-PKGNAME= blas-1.0
+PORTNAME= blas
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://netlib.bell-labs.com/netlib/blas/ \
ftp://www.hensa.ac.uk/mirrors/netlib/blas/ \
http://www.netlib.org/blas/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/math/calc/Makefile b/math/calc/Makefile
index c2611862184a..06838d0818bd 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: calc
-# Version required: 2.9.3t6
# Date created: 3 October 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= calc-2.11.1t3.0
-PKGNAME= calc-2.11.1
+PORTNAME= calc
+PORTVERSION= 2.11.1
CATEGORIES= math
MASTER_SITES= ftp://reality.sgi.com/users/chongo/src/calc/ \
ftp://ftp.uu.net/pub/calc/ \
http://reality.sgi.com/chongo/src/calc/
+DISTNAME= calc-2.11.1t3.0
MAINTAINER= jmz@FreeBSD.org
diff --git a/math/calctool/Makefile b/math/calctool/Makefile
index 9c9bd684ac8a..85939f631b99 100644
--- a/math/calctool/Makefile
+++ b/math/calctool/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: calctool-2.4pl13
-# Version required: 1.14.5
# Date created: 2 Dec 1996
# Whom: nsayer@quack.kfu.com
#
# $FreeBSD$
#
-DISTNAME= calctool-2.4pl13
-PKGNAME= calctool-2.4.13
+PORTNAME= calctool
+PORTVERSION= 2.4.13
CATEGORIES= math
MASTER_SITES= ftp://ftp.kfu.com/pub/
+DISTNAME= calctool-2.4pl13
MAINTAINER= nsayer@quack.kfu.com
diff --git a/math/dcdflib/Makefile b/math/dcdflib/Makefile
index 31f04958f74a..3f6e391afd43 100644
--- a/math/dcdflib/Makefile
+++ b/math/dcdflib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dcdflib
-# Version required: 1.1
# Date created: 08 September 1998
# Whom: Anton Berezin <tobez@plab.ku.dk>
#
# $FreeBSD$
#
-DISTNAME= dcdflib.c-1.1
+PORTNAME= dcdflib.c
+PORTVERSION= 1.1
CATEGORIES= math
MASTER_SITES= ftp://odin.mda.uth.tmc.edu/pub/source/
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index b550a6d33700..6f1e50f4470c 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: eispack
-# Version required: ?
# Date created: 31 October 1994
# Whom: ljo
#
# $FreeBSD$
#
-DISTNAME= eispack
-PKGNAME= eispack-1.0
+PORTNAME= eispack
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/eispack/ \
ftp://netlib.bell-labs.com/netlib/eispack/ \
@@ -18,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas
-DIST_SUBDIR= ${DISTNAME}
+DIST_SUBDIR= ${PORTNAME}
NO_WRKSUBDIR= yes
SRCS = csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \
diff --git a/math/eval/Makefile b/math/eval/Makefile
index 14326e551e3a..cba7138815c8 100644
--- a/math/eval/Makefile
+++ b/math/eval/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: eval
-# Version required: 113
# Date created: 24 Sep 1997
# Whom: eserte
#
# $FreeBSD$
#
-DISTNAME= Eval113
-PKGNAME= eval-113
+PORTNAME= eval
+PORTVERSION= 113
CATEGORIES= math
MASTER_SITES= ftp://ftp.doc.ic.ac.uk/Mirrors/wuarchive.wustl.edu/pub/aminet/util/cli/ \
ftp://ftp.uni-paderborn.de/ftp/aminet/pub/util/cli/
+DISTNAME= Eval${PORTVERSION}
EXTRACT_SUFX= .lha
MAINTAINER= eserte@cs.tu-berlin.de
diff --git a/math/femlab/Makefile b/math/femlab/Makefile
index da7475e92802..78c53f5f13cb 100644
--- a/math/femlab/Makefile
+++ b/math/femlab/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: femlab
-# Version required: v1.1
# Date created: 19 June 1997
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= femlab-2d-v1.1
-PKGNAME= femlab-1.1
+PORTNAME= femlab
+PORTVERSION= 1.1
CATEGORIES= math cad
MASTER_SITES= ftp://ftp.md.chalmers.se/pub/Femlab/ \
ftp://ftp.ifs.hr/pub/SciUtil/
+DISTNAME= femlab-2d-v${PORTVERSION}
MAINTAINER= giffunip@asme.org
diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile
index 4c01f03cfa9c..b50dace2ab13 100644
--- a/math/fftpack/Makefile
+++ b/math/fftpack/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: fftpack
-# Version required: ?
# Date created: 31 October 1996
# Whom: Pedro Giffuni S.
#
# $FreeBSD$
#
-DISTNAME= bihar
-PKGNAME= fftpack-1.0
+PORTNAME= fftpack
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://netlib.bell-labs.com/netlib/
+DISTNAME= bihar
EXTRACT_SUFX= .tar
MAINTAINER= giffunip@asme.org
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 6dd2fbb6ef02..eb4b1a741c26 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fftw
-# Version required: 2.1.2
# Date created: Dec 28 1998
# Whom: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
#
# $FreeBSD$
#
-DISTNAME= fftw-2.1.3
+PORTNAME= fftw
+PORTVERSION= 2.1.3
CATEGORIES= math
MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
ftp://theory.lcs.mit.edu/pub/fftw/ \
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 6dd2fbb6ef02..eb4b1a741c26 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fftw
-# Version required: 2.1.2
# Date created: Dec 28 1998
# Whom: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
#
# $FreeBSD$
#
-DISTNAME= fftw-2.1.3
+PORTNAME= fftw
+PORTVERSION= 2.1.3
CATEGORIES= math
MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
ftp://theory.lcs.mit.edu/pub/fftw/ \
diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index 812df331499e..f6c346be4fc1 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: freefem
-# Version required: 3.4
# Date created: 20 December 1996
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= freefem-3.4
+PORTNAME= freefem
+PORTVERSION= 3.4
CATEGORIES= math cad
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Gamma/freefem/
diff --git a/math/fudgit/Makefile b/math/fudgit/Makefile
index 584cff08fae1..240b4e1ff651 100644
--- a/math/fudgit/Makefile
+++ b/math/fudgit/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: Fudgit
-# Version required: 2.41
# Date created: 17 November 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= Fudgit_2.41
-PKGNAME= Fudgit-2.41
+PORTNAME= Fudgit
+PORTVERSION= 2.41
CATEGORIES= math
MASTER_SITES= ftp://ftp.physics.mcgill.ca/pub/Fudgit/
-DISTFILES= fudgit_2.41.tar.gz
+DISTNAME= Fudgit_${PORTVERSION}
+DISTFILES= fudgit_${PORTVERSION}.tar.gz
MAINTAINER= jmz@FreeBSD.org
diff --git a/math/geg/Makefile b/math/geg/Makefile
index ffe7e2a7ef44..95cdc3dac774 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: geg
-# Version required: 1.0.1
# Date created: 8 Aug 1998
# Whom: rom
#
# $FreeBSD$
#
-DISTNAME= geg-1.0.1
+PORTNAME= geg
+PORTVERSION= 1.0.1
CATEGORIES= math
MASTER_SITES= http://www.infolaunch.com/~daveb/ \
ftp://metalab.unc.edu/pub/Linux/science/visualization/plotting/
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 66a0ae126b81..d062fefda9b3 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnumeric
-# Version required: 0.51
# Date created: 08 October 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnumeric-0.51
+PORTNAME= gnumeric
+PORTVERSION= 0.51
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnumeric
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 66a0ae126b81..d062fefda9b3 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnumeric
-# Version required: 0.51
# Date created: 08 October 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnumeric-0.51
+PORTNAME= gnumeric
+PORTVERSION= 0.51
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnumeric
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index a6aa981fcf49..195a66e200c1 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnuplot
-# Version required: 3.7.1
# Date created: May 18, 1999
# Whom: NAKAJI Hiroyuki
#
# $FreeBSD$
#
-DISTNAME= gnuplot371+-1.1.9
+PORTNAME= gnuplot371+
+PORTVERSION= 1.1.9
CATEGORIES= math japanese graphics
MASTER_SITES= ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gnuplot+/3.7base/ \
ftp://ftp.hipecs.hokudai.ac.jp/pub/GNU/jp/pub.yamaga/gnuplot+/3.7base/ \
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 48156fa83834..efe00228cae7 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnuplot
-# Version required: 3.7.1
# Date created: 19 April 1998
# Whom: chuckr
#
# $FreeBSD$
#
-DISTNAME= gnuplot-3.7.1
+PORTNAME= gnuplot
+PORTVERSION= 3.7.1
CATEGORIES= math graphics
MASTER_SITES= ftp://ftp.gnuplot.vt.edu/pub/gnuplot/
diff --git a/math/grace/Makefile b/math/grace/Makefile
index e6f24fa99a3f..a7e30a3bd052 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: grace
-# Version required: 5.0.1
# Date created: Dec 28 1998
# Whom: Lars Koeller <lkoeller@cc.fh-lippe.de>
#
# $FreeBSD$
#
-DISTNAME= grace-5.0.3gamma
-PKGNAME= grace-5.0.3g
+PORTNAME= grace
+PORTVERSION= 5.0.3g
CATEGORIES= math print
#
# You never know when and why this caotic team moves it to ../src/old/ :-)
@@ -18,6 +17,7 @@ MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \
ftp://abragam.med.utoronto.ca/pub/mirrors/grace/src/old/ \
ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/old/ \
ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/
+DISTNAME= grace-5.0.3gamma
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 91157cc091ef..6112d405035d 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: grpn
-# Version required: 1.1.0
# Date created: 25 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= grpn-1.1.0
+PORTNAME= grpn
+PORTVERSION= 1.1.0
CATEGORIES= math gnome
MASTER_SITES= http://wilkins.ne.mediaone.net/grpn/
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 475aa18e5c92..a9ef849bf309 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gsl
-# Version required: 0.5
# Date created: 15 Feb 2000
# Whom: Andrew L. Neporada <andrew@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= gsl-0.5
+PORTNAME= gsl
+PORTVERSION= 0.5
CATEGORIES= math
MASTER_SITES= ftp://sourceware.cygnus.com/pub/gsl/ \
ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/gsl/ \
diff --git a/math/hexcalc/Makefile b/math/hexcalc/Makefile
index 03210d6a9b44..0a03d950906d 100644
--- a/math/hexcalc/Makefile
+++ b/math/hexcalc/Makefile
@@ -6,10 +6,11 @@
# $FreeBSD$
#
-DISTNAME= hexcalc
-PKGNAME= hexcalc-1.11
+PORTNAME= hexcalc
+PORTVERSION= 1.11
CATEGORIES= math
MASTER_SITES= ftp://aixpdslib.seas.ucla.edu/pub/hexcalc/RISC/3.2/src/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= ..tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 02d4e14ada50..06cad2bc05c1 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lapack
-# Version required: 3.0
# Date created: 2 July 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= LAPACK
-PKGNAME= lapack-3.0
+PORTNAME= lapack
+PORTVERSION= 3.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/lapack/
+DISTNAME= LAPACK
DISTFILES= lapack.tgz manpages.tgz
MAINTAINER= jmz@FreeBSD.org
diff --git a/math/librandlib/Makefile b/math/librandlib/Makefile
index 0d497ddf6c3d..ca34b4e3473d 100644
--- a/math/librandlib/Makefile
+++ b/math/librandlib/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ranlib
-# Version required: ?
# Date created: 06 April 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ranlib.c
-PKGNAME= ranlib-1.0
+PORTNAME= ranlib
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/random/
+DISTNAME= ranlib.c
MAINTAINER= tg@FreeBSD.org
diff --git a/math/libranlib/Makefile b/math/libranlib/Makefile
index 0d497ddf6c3d..ca34b4e3473d 100644
--- a/math/libranlib/Makefile
+++ b/math/libranlib/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ranlib
-# Version required: ?
# Date created: 06 April 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ranlib.c
-PKGNAME= ranlib-1.0
+PORTNAME= ranlib
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/random/
+DISTNAME= ranlib.c
MAINTAINER= tg@FreeBSD.org
diff --git a/math/linalg/Makefile b/math/linalg/Makefile
index cee7161e056b..2c839957957c 100644
--- a/math/linalg/Makefile
+++ b/math/linalg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: LinAlg
-# Version required: 4.3
# Date created: August 25, 1999
# Whom: Oleg Kiselyov <oleg@pobox.com>
#
# $FreeBSD$
#
-DISTNAME= linalg-4.3
+PORTNAME= linalg
+PORTVERSION= 4.3
CATEGORIES= math
MASTER_SITES= http://people.FreeBSD.org/~will/distfiles/
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index ef32ea4d92a6..7b570b12eede 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: linpack
-# Version required: ?
# Date created: 31 October 1994
# Whom: ljo
#
# $FreeBSD$
#
-DISTNAME= linpack
-PKGNAME= linpack-1.0
+PORTNAME= linpack
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/linpack/ \
ftp://netlib.bell-labs.com/netlib/linpack/ \
@@ -18,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas
-DIST_SUBDIR= ${DISTNAME}
+DIST_SUBDIR= ${PORTNAME}
NO_WRKSUBDIR= yes
SRCS = cchdc.f cchdd.f cchex.f cchud.f cgbco.f cgbdi.f cgbfa.f cgbsl.f \
diff --git a/math/metis/Makefile b/math/metis/Makefile
index 369817ed7587..aafbf8292204 100644
--- a/math/metis/Makefile
+++ b/math/metis/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: METIS
-# Version required: 4.0
# Date created: 26 Oct 97
# Whom: Pedro Giffuni <giffunip@asme.org>
#
# $FreeBSD$
#
-DISTNAME= metis-4.0
+PORTNAME= metis
+PORTVERSION= 4.0
CATEGORIES= math
MASTER_SITES= http://www-users.cs.umn.edu/~karypis/metis/metis/files/
diff --git a/math/metis4/Makefile b/math/metis4/Makefile
index 369817ed7587..aafbf8292204 100644
--- a/math/metis4/Makefile
+++ b/math/metis4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: METIS
-# Version required: 4.0
# Date created: 26 Oct 97
# Whom: Pedro Giffuni <giffunip@asme.org>
#
# $FreeBSD$
#
-DISTNAME= metis-4.0
+PORTNAME= metis
+PORTVERSION= 4.0
CATEGORIES= math
MASTER_SITES= http://www-users.cs.umn.edu/~karypis/metis/metis/files/
diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile
index 20d951a2a534..3d74fe7fbcb2 100644
--- a/math/netcdf/Makefile
+++ b/math/netcdf/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: netcdf
-# Version required: 3.5-beta2
# Date created: 29 July 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= netcdf-3.5-beta2
-PKGNAME= netcdf-3.5b2
+PORTNAME= netcdf
+PORTVERSION= 3.5b2
CATEGORIES= math
MASTER_SITES= ftp://unidata.ucar.edu/pub/netcdf/
-EXTRACT_SUFX= .tar.Z
+DISTFILES= netcdf-3.5-beta2.tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/math/ngraph/Makefile b/math/ngraph/Makefile
index 708668e31118..bc905e0df9b2 100644
--- a/math/ngraph/Makefile
+++ b/math/ngraph/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ngraph
-# Version required: 6.03
# Date created: 18 Aug 1999
# Whom: nobu@rd.isac.co.jp
#
# $FreeBSD$
#
-DISTNAME= Ngraph-6.3.06-src
-PKGNAME= ngraph-6.3.06
+PORTNAME= ngraph
+PORTVERSION= 6.3.06
CATEGORIES= math
MASTER_SITES= http://www2e.biglobe.ne.jp/~isizaka/bin/ \
${MASTER_SITE_PORTS_JP}
+DISTNAME= Ngraph-${PORTVERSION}-src
MAINTAINER= sanpei@jp.FreeBSD.org
diff --git a/math/numpy/Makefile b/math/numpy/Makefile
index 8f9236f5500c..2adda1ec28c1 100644
--- a/math/numpy/Makefile
+++ b/math/numpy/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: numpy
-# Version required: 15.2
# Date created: 20 April 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Numerical-15.2
-PKGNAME= py-numeric-15.2
+PORTNAME= numeric
+PORTVERSION= 15.2
CATEGORIES= math python
MASTER_SITES= http://downloads.sourceforge.net/
+PKGNAMEPREFIX= py-
+DISTNAME= Numerical-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index ad69e6cb3542..4a0d853b8639 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: octave
-# Version required: 2.0.14
# Date created: 8 September 1998
# Whom: chuckr@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= octave-2.0.16
+PORTNAME= octave
+PORTVERSION= 2.0.16
CATEGORIES= math
#MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/
MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/ \
diff --git a/math/octave/Makefile b/math/octave/Makefile
index ad69e6cb3542..4a0d853b8639 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: octave
-# Version required: 2.0.14
# Date created: 8 September 1998
# Whom: chuckr@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= octave-2.0.16
+PORTNAME= octave
+PORTVERSION= 2.0.16
CATEGORIES= math
#MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/
MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/ \
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 993966599311..8878f52a8cb1 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: oleo
-# Version required: 1.99.5
# Date created: 3 September 1994
# Whom: mr
#
# $FreeBSD$
#
-DISTNAME= oleo-1.99.5
+PORTNAME= oleo
+PORTVERSION= 1.99.5
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= oleo
diff --git a/math/p5-MatrixReal/Makefile b/math/p5-MatrixReal/Makefile
index 2f9f0410d5e9..ebf3716397e1 100644
--- a/math/p5-MatrixReal/Makefile
+++ b/math/p5-MatrixReal/Makefile
@@ -1,15 +1,16 @@
# Ports collection Makefile for: Math-MatrixReal
-# Version Required: 1.2
# Date Created: Aug 14 1997
# Whom: Sander Vesik <sander@haldjas.folklore.ee>
#
# $FreeBSD$
-DISTNAME= Math-MatrixReal-1.2
-PKGNAME= p5-MatrixReal-1.2
+PORTNAME= MatrixReal
+PORTVERSION= 1.2
CATEGORIES= math perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Math
+PKGNAMEPREFIX= p5-
+DISTNAME= Math-${PORTNAME}-${PORTVERSION}
MAINTAINER= sander@haldjas.folklore.ee
diff --git a/math/p5-Set-IntSpan/Makefile b/math/p5-Set-IntSpan/Makefile
index 5303c1f877c6..7edc99655cd3 100644
--- a/math/p5-Set-IntSpan/Makefile
+++ b/math/p5-Set-IntSpan/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Set-IntSpan
-# Version required: 1.07
# Date created: February 7, 1998
# Whom: Don Croyle <croyle@gelemna.ft-wayne.in.us>
#
# $FreeBSD$
#
-DISTNAME= Set-IntSpan-1.07
-PKGNAME= p5-Set-IntSpan-1.07
+PORTNAME= Set-IntSpan
+PORTVERSION= 1.07
CATEGORIES= math perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Set
+PKGNAMEPREFIX= p5-
MAINTAINER= croyle@gelemna.ft-wayne.in.us
diff --git a/math/pari/Makefile b/math/pari/Makefile
index a8dfea709324..7f5bdd608e26 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: PARI
-# Version required: 2.0.18b
# Date created: 19 January 1999
# Whom: Yoshiaki UCHIKAWA <yoshiaki@kt.rim.or.jp>
#
# $FreeBSD$
#
-DISTNAME= pari-2.0.18.beta
-PKGNAME= pari-2.0.18b
+PORTNAME= pari
+PORTVERSION= 2.0.18b
CATEGORIES= math
MASTER_SITES= ftp://www.gn-50uma.de/gn/gn-50uma.de/pari-2.0/
+DISTNAME= pari-2.0.18.beta
MAINTAINER= yoshiaki@kt.rim.or.jp
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index 5fd1d6d9bd06..3abc259e2441 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ParMETIS
-# Version required: 2.0
# Date created: 19 May 99
# Whom: Eoin Lawless (eoin@maths.tcd.ie)
#
# $FreeBSD$
#
-DISTNAME= ParMetis-2.0
+PORTNAME= ParMetis
+PORTVERSION= 2.0
CATEGORIES= math
MASTER_SITES= http://www-users.cs.umn.edu/~karypis/metis/parmetis/files/
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 27fccf0219a0..5327e7ff3d91 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: plplot
-# Version required: 4p99j
# Date created: 03 Oct 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= plplot4p99j
-PKGNAME= plplot-4.99j
+PORTNAME= plplot
+PORTVERSION= 4.99j
CATEGORIES= math
MASTER_SITES= ftp://ftp.uniovi.es/pub6/graphics/plotting/ \
ftp://dino.ph.utexas.edu/plplot/distrib/alpha/ \
ftp://ftp.u-aizu.ac.jp/pub/misc/tools/plot/plplot/distrib/alpha/ \
ftp://ftp.che.utexas.edu/pub/graphics/
+DISTNAME= plplot4p99j
MAINTAINER= ports@FreeBSD.org
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 8f9236f5500c..2adda1ec28c1 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: numpy
-# Version required: 15.2
# Date created: 20 April 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Numerical-15.2
-PKGNAME= py-numeric-15.2
+PORTNAME= numeric
+PORTVERSION= 15.2
CATEGORIES= math python
MASTER_SITES= http://downloads.sourceforge.net/
+PKGNAMEPREFIX= py-
+DISTNAME= Numerical-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index 8f9236f5500c..2adda1ec28c1 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: numpy
-# Version required: 15.2
# Date created: 20 April 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Numerical-15.2
-PKGNAME= py-numeric-15.2
+PORTNAME= numeric
+PORTVERSION= 15.2
CATEGORIES= math python
MASTER_SITES= http://downloads.sourceforge.net/
+PKGNAMEPREFIX= py-
+DISTNAME= Numerical-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 4cf2d9da25ac..f5f3fee02871 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: py-scientific
-# Version required: 2.0b1
# Date created: 29 July 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ScientificPython-2.0b1
-PKGNAME= py-scientific-2.0b1
+PORTNAME= scientific
+PORTVERSION= 2.0b1
CATEGORIES= math python
MASTER_SITES= http://starship.python.net/crew/hinsen/ \
http://dirac.cnrs-orleans.fr/programs/
+PKGNAMEPREFIX= py-
+DISTNAME= ScientificPython-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/pygist/Makefile b/math/pygist/Makefile
index 3f860d29f888..730af7dd3823 100644
--- a/math/pygist/Makefile
+++ b/math/pygist/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: pygist
-# Version required: 1.5
# Date created: 30 May 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= LLNLDistribution11
-PKGNAME= py-gist-1.5
+PORTNAME= gist
+PORTVERSION= 1.5
CATEGORIES= math python
MASTER_SITES= ftp://ftp-icf.llnl.gov/pub/python/
+PKGNAMEPREFIX= py-
+DISTNAME= LLNLDistribution11
EXTRACT_SUFX= .tgz
MAINTAINER= tg@FreeBSD.org
diff --git a/math/randlib/Makefile b/math/randlib/Makefile
index 0d497ddf6c3d..ca34b4e3473d 100644
--- a/math/randlib/Makefile
+++ b/math/randlib/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ranlib
-# Version required: ?
# Date created: 06 April 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ranlib.c
-PKGNAME= ranlib-1.0
+PORTNAME= ranlib
+PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/random/
+DISTNAME= ranlib.c
MAINTAINER= tg@FreeBSD.org
diff --git a/math/rcalc/Makefile b/math/rcalc/Makefile
index a64f6cad349c..f034f9ec4fb4 100644
--- a/math/rcalc/Makefile
+++ b/math/rcalc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rcalc
-# Version required: 0.1
# Date created: 28 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= rCalc-0.1
-PKGNAME= rcalc-0.1
+PORTNAME= rcalc
+PORTVERSION= 0.1
CATEGORIES= math gnome
MASTER_SITES= http://members.xoom.com/ratsoft/download/
+DISTNAME= rCalc-${PORTVERSION}
MAINTAINER= jedgar@fxp.org
diff --git a/math/sc/Makefile b/math/sc/Makefile
index 24796daae8de..fb6afc099407 100644
--- a/math/sc/Makefile
+++ b/math/sc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sc
-# Version required: 6.21
# Date created: 30 July 1998
# Whom: Heinz Tschabitscher
#
# $FreeBSD$
#
-DISTNAME= sc-6.21
+PORTNAME= sc
+PORTVERSION= 6.21
CATEGORIES= math
MASTER_SITES= ftp://gatekeeper.dec.com/pub/misc/
EXTRACT_SUFX= .tar.Z
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index f6eb0e5a428d..49b2da509681 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Scilab
-# Version required: 2.4.1
# Date created: 13 June 1997
# Whom: paulo@isr.uc.pt
#
# $FreeBSD$
#
-DISTNAME= scilab-${SCILAB_VER}
-PKGNAME= Scilab-${SCILAB_VER}
+PORTNAME= Scilab
+PORTVERSION= 2.4.1
CATEGORIES= math cad
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
+DISTNAME= scilab-${PORTVERSION}
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= paulo@isr.uc.pt
@@ -17,8 +17,7 @@ MAINTAINER= paulo@isr.uc.pt
RUN_DEPENDS= pvm:${PORTSDIR}/net/pvm \
xless:${PORTSDIR}/misc/xless
-SCILAB_VER= 2.4.1
-PLIST_SUB+= SCILAB_VER=${SCILAB_VER}
+PLIST_SUB= SCILAB_VER=${PORTVERSION}
NO_CDROM= "Don't sell for profit."
GNU_CONFIGURE= yes
diff --git a/math/siag/Makefile b/math/siag/Makefile
index 05a98369cc10..7483bb85c729 100644
--- a/math/siag/Makefile
+++ b/math/siag/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: siag (Scheme In A Grid)
-# Version required: 3.2.0
# Date created: 27 Jan 1998
# Whom: mi@aldan.algebra.com
#
# $FreeBSD$
#
-DISTNAME= siag-3.2.0
+PORTNAME= siag
+PORTVERSION= 3.2.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.edu.stockholm.se/pub/siag/ \
ftp://ftp.icm.edu.pl/site/siag/
diff --git a/math/simpack/Makefile b/math/simpack/Makefile
index 34d1fcc97279..41f087929418 100644
--- a/math/simpack/Makefile
+++ b/math/simpack/Makefile
@@ -1,12 +1,12 @@
# new ports collection Makefile for: SimPack
-# Version required: 3.0
# Date created: 5 June 1997
# Whom: Ruslan Shevchenko <rssh@cki.ipri.kiev.ua>
#
# $FreeBSD$
#
-DISTNAME= simpack-3.0
+PORTNAME= simpack
+PORTVERSION= 3.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.cis.ufl.edu/pub/simdigest/tools/
DISTFILES= SimPack3.tar.Z
diff --git a/math/slsc/Makefile b/math/slsc/Makefile
index a2b3b56738f1..538f5e657d75 100644
--- a/math/slsc/Makefile
+++ b/math/slsc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: slsc
-# Version required: 0.2.3
# Date created: 6 January 2000
# Whom: Jonathan McDowell <noodles@earth.li>
#
# $FreeBSD$
#
-DISTNAME= slsc
-PKGNAME= slsc-0.2.3
+PORTNAME= slsc
+PORTVERSION= 0.2.3
CATEGORIES= math
MASTER_SITES= ftp://space.mit.edu/pub/davis/slsc/
+DISTNAME= ${PORTNAME}
MAINTAINER= noodles@earth.li
diff --git a/math/snns/Makefile b/math/snns/Makefile
index f196bcb4cbf8..104a52542b76 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: snns
-# Version required: 4.2
# Date created: 2 Febuary 1997
# Whom: reg@shale.csir.co.za
#
# $FreeBSD$
#
-DISTNAME= SNNSv4.2
-PKGNAME= snns-4.2
+PORTNAME= snns
+PORTVERSION= 4.2
CATEGORIES= math
MASTER_SITES= ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS/
+DISTNAME= SNNSv${PORTVERSION}
+DISTNAME= SNNSv${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/math/spin/Makefile b/math/spin/Makefile
index 41d5c64d0771..028d7ea64211 100644
--- a/math/spin/Makefile
+++ b/math/spin/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: spin
-# Version required: 3.3.9
# Date created: Oct 23, 1997
# Whom: jhanna@home.com
#
# $FreeBSD$
#
-DISTNAME= spin-3.39
+PORTNAME= spin
+PORTVERSION= 3.39
CATEGORIES= math
MASTER_SITES= ftp://netlib.bell-labs.com/netlib/spin/ \
ftp://www.netlib.org/spin/ \
diff --git a/math/ss/Makefile b/math/ss/Makefile
index c857a213ff7a..49fd9e9ebf66 100644
--- a/math/ss/Makefile
+++ b/math/ss/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: SS
-# Version required: 1.3.3
# Date created: 5 January 1997
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= ss_1.3.3
-PKGNAME= ss-1.3.3
+PORTNAME= ss
+PORTVERSION= 1.3.3
CATEGORIES= math
MASTER_SITES= http://www.irus.rri.on.ca/~amulder/ss/ \
ftp://ftp.cdrom.com/pub/unixfreeware/math/ \
ftp://ftp.u-aizu.ac.jp/pub/misc/tools/spreadsheet/ualberta/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= giffunip@asme.org
diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 145261c7e762..01e01903803c 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: SuperLU
-# Version required: 2.0
# Date created: 31 Oct 97
# Whom: Pedro Giffuni <giffunip@asme.org>
#
# $FreeBSD$
#
-DISTNAME= superlu_2.0
-PKGNAME= superlu-2.0
+PORTNAME= superlu
+PORTVERSION= 2.0
CATEGORIES= math
MASTER_SITES= http://www.nersc.gov/~xiaoye/SuperLU/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/topaz/Makefile b/math/topaz/Makefile
index c1b1e00ef2f2..4fad9c9577f8 100644
--- a/math/topaz/Makefile
+++ b/math/topaz/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: topaz
-# Version required: 3.22
# Date created: 29 July 1997
# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
#
# $FreeBSD$
#
-DISTNAME= topaz-3_25-src
-PKGNAME= topaz-3.25
+PORTNAME= topaz
+PORTVERSION= 3.25
CATEGORIES= math
MASTER_SITES= http://hp.vector.co.jp/authors/VA007663/topaz/bin/
+DISTNAME= topaz-3_25-src
MAINTAINER= issei@jp.FreeBSD.ORG
diff --git a/math/umatrix/Makefile b/math/umatrix/Makefile
index 0cbb0d6a14c8..0f00085f9714 100644
--- a/math/umatrix/Makefile
+++ b/math/umatrix/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: umatrix
-# Version required: 1.1
# Date created: 1 May 1997
# Whom: Sandro Sigala <ssigala@globalnet.it>
#
# $FreeBSD$
#
-DISTNAME= umatrix-1.1
+PORTNAME= umatrix
+PORTVERSION= 1.1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/math/umfpack/Makefile b/math/umfpack/Makefile
index 113039c9d3f2..0d06006d2908 100644
--- a/math/umfpack/Makefile
+++ b/math/umfpack/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: UMFPACK
-# Version required: 2.2.1
# Date created: 5 Nov 97
# Whom: Pedro Giffuni <giffunip@asme.org>
#
# $FreeBSD$
#
-DISTNAME= UMFPACK2.2.1
-PKGNAME= umfpack-2.2.1
+PORTNAME= umfpack
+PORTVERSION= 2.2.1
CATEGORIES= math
MASTER_SITES= ftp://ftp.cise.ufl.edu/pub/faculty/davis/umfpack/
+DISTNAME= UMFPACK${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index 12cc8dd0d064..e5dc22545d37 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: vtk
-# Version required: 3.1
# Date created: 24 Nov 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= vtk31Unix
-PKGNAME= vtk-3.1
+PORTNAME= vtk
+PORTVERSION= 3.1
CATEGORIES= math
MASTER_SITES= ftp://public.kitware.com/pub/vtk/
+DISTNAME= vtk31Unix
MAINTAINER= ports@FreeBSD.org
diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile
index 12cc8dd0d064..e5dc22545d37 100644
--- a/math/vtk43/Makefile
+++ b/math/vtk43/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: vtk
-# Version required: 3.1
# Date created: 24 Nov 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= vtk31Unix
-PKGNAME= vtk-3.1
+PORTNAME= vtk
+PORTVERSION= 3.1
CATEGORIES= math
MASTER_SITES= ftp://public.kitware.com/pub/vtk/
+DISTNAME= vtk31Unix
MAINTAINER= ports@FreeBSD.org
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index 12cc8dd0d064..e5dc22545d37 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: vtk
-# Version required: 3.1
# Date created: 24 Nov 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= vtk31Unix
-PKGNAME= vtk-3.1
+PORTNAME= vtk
+PORTVERSION= 3.1
CATEGORIES= math
MASTER_SITES= ftp://public.kitware.com/pub/vtk/
+DISTNAME= vtk31Unix
MAINTAINER= ports@FreeBSD.org
diff --git a/math/wingz/Makefile b/math/wingz/Makefile
index 81941c46cd13..eacb313d0c9f 100644
--- a/math/wingz/Makefile
+++ b/math/wingz/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wingz
-# Version required: 142
# Date created: Wed Nov 27 09:15:10 CST 1996
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= Wingz-142
+PORTNAME= Wingz
+PORTVERSION= 142
CATEGORIES= math linux
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/financial/spreadsheet
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index 81941c46cd13..eacb313d0c9f 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wingz
-# Version required: 142
# Date created: Wed Nov 27 09:15:10 CST 1996
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= Wingz-142
+PORTNAME= Wingz
+PORTVERSION= 142
CATEGORIES= math linux
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/financial/spreadsheet
diff --git a/math/wmcalc/Makefile b/math/wmcalc/Makefile
index 49df13c22e46..7b8ab7d8f61d 100644
--- a/math/wmcalc/Makefile
+++ b/math/wmcalc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmcalc
-# Version required: 0.1
# Date created: 28 March 2000
# Whom: Chris D. Faulhaber <jedgar@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wmcalc-0.1
+PORTNAME= wmcalc
+PORTVERSION= 0.1
CATEGORIES= math windowmaker
MASTER_SITES= http://members.access1.net/ehflora/wmcalc/
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index 091c9150620e..6a7c09b83282 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: xgfe
-# Version required: 2.0
# Date created: 24 March 1998
# Whom: Matthew Hunt <mph@pobox.com>
#
# $FreeBSD$
#
-DISTNAME= xgfe-2.0
-CATEGORIES= math
-MASTER_SITES= http://people.FreeBSD.org/~mph/distfiles/
+PORTNAME= xgfe
+PORTVERSION= 2.0
+CATEGORIES= math
+MASTER_SITES= http://people.FreeBSD.org/~mph/distfiles/
MAINTAINER= mph@freebsd.org
diff --git a/math/xgraph/Makefile b/math/xgraph/Makefile
index 07d03c865005..14f0cf955232 100644
--- a/math/xgraph/Makefile
+++ b/math/xgraph/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xgraph
-# Version required: 11.3.2
# Date created: 24 November 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xgraph-11
-PKGNAME= xgraph-11.3.2
+PORTNAME= xgraph
+PORTVERSION= 11.3.2
CATEGORIES= math print
MASTER_SITES= ftp://ftp.cs.utoronto.ca/pub/radford/
+DISTNAME= xgraph-11
EXTRACT_SUFX= .tar.Z
MAINTAINER= sanpei@sanpei.org
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 5b32f2c6171b..a9384285d60d 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xldlas
-# Version required: 0.85
# Date created: 20 Dec 97
# Whom: Pedro Giffuni <giffunip@asme.org>
#
# $FreeBSD$
#
-DISTNAME= xldlas-0.85
+PORTNAME= xldlas
+PORTVERSION= 0.85
CATEGORIES= math
MASTER_SITES= http://a42.com/~thor/xldlas/ \
http://sunsite.math.klte.hu/mirrors/xldlas/ \
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index 1374e665e822..8b211f6942e3 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: xlisp-stat
-# Version required: 3.52
# Date created: Tue Aug 15 17:57:48 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= xlispstat-3-52-9
-PKGNAME= xlispstat-3.52.9
+PORTNAME= xlispstat
+PORTVERSION= 3.52.9
CATEGORIES= math lang
MASTER_SITES= ftp://ftp.stat.umn.edu/pub/xlispstat/current/ \
http://lib.stat.cmu.edu/xlispstat/Src/current/ \
ftp://ftp.stat.unipg.it/pub/stat/xlispstat/current/ \
ftp://srsuna.shlrc.mq.edu.au/pub/xlispstat/current/ \
ftp://statlab.uni-heidelberg.de/pub/mirrors/umn/xlispstat/current
+DISTNAME= xlispstat-3-52-9
MAINTAINER= erich@FreeBSD.org
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index f41d83f2e4aa..a1edf62a7ca4 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmgr
-# Version required: 4.1.1
# Date created: So 2 Mär 1997 12:11:43 MET
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= xmgr-4.1.1
+PORTNAME= xmgr
+PORTVERSION= 4.1.1
CATEGORIES= math print
MASTER_SITES= ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \
ftp://plasma-gate.weizmann.ac.il/pub/xmgr4/src/old/ \
diff --git a/math/xplot/Makefile b/math/xplot/Makefile
index 5880a4d79103..b77ac9438af3 100644
--- a/math/xplot/Makefile
+++ b/math/xplot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xplot
-# Version required: 0.90
# Date created: 3 March 1997
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= xplot-0.90
+PORTNAME= xplot
+PORTVERSION= 0.90
CATEGORIES= math graphics net
MASTER_SITES= ftp://mercury.lcs.mit.edu/pub/shep/
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index ac0ea7785649..68654e73ed04 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xspread
-# Version required: 3.1.1c
# Date created: 28 June 1995
# Whom: janek@gaja.ipan.lublin.pl
#
# $FreeBSD$
#
-DISTNAME= xspread3.1.1c
-PKGNAME= xspread-3.1.1c
+PORTNAME= xspread
+PORTVERSION= 3.1.1c
CATEGORIES= math
MASTER_SITES= http://www.linuxberg.com/files/x11/office/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/xwpl/Makefile b/math/xwpl/Makefile
index 959e8483700a..fc84b86d9847 100644
--- a/math/xwpl/Makefile
+++ b/math/xwpl/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xwpl
-# Version required: 1.3
# Date created: 31 Nov 97
# Whom: Pedro Giffuni <giffunip@asme.org>
#
# $FreeBSD$
#
-DISTNAME= xwpl-1.3-freebsd
-PKGNAME= xwpl-1.3
+PORTNAME= xwpl
+PORTVERSION= 1.3
CATEGORIES= math
MASTER_SITES= ftp://pascal.math.yale.edu/pub/wavelets/software/xwpl/other-versions/
+DISTNAME= ${PKGNAME}-freebsd
MAINTAINER= giffunip@asme.org